addresses #1569

remove hatoku_cmptrace stuff that is no longer needed

git-svn-id: file:///svn/mysql/tokudb-engine/src@10946 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/CMakeLists.in

@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
                     TOKUDB_DIR_REPLACE_ME/include
                     TOKUDB_DIR_REPLACE_ME/toku_include)
 
-SET(TOKUDB_SOURCES hatoku_hton.cc ha_tokudb.cc hatoku_cmptrace.cc hatoku_cmp.cc)
+SET(TOKUDB_SOURCES hatoku_hton.cc ha_tokudb.cc hatoku_cmp.cc)
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(ha_tokudb ${TOKUDB_SOURCES})

storage/tokudb/ha_tokudb.cc

@@ -501,7 +501,6 @@ int ha_tokudb::open_secondary_table(DB** ptr, KEY* key_info, const char* name, i
     char name_buff[FN_REFLEN];
     char error_msg[MAX_ALIAS_NAME + 50]; //50 is arbitrary upper bound of extra txt
     uint open_flags = (mode == O_RDONLY ? DB_RDONLY : 0) | DB_THREAD;
-    DBT cmp_byte_stream;
     char* newname = NULL;
     newname = (char *)my_malloc(strlen(name) + NAME_CHAR_LEN, MYF(MY_WME));
     if (newname == NULL) {
@@ -520,19 +519,7 @@ int ha_tokudb::open_secondary_table(DB** ptr, KEY* key_info, const char* name, i
     fn_format(name_buff, newname, "", 0, MY_UNPACK_FILENAME);
     *key_type = key_info->flags & HA_NOSAME ? DB_NOOVERWRITE : DB_YESOVERWRITE;
     (*ptr)->app_private = (void *) (key_info);
-    if (tokudb_debug & TOKUDB_DEBUG_SAVE_TRACE) {
-        bzero((void *) &cmp_byte_stream, sizeof(cmp_byte_stream));
-        cmp_byte_stream.flags = DB_DBT_MALLOC;
-        if ((error = tokutrace_db_get_cmp_byte_stream(*ptr, &cmp_byte_stream))) {
-            my_errno = error;
-            goto cleanup;
-        }
-        (*ptr)->set_bt_compare(*ptr, tokudb_cmp_packed_key);
-        my_free(cmp_byte_stream.data, MYF(0));
-    }
-    else {
-        (*ptr)->set_bt_compare(*ptr, tokudb_cmp_packed_key);    
-    }
+    (*ptr)->set_bt_compare(*ptr, tokudb_cmp_packed_key);    
     
     DBUG_PRINT("info", ("Setting DB_DUP+DB_DUPSORT for key %s\n", key_info->name));
     //
@@ -674,7 +661,6 @@ int ha_tokudb::open(const char *name, int mode, uint test_if_locked) {
     }
     if (!share->use_count++) {
         DBUG_PRINT("info", ("share->use_count %u", share->use_count));
-        DBT cmp_byte_stream;
 
         if ((error = db_create(&share->file, db_env, 0))) {
             free_share(share, table, hidden_primary_key, 1);
@@ -697,28 +683,7 @@ int ha_tokudb::open(const char *name, int mode, uint test_if_locked) {
         else {
             share->file->app_private = NULL;
         }
-        if (tokudb_debug & TOKUDB_DEBUG_SAVE_TRACE) {
-            bzero((void *) &cmp_byte_stream, sizeof(cmp_byte_stream));
-            cmp_byte_stream.flags = DB_DBT_MALLOC;
-            if ((error = tokutrace_db_get_cmp_byte_stream(share->file, &cmp_byte_stream))) {
-                free_share(share, table, hidden_primary_key, 1);
-                my_free((char *) rec_buff, MYF(0));
-                rec_buff = NULL;
-                my_free(alloc_ptr, MYF(0));
-                alloc_ptr = NULL;
-                if (primary_key_offsets) {
-                    my_free(primary_key_offsets, MYF(0));
-                    primary_key_offsets = NULL;
-                }
-                my_errno = error;
-                my_free(newname, MYF(MY_ALLOW_ZERO_PTR));
-                TOKUDB_DBUG_RETURN(1);
-            }
-            share->file->set_bt_compare(share->file, (hidden_primary_key ? tokudb_cmp_hidden_key : tokudb_cmp_packed_key));
-            my_free(cmp_byte_stream.data, MYF(0));
-        }
-        else
-            share->file->set_bt_compare(share->file, (hidden_primary_key ? tokudb_cmp_hidden_key : tokudb_cmp_packed_key));
+        share->file->set_bt_compare(share->file, (hidden_primary_key ? tokudb_cmp_hidden_key : tokudb_cmp_packed_key));
         
         make_name(newname, name, "main");
         fn_format(name_buff, newname, "", 0, MY_UNPACK_FILENAME);

storage/tokudb/hatoku_cmptrace.cc

-#include "mysql_priv.h"
-
-extern "C" {
-#include "stdint.h"
-}
-#include "hatoku_cmptrace.h"
-
-
-/*
-    Things that are required for ALL data types:
-        key_part->field->null_bit
-        key_part->length
-        key_part->field->packed_col_length(...)
-            DEFAULT: virtual uint packed_col_length(const uchar *to, uint length)
-                { return length;}
-            All integer types use this.
-            String types MIGHT use different one, espescially the varchars
-        key_part->field->pack_cmp(...)
-            DEFAULT: virtual int pack_cmp(...)
-                { return cmp(a,b); }
-            All integer types use the obvious one.
-            Assume X byte bytestream, int =:
-            ((u_int64_t)((u_int8_t)bytes[0])) << 0 | 
-            ((u_int64_t)((u_int8_t)bytes[1])) << 8 | 
-            ((u_int64_t)((u_int8_t)bytes[2])) << 16 | 
-            ((u_int64_t)((u_int8_t)bytes[3])) << 24 | 
-            ((u_int64_t)((u_int8_t)bytes[4])) << 32 | 
-            ((u_int64_t)((u_int8_t)bytes[5])) << 40 | 
-            ((u_int64_t)((u_int8_t)bytes[6])) << 48 | 
-            ((u_int64_t)((u_int8_t)bytes[7])) << 56
-            If the integer type is < 8 bytes, just skip the unneeded ones.
-            Then compare the integers in the obvious way.
-        Strings:
-            Empty space differences at end are ignored.
-            i.e. delete all empty space at end first, and then compare.
-    Possible prerequisites:
-        key_part->field->cmp
-            NO DEFAULT
-*/
-
-typedef enum {
-    TOKUTRACE_SIGNED_INTEGER   = 0,
-    TOKUTRACE_UNSIGNED_INTEGER = 1,
-    TOKUTRACE_CHAR = 2
-} tokutrace_field_type;
-
-typedef struct {
-    tokutrace_field_type    type;
-    bool                    null_bit;
-    u_int32_t               length;
-} tokutrace_field;
-
-typedef struct {
-    u_int16_t           version;
-    u_int32_t           num_fields;
-    tokutrace_field     fields[1];
-} tokutrace_cmp_fun;
-
-int tokutrace_db_get_cmp_byte_stream(DB* db, DBT* byte_stream) {
-    int r      = ENOSYS;
-    void* data = NULL;
-    KEY* key   = NULL;
-    if (byte_stream->flags != DB_DBT_MALLOC) { return EINVAL; }
-    bzero((void *) byte_stream, sizeof(*byte_stream));
-
-    u_int32_t num_fields = 0;
-    if (!db->app_private) { num_fields = 1; }
-    else {
-        key = (KEY*)db->app_private;
-        num_fields = key->key_parts;
-    }
-    size_t need_size = sizeof(tokutrace_cmp_fun) +
-                       num_fields * sizeof(tokutrace_field);
-
-    data = my_malloc(need_size, MYF(MY_FAE | MY_ZEROFILL | MY_WME));
-    if (!data) { return ENOMEM; }
-
-    tokutrace_cmp_fun* info = (tokutrace_cmp_fun*)data;
-    info->version     = 1;
-    info->num_fields  = num_fields;
-    
-    if (!db->app_private) {
-        info->fields[0].type     = TOKUTRACE_UNSIGNED_INTEGER;
-        info->fields[0].null_bit = false;
-        info->fields[0].length   = 40 / 8;
-        goto finish;
-    }
-    assert(db->app_private);
-    assert(key);
-    u_int32_t i;
-    for (i = 0; i < num_fields; i++) {
-        info->fields[i].null_bit = key->key_part[i].null_bit;
-        info->fields[i].length   = key->key_part[i].length;
-        enum_field_types type    = key->key_part[i].field->type();
-        switch (type) {
-#ifdef HAVE_LONG_LONG
-            case (MYSQL_TYPE_LONGLONG):
-#endif
-            case (MYSQL_TYPE_LONG):
-            case (MYSQL_TYPE_INT24):
-            case (MYSQL_TYPE_SHORT):
-            case (MYSQL_TYPE_TINY): {
-                /* Integer */
-                Field_num* field = static_cast<Field_num*>(key->key_part[i].field);
-                if (field->unsigned_flag) {
-                    info->fields[i].type = TOKUTRACE_UNSIGNED_INTEGER; }
-                else {
-                    info->fields[i].type = TOKUTRACE_SIGNED_INTEGER; }
-                break;
-            }
-            default: {
-                fprintf(stderr, "Cannot save cmp function for type %d.\n", type);
-                r = ENOSYS;
-                goto cleanup;
-            }
-        }
-    }
-finish:
-    byte_stream->data = data;
-    byte_stream->size = need_size;
-    r = 0;
-cleanup:
-    if (r!=0) {
-        if (data) { my_free(data, MYF(0)); }
-    }
-    return r;
-}
-

storage/tokudb/hatoku_cmptrace.h

-#ifndef _HATOKU_CMPTRC
-#define _HATOKU_CMPTRC
-
-#include "db.h"
-
-int tokutrace_db_get_cmp_byte_stream(DB* db, DBT* byte_stream);
-
-#endif

storage/tokudb/hatoku_defines.h

@@ -28,7 +28,6 @@ extern ulong tokudb_debug;
 #define TOKUDB_DEBUG_ERROR 16
 #define TOKUDB_DEBUG_TXN 32
 #define TOKUDB_DEBUG_AUTO_INCREMENT 64
-#define TOKUDB_DEBUG_SAVE_TRACE 128
 
 #define TOKUDB_TRACE(f, ...) \
     printf("%d:%s:%d:" f, my_tid(), __FILE__, __LINE__, ##__VA_ARGS__);