Merge changes to remove heaviside and straddle from the ydb layer. Fixes #2865. [t:2865].

{{{
svn merge -c22808 https://svn.tokutek.com/tokudb/toku/tokudb.2861
}}}
.


git-svn-id: file:///svn/toku/tokudb@22809 c7de825b-a66e-492c-adef-691d508d4ae1

buildheader/db.h_4_1

@@ -34,8 +34,6 @@ typedef struct __toku_dbc DBC;
 typedef struct __toku_dbt DBT;
 typedef u_int32_t db_recno_t;
 typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);
-typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);
-typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);
 #include <tdb-internal.h>
 #ifndef __BIGGEST_ALIGNMENT__
   #define __BIGGEST_ALIGNMENT__ 16
@@ -459,14 +457,13 @@ struct __toku_dbc {
   int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_heaviside)(DBC *, u_int32_t, YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction);
   int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range_reverse)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range_reverse)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  void* __toku_dummy0[3];
+  void* __toku_dummy0[4];
   char __toku_dummy1[104];
   int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=272 size=8 */
   int (*c_count) (DBC *, db_recno_t *, u_int32_t); /* 32-bit offset=192 size=4, 64=bit offset=280 size=8 */

buildheader/db.h_4_3

@@ -34,8 +34,6 @@ typedef struct __toku_dbc DBC;
 typedef struct __toku_dbt DBT;
 typedef u_int32_t db_recno_t;
 typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);
-typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);
-typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);
 #include <tdb-internal.h>
 #ifndef __BIGGEST_ALIGNMENT__
   #define __BIGGEST_ALIGNMENT__ 16
@@ -475,14 +473,13 @@ struct __toku_dbc {
   int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_heaviside)(DBC *, u_int32_t, YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction);
   int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range_reverse)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range_reverse)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  void* __toku_dummy0[1];
+  void* __toku_dummy0[2];
   char __toku_dummy1[112];
   int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=264 size=8 */
   int (*c_count) (DBC *, db_recno_t *, u_int32_t); /* 32-bit offset=192 size=4, 64=bit offset=272 size=8 */

buildheader/db.h_4_4

@@ -34,8 +34,6 @@ typedef struct __toku_dbc DBC;
 typedef struct __toku_dbt DBT;
 typedef u_int32_t db_recno_t;
 typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);
-typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);
-typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);
 #include <tdb-internal.h>
 #ifndef __BIGGEST_ALIGNMENT__
   #define __BIGGEST_ALIGNMENT__ 16
@@ -483,14 +481,13 @@ struct __toku_dbc {
   int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_heaviside)(DBC *, u_int32_t, YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction);
   int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range_reverse)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range_reverse)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  void* __toku_dummy0[3];
+  void* __toku_dummy0[4];
   char __toku_dummy1[104];
   int (*c_close) (DBC *); /* 32-bit offset=188 size=4, 64=bit offset=272 size=8 */
   int (*c_count) (DBC *, db_recno_t *, u_int32_t); /* 32-bit offset=192 size=4, 64=bit offset=280 size=8 */

buildheader/db.h_4_5

@@ -34,8 +34,6 @@ typedef struct __toku_dbc DBC;
 typedef struct __toku_dbt DBT;
 typedef u_int32_t db_recno_t;
 typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);
-typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);
-typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);
 #include <tdb-internal.h>
 #ifndef __BIGGEST_ALIGNMENT__
   #define __BIGGEST_ALIGNMENT__ 16
@@ -483,14 +481,13 @@ struct __toku_dbc {
   int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_heaviside)(DBC *, u_int32_t, YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction);
   int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range_reverse)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range_reverse)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  void* __toku_dummy0[7];
+  void* __toku_dummy0[8];
   char __toku_dummy1[104];
   int (*c_close) (DBC *); /* 32-bit offset=204 size=4, 64=bit offset=304 size=8 */
   int (*c_count) (DBC *, db_recno_t *, u_int32_t); /* 32-bit offset=208 size=4, 64=bit offset=312 size=8 */

buildheader/db.h_4_6

@@ -34,8 +34,6 @@ typedef struct __toku_dbc DBC;
 typedef struct __toku_dbt DBT;
 typedef u_int32_t db_recno_t;
 typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);
-typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);
-typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);
 #include <tdb-internal.h>
 #ifndef __BIGGEST_ALIGNMENT__
   #define __BIGGEST_ALIGNMENT__ 16
@@ -488,14 +486,13 @@ struct __toku_dbc {
   int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_heaviside)(DBC *, u_int32_t, YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction);
   int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range_reverse)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_get_both_range_reverse)(DBC *, u_int32_t, DBT *, DBT *, YDB_CALLBACK_FUNCTION, void *);
-  void* __toku_dummy0[17];
+  void* __toku_dummy0[18];
   char __toku_dummy1[104];
   int (*c_close) (DBC *); /* 32-bit offset=244 size=4, 64=bit offset=384 size=8 */
   int (*c_count) (DBC *, db_recno_t *, u_int32_t); /* 32-bit offset=248 size=4, 64=bit offset=392 size=8 */

buildheader/make_db_h.c

@@ -391,8 +391,6 @@ int main (int argc __attribute__((__unused__)), char *const argv[] __attribute__
     printf("typedef struct __toku_dbt DBT;\n");
     printf("typedef u_int32_t db_recno_t;\n");
     printf("typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);\n");
-    printf("typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);\n");
-    printf("typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);\n");
 
     printf("#include <tdb-internal.h>\n");
     
@@ -652,9 +650,7 @@ int main (int argc __attribute__((__unused__)), char *const argv[] __attribute__
 			     "int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *)",
 			     "int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *)",
 			     "int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *)",
-                             "int (*c_getf_heaviside)(DBC *, u_int32_t, "
-                                 "YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, "
-                                 "YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction)",
+
 			     "int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *)",
 			     "int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *)",
 			     "int (*c_getf_set_range_reverse)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *)",

buildheader/tdb.h

@@ -34,8 +34,6 @@ typedef struct __toku_dbc DBC;
 typedef struct __toku_dbt DBT;
 typedef u_int32_t db_recno_t;
 typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);
-typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);
-typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);
 #include <tdb-internal.h>
 #ifndef __BIGGEST_ALIGNMENT__
   #define __BIGGEST_ALIGNMENT__ 16
@@ -424,7 +422,6 @@ struct __toku_dbc {
   int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_heaviside)(DBC *, u_int32_t, YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction);
   int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range_reverse)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);

include/db.h

@@ -34,8 +34,6 @@ typedef struct __toku_dbc DBC;
 typedef struct __toku_dbt DBT;
 typedef u_int32_t db_recno_t;
 typedef int(*YDB_CALLBACK_FUNCTION)(DBT const*, DBT const*, void*);
-typedef int(*YDB_HEAVISIDE_CALLBACK_FUNCTION)(DBT const *key, DBT const *value, void *extra_f, int r_h);
-typedef int(*YDB_HEAVISIDE_FUNCTION)(const DBT *key, const DBT *value, void *extra_h);
 #include <tdb-internal.h>
 #ifndef __BIGGEST_ALIGNMENT__
   #define __BIGGEST_ALIGNMENT__ 16
@@ -424,7 +422,6 @@ struct __toku_dbc {
   int (*c_getf_prev_nodup)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_current_binding)(DBC *, u_int32_t, YDB_CALLBACK_FUNCTION, void *);
-  int (*c_getf_heaviside)(DBC *, u_int32_t, YDB_HEAVISIDE_CALLBACK_FUNCTION f, void *extra_f, YDB_HEAVISIDE_FUNCTION h, void *extra_h, int direction);
   int (*c_getf_set)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);
   int (*c_getf_set_range_reverse)(DBC *, u_int32_t, DBT *, YDB_CALLBACK_FUNCTION, void *);

newbrt/brt.c

@@ -5213,20 +5213,6 @@ toku_brt_cursor_peek(BRT_CURSOR cursor, const DBT **pkey, const DBT **pval)
     *pval = &cursor->val;
 }
 
-static int brt_cursor_compare_heaviside(brt_search_t *search, DBT *x, DBT *y) {
-    HEAVI_WRAPPER wrapper = search->context;
-    int r = wrapper->h(x, y, wrapper->extra_h);
-    // wrapper->r_h must have the same signus as the final chosen element.
-    // it is initialized to -1 or 1.  0's are closer to the min (max) that we
-    // want so once we hit 0 we keep it.
-    if (r==0) wrapper->r_h = 0;
-    //direction>0 means BRT_SEARCH_LEFT
-    //direction<0 means BRT_SEARCH_RIGHT
-    //direction==0 is not allowed
-    r = (wrapper->direction>0) ? r>=0 : r<=0;
-    return r;
-}
-
 //We pass in toku_dbt_fake to the search functions, since it will not pass the
 //key(or val) to the heaviside function if key(or val) is NULL.
 //It is not used for anything else,
@@ -5235,78 +5221,6 @@ static int brt_cursor_compare_heaviside(brt_search_t *search, DBT *x, DBT *y) {
 static const DBT __toku_dbt_fake;
 static const DBT* const toku_dbt_fake = &__toku_dbt_fake;
 
-#ifdef  BRT_LEVEL_STRADDLE_CALLBACK_LOGIC_NOT_READY
-struct brt_cursor_straddle_search_struct {
-    BRT_GET_STRADDLE_CALLBACK_FUNCTION getf;
-    void *getf_v;
-    BRT_CURSOR cursor;
-    brt_search_t *search;
-};
-
-static int
-straddle_hack_getf(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val,
-                   ITEMLEN next_keylen, bytevec next_key, ITEMLEN next_vallen, bytevec next_val, void* v) {
-    struct brt_cursor_straddle_search_struct *bcsss = v;
-    int old_hack_value = STRADDLE_HACK_INSIDE_CALLBACK;
-    STRADDLE_HACK_INSIDE_CALLBACK = 1;
-    int r = bcsss->getf(keylen, key, vallen, val, next_keylen, next_key, next_vallen, next_val, bcsss->getf_v);
-    STRADDLE_HACK_INSIDE_CALLBACK = old_hack_value;
-    return r;
-}
-#endif
-
-/* search for the first kv pair that matches the search object */
-static int
-brt_cursor_straddle_search(BRT_CURSOR cursor, brt_search_t *search, BRT_GET_STRADDLE_CALLBACK_FUNCTION getf, void *getf_v)
-{
-    brt_cursor_invalidate(cursor);
-#ifdef  BRT_LEVEL_STRADDLE_CALLBACK_LOGIC_NOT_READY
-    struct brt_cursor_straddle_search_struct bcsss = {getf, getf_v, cursor, search};
-    int r = toku_brt_search(cursor->brt, search, straddle_hack_getf, &bcsss, cursor, &cursor->root_put_counter);
-#else
-    int r = toku_brt_search(cursor->brt, search, getf, getf_v, logger, cursor, &cursor->root_put_counter);
-#endif
-    return r;
-}
-
-struct brt_cursor_heaviside_struct {
-    BRT_GET_STRADDLE_CALLBACK_FUNCTION getf;
-    void *getf_v;
-    HEAVI_WRAPPER wrapper;
-};
-
-static int
-heaviside_getf(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val,
-               ITEMLEN next_keylen, bytevec next_key, ITEMLEN next_vallen, bytevec next_val, void* v) {
-    struct brt_cursor_heaviside_struct *bchs = v;
-    if (bchs->wrapper->r_h==0) {
-        //PROVDELs can confuse the heaviside query.
-        //If r_h is 0, it might be wrong.
-        //Run the heaviside function again to get correct answer.
-        DBT dbtkey, dbtval;
-        bchs->wrapper->r_h = bchs->wrapper->h(toku_fill_dbt(&dbtkey, key, keylen),
-                                              toku_fill_dbt(&dbtval, val, vallen),
-                                              bchs->wrapper->extra_h);
-    }
-    int r = bchs->getf(keylen, key, vallen, val, next_keylen, next_key, next_vallen, next_val, bchs->getf_v);
-    return r;
-}
-
-int
-toku_brt_cursor_heaviside(BRT_CURSOR cursor, BRT_GET_STRADDLE_CALLBACK_FUNCTION getf, void *getf_v, HEAVI_WRAPPER wrapper)
-{
-    brt_search_t search; brt_search_init(&search, brt_cursor_compare_heaviside,
-                                         wrapper->direction < 0 ? BRT_SEARCH_RIGHT : BRT_SEARCH_LEFT,
-                                         toku_dbt_fake,
-                                         cursor->brt->flags & TOKU_DB_DUPSORT ? (DBT*)toku_dbt_fake : NULL,
-                                         wrapper);
-
-
-    struct brt_cursor_heaviside_struct bchs = {getf, getf_v, wrapper};
-
-    return brt_cursor_straddle_search(cursor, &search, heaviside_getf, &bchs);
-}
-
 BOOL toku_brt_cursor_uninitialized(BRT_CURSOR c) {
     return brt_cursor_not_set(c);
 }

newbrt/brt.h

@@ -151,13 +151,6 @@ int toku_brt_cursor_get_both_range(BRT_CURSOR cursor, DBT *key, DBT *val, BRT_GE
 int toku_brt_cursor_get_both_range_reverse(BRT_CURSOR cursor, DBT *key, DBT *val, BRT_GET_CALLBACK_FUNCTION getf, void *getf_v);
 
 
-typedef struct {
-    YDB_HEAVISIDE_FUNCTION h;
-    void *extra_h;
-    int r_h;
-    int direction;
-} *HEAVI_WRAPPER, HEAVI_WRAPPER_S;
-int toku_brt_cursor_heaviside(BRT_CURSOR cursor, BRT_GET_STRADDLE_CALLBACK_FUNCTION getf, void *getf_v, HEAVI_WRAPPER wrapper);
 int toku_brt_cursor_delete(BRT_CURSOR cursor, int flags, TOKUTXN);
 int toku_brt_cursor_close (BRT_CURSOR curs);
 BOOL toku_brt_cursor_uninitialized(BRT_CURSOR c);

newbrt/omt.h

@@ -125,7 +125,7 @@ extern "C" {
 //
 // The brt cursor implements its search by first finding a leaf node,
 // containing an OMT.  The BRT then passes its OMTCURSOR into the lookup
-// method (i.e., one of toku_ebdomt_fetch, toku_omt_find_zero,
+// method (i.e., one of toku_omt_fetch, toku_omt_find_zero,
 // toku_omt_find).  The lookup method, if successful, sets the
 // OMTCURSOR to refer to that element.
 //

src/tests/Makefile

@@ -148,11 +148,8 @@ BDB_DONTRUN_TESTS = \
         test_db_descriptor \
         test_db_descriptor_named_db \
         test_dbremove_old \
-        test_db_txn_locks_heaviside \
         test_dupsort_get_both_range_reverse \
         test_dupsort_set_range_reverse \
-        test_heaviside_rh_1756 \
-        test_heaviside_straddle_1622 \
         test_logflush \
         test_txn_abort6 \
         test_txn_abort8 \

src/tests/test_heaviside_straddle_1622.c

-/* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
-#include <memory.h>
-#include <toku_portability.h>
-#include <db.h>
-
-#include <errno.h>
-#include <sys/stat.h>
-
-#include "test.h"
-
-#define INT_BLOWUP 16
-
-struct heavi_extra {
-    DBT key;
-    DBT val;
-    DB* db;
-};
-
-static int
-int_ignore_dbt_cmp(DB *db, const DBT *a, const DBT *b) {
-    assert(db && a && b);
-    assert(a->size == INT_BLOWUP * sizeof(int));
-    assert(b->size == INT_BLOWUP * sizeof(int));
-
-    int x = *(int *) a->data;
-    int y = *(int *) b->data;
-
-    if (x<y) return -1;
-    if (x>y) return 1;
-    return 0;
-}
-
-static int
-heavi_find (const DBT *key, const DBT *val, void *extra) {
-    //Assumes cmp is int_dbt_cmp
-    struct heavi_extra *info = extra;
-    int cmp = int_ignore_dbt_cmp(info->db, key, &info->key);
-    if (cmp!=0) return cmp;
-    if (val) cmp = int_ignore_dbt_cmp(info->db, val, &info->val);
-    return cmp;
-}
-
-// ENVDIR is defined in the Makefile
-
-static DB *db;
-static DB_TXN* txns[(int)256];
-static DB_ENV* dbenv;
-static DBC*    cursors[(int)256];
-
-static void
-put(char txn, int _key, int _val) {
-    assert(txns[(int)txn]);
-    static int waste_key[INT_BLOWUP];
-    static int waste_val[INT_BLOWUP];
-    waste_key[0] = _key;
-    waste_val[0] = _val;
-    
-
-    int r;
-    DBT key;
-    DBT val;
-    
-    r = db->put(db, txns[(int)txn],
-                    dbt_init(&key, &waste_key[0], sizeof(waste_key)),
-                    dbt_init(&val, &waste_val[0], sizeof(waste_val)),
-                    DB_YESOVERWRITE);
-
-    CKERR(r);
-}
-
-static void
-init_txn (char name) {
-    int r;
-    assert(!txns[(int)name]);
-    r = dbenv->txn_begin(dbenv, NULL, &txns[(int)name], DB_TXN_NOWAIT);
-        CKERR(r);
-    assert(txns[(int)name]);
-}
-
-static void
-init_dbc (char name) {
-    int r;
-
-    assert(!cursors[(int)name] && txns[(int)name]);
-    r = db->cursor(db, txns[(int)name], &cursors[(int)name], 0);
-        CKERR(r);
-    assert(cursors[(int)name]);
-}
-
-static void
-commit_txn (char name) {
-    int r;
-    assert(txns[(int)name] && !cursors[(int)name]);
-
-    r = txns[(int)name]->commit(txns[(int)name], 0);
-        CKERR(r);
-    txns[(int)name] = NULL;
-}
-
-static void
-close_dbc (char name) {
-    int r;
-
-    assert(cursors[(int)name]);
-    r = cursors[(int)name]->c_close(cursors[(int)name]);
-        CKERR(r);
-    cursors[(int)name] = NULL;
-}
-
-static void
-setup_dbs (u_int32_t dup_flags) {
-    int r;
-
-    r = system("rm -rf " ENVDIR);
-    CKERR(r);
-    toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);
-    dbenv   = NULL;
-    db      = NULL;
-    /* Open/create primary */
-    r = db_env_create(&dbenv, 0);
-        CKERR(r);
-    r = dbenv->set_cachesize(dbenv, 0, 4096, 1);
-    u_int32_t env_txn_flags  = DB_INIT_TXN | DB_INIT_LOCK;
-    u_int32_t env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL;
-	r = dbenv->open(dbenv, ENVDIR, env_open_flags | env_txn_flags, 0600);
-        CKERR(r);
-    
-    r = db_create(&db, dbenv, 0);
-        CKERR(r);
-    if (dup_flags) {
-        r = db->set_flags(db, dup_flags);
-            CKERR(r);
-    }
-    r = db->set_bt_compare( db, int_ignore_dbt_cmp);
-    CKERR(r);
-    r = db->set_dup_compare(db, int_ignore_dbt_cmp);
-    CKERR(r);
-    r = db->set_pagesize(db, 4096);
-    char a;
-    for (a = 'a'; a <= 'z'; a++) init_txn(a);
-    init_txn('\0');
-    r = db->open(db, txns[(int)'\0'], "foobar.db", NULL, DB_BTREE, DB_CREATE, 0600);
-        CKERR(r);
-    commit_txn('\0');
-    for (a = 'a'; a <= 'z'; a++) init_dbc(a);
-}
-
-static void
-close_dbs(void) {
-    char a;
-    for (a = 'a'; a <= 'z'; a++) {
-        if (cursors[(int)a]) close_dbc(a);
-        if (txns[(int)a])    commit_txn(a);
-    }
-
-    int r;
-    r = db->close(db, 0);
-        CKERR(r);
-    db      = NULL;
-    r = dbenv->close(dbenv, 0);
-        CKERR(r);
-    dbenv   = NULL;
-}
-
-
-struct dbt_pair {
-    DBT key;
-    DBT val;
-};
-
-struct int_pair {
-    int key;
-    int val;
-};
-
-int got_r_h;
-
-static __attribute__((__unused__))
-int
-f_heavi (DBT const *key, DBT const *val, void *extra_f, int r_h) {
-    struct int_pair *info = extra_f;
-
-    if (r_h==0) got_r_h = 0;
-    assert(key->size == INT_BLOWUP * sizeof(int));
-    assert(val->size == INT_BLOWUP * sizeof(int));
-    
-    info->key = *(int*)key->data;
-    info->val = *(int*)val->data;
-    int r = 0;
-    return r;
-}
-
-static __attribute__((__unused__))
-void
-ignore (void *ignore __attribute__((__unused__))) {
-}
-#define TOKU_IGNORE(x) ignore((void*)x)
-
-static void
-cget_heavi (char txn, int _key, int _val, 
-	    int _key_expect, int _val_expect, int direction,
-	    int r_h_expect) {
-    assert(txns[(int)txn] && cursors[(int)txn]);
-
-    static int waste_key[INT_BLOWUP];
-    static int waste_val[INT_BLOWUP];
-    waste_key[0] = _key;
-    waste_val[0] = _val;
-    int r;
-    struct heavi_extra input;
-    struct int_pair output;
-    dbt_init(&input.key, &waste_key[0], sizeof(waste_key));
-    dbt_init(&input.val, &waste_val[0], sizeof(waste_val));
-    input.db = db;
-    output.key = 0;
-    output.val = 0;
-    
-    got_r_h = direction;
-
-    r = cursors[(int)txn]->c_getf_heaviside(cursors[(int)txn], 0, //No prelocking
-               f_heavi, &output,
-               heavi_find, &input, direction);
-    CKERR(r);
-    assert(got_r_h == r_h_expect);
-    assert(output.key == _key_expect);
-    assert(output.val == _val_expect);
-}
-
-
-static void
-test(u_int32_t dup_flags) {
-    /* ********************************************************************** */
-    int i;
-    int j;
-    const int max_inserts = 2*4096/(INT_BLOWUP*sizeof(int));
-    for (i=1; i <= max_inserts ; i++) {
-        setup_dbs(dup_flags);
-        if (verbose) {
-            printf("%s: put %d\n", __FILE__, i);
-            fflush(stdout);
-        }
-        for (j=0; j < i; j++) {
-            put('a', j, j);
-        }
-        cget_heavi('a', i-1, i-1, i-1, i-1, 1, 0);
-        close_dbs();
-    }
-}
-
-int
-test_main(int argc, char *const argv[]) {
-    parse_args(argc, argv);
-    test(0);
-    test(DB_DUP | DB_DUPSORT);
-    return 0;
-}