addresses #1149

move partial refactoring to main line

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

storage/tokudb/ha_tokudb.h

@@ -57,12 +57,6 @@ typedef enum {
     hatoku_ai_create_value
 } HA_METADATA_KEY ;
 
-typedef enum {
-    hatoku_iso_not_set = 0,
-    hatoku_iso_read_uncommitted,
-    hatoku_iso_serializable
-} HA_TOKU_ISO_LEVEL;
-
 //
 // for storing NULL byte in keys
 //
@@ -354,5 +348,4 @@ private:
     int read_full_row(uchar * buf);
     int __close(int mutex_is_locked);
     int read_last();
-    ulong field_offset(Field *);
 };

storage/tokudb/hatoku_cmptrace.cc

+#include "mysql_priv.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

 #ifndef _HATOKU_DEF
 #define _HATOKU_DEF
 
+#include <syscall.h>
+#include "db.h"
+
+
+
+extern ulong tokudb_debug;
+
+
+
+
 // QQQ how to tune these?
 #define HA_TOKUDB_RANGE_COUNT   100
 /* extra rows for estimate_rows_upper_bound() */
@@ -22,6 +32,13 @@
 #define TOKUDB_TRACE(f, ...) \
     printf("%d:%s:%d:" f, my_tid(), __FILE__, __LINE__, ##__VA_ARGS__);
 
+
+inline unsigned int my_tid() {
+    return syscall(__NR_gettid);
+}
+
+
+
 #define TOKUDB_DBUG_ENTER(f, ...)      \
 { \
     if (tokudb_debug & TOKUDB_DEBUG_ENTER) { \
@@ -51,4 +68,22 @@
 }
 
 
+typedef enum {
+    hatoku_iso_not_set = 0,
+    hatoku_iso_read_uncommitted,
+    hatoku_iso_serializable
+} HA_TOKU_ISO_LEVEL;
+
+
+
+typedef struct st_tokudb_trx_data {
+    DB_TXN *all;
+    DB_TXN *stmt;
+    DB_TXN *sp_level;
+    uint tokudb_lock_count;
+    HA_TOKU_ISO_LEVEL iso_level;
+} tokudb_trx_data;
+
+
+
 #endif

storage/tokudb/hatoku_hton.h

+#ifndef _HATOKU_HTON
+#define _HATOKU_HTON
+
+#include "db.h"
+
+
+extern handlerton *tokudb_hton;
+
+extern const char *ha_tokudb_ext;
+extern char *tokudb_data_dir;
+extern DB_ENV *db_env;
+
+
+// thread variables
+
+
+extern HASH tokudb_open_tables;
+extern pthread_mutex_t tokudb_mutex;
+
+
+
+
+
+#endif //#ifdef _HATOKU_HTON