Closes #855 Merged back into trunk

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

newbrt/brt-internal.h

@@ -13,8 +13,6 @@
 #include "kv-pair.h"
 #include "leafentry.h"
 
-typedef void* OMTVALUE;
-
 #include "omt.h"
 
 #ifndef BRT_FANOUT

newbrt/brt-test-helpers.c

@@ -91,7 +91,7 @@ int toku_testsetup_insert_to_leaf (BRT brt, DISKOFF diskoff, char *key, int keyl
     BRT_CMD_S cmd = {BRT_INSERT, 0, .u.id={toku_fill_dbt(&keydbt, key, keylen),
 					   toku_fill_dbt(&valdbt, val, vallen)}};
     struct cmd_leafval_bessel_extra be = {brt, &cmd, node->flags & TOKU_DB_DUPSORT};
-    r = toku_omt_find_zero(node->u.l.buffer, toku_cmd_leafval_bessel, &be, &storeddatav, &idx);
+    r = toku_omt_find_zero(node->u.l.buffer, toku_cmd_leafval_bessel, &be, &storeddatav, &idx, NULL);
 
 
     if (r==0) {

newbrt/brt.c

@@ -469,7 +469,7 @@ static int brtleaf_split (TOKULOGGER logger, FILENUM filenum, BRT t, BRTNODE nod
     if (splitk) {
 	memset(splitk, 0, sizeof *splitk);
 	OMTVALUE lev;
-	r=toku_omt_fetch(node->u.l.buffer, toku_omt_size(node->u.l.buffer)-1, &lev);
+	r=toku_omt_fetch(node->u.l.buffer, toku_omt_size(node->u.l.buffer)-1, &lev, NULL);
 	assert(r==0); // that fetch should have worked.
 	LEAFENTRY le=lev;
 	if (node->flags&TOKU_DB_DUPSORT) {
@@ -1461,7 +1461,7 @@ static int brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd,
     FILENUM filenum = toku_cachefile_filenum(t->cf);
 
     LEAFENTRY storeddata;
-    OMTVALUE storeddatav;
+    OMTVALUE storeddatav=NULL; // TODO BBB This is not entirely safe. Verify initialization needed.
 
     u_int32_t idx;
     int r;
@@ -1476,7 +1476,7 @@ static int brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd,
     case BRT_INSERT:
 	
 	r = toku_omt_find_zero(node->u.l.buffer, toku_cmd_leafval_bessel, &be,
-			       &storeddatav, &idx);
+			       &storeddatav, &idx, NULL);
 	if (r==DB_NOTFOUND) {
 	    storeddata = 0;
 	} else if (r!=0) {
@@ -1494,7 +1494,7 @@ static int brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd,
 
 	// Delete the one item
 	r = toku_omt_find_zero(node->u.l.buffer, toku_cmd_leafval_bessel,  &be,
-			       &storeddatav, &idx);
+			       &storeddatav, &idx, NULL);
 	if (r == DB_NOTFOUND) break;
 	if (r != 0) return r;
 	storeddata=storeddatav;
@@ -1515,7 +1515,7 @@ static int brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd,
 	// Delete all the matches
 
 	r = toku_omt_find_zero(node->u.l.buffer, toku_cmd_leafval_bessel, &be,
-			       &storeddatav, &idx);
+			       &storeddatav, &idx, NULL);
 	if (r == DB_NOTFOUND) break;
 	if (r != 0) return r;
 	storeddata=storeddatav;
@@ -1532,7 +1532,7 @@ static int brt_leaf_put_cmd (BRT t, BRTNODE node, BRT_CMD cmd,
 	    BRT_CMD_S ncmd = { cmd->type, cmd->xid, .u.id={cmd->u.id.key, toku_fill_dbt(&valdbt, save_val, vallen)}};
 	    struct cmd_leafval_bessel_extra nbe = {t, &ncmd, 1};
 	    r = toku_omt_find(node->u.l.buffer, toku_cmd_leafval_bessel,  &nbe, +1,
-			      &storeddatav, &idx);
+			      &storeddatav, &idx, NULL);
 	    
 	    toku_free(save_val);
 	    if (r!=0) break;
@@ -2708,7 +2708,7 @@ static int brt_search_leaf_node(BRT brt, BRTNODE node, brt_search_t *search, DBT
 			  bessel_from_search_t,
 			  search,
 			  direction,
-			  &datav, &idx);
+			  &datav, &idx, NULL);
     if (r!=0) return r;
 
     LEAFENTRY le = datav;
@@ -2727,7 +2727,7 @@ static int brt_search_leaf_node(BRT brt, BRTNODE node, brt_search_t *search, DBT
 		break;
 	    }
 	    if (idx>=toku_omt_size(node->u.l.buffer)) continue;
-	    r = toku_omt_fetch(node->u.l.buffer, idx, &datav);
+	    r = toku_omt_fetch(node->u.l.buffer, idx, &datav, NULL);
 	    assert(r==0); // we just validated the index
 	    le = datav;
 	    if (!le_is_provdel(le)) goto got_a_good_value;
@@ -3246,12 +3246,14 @@ static void toku_brt_keyrange_internal (BRT brt, CACHEKEY nodename, DBT *key, u_
 	BRT_CMD_S cmd = { BRT_INSERT, 0, .u.id={key,0}};
 	struct cmd_leafval_bessel_extra be = {brt, &cmd, 0};
 	u_int32_t idx;
-	int r = toku_omt_find_zero(node->u.l.buffer, toku_cmd_leafval_bessel, &be, 0, &idx);
+	int r = toku_omt_find_zero(node->u.l.buffer, toku_cmd_leafval_bessel, &be, 0, &idx, NULL);
+        // TODO: Check for r==ENOMEM if the last argument (cursor) is not NULL
+        // (history: we changed find_zero to support cursor, and now find_zero can fail if the cursor cannot grow)
 	*less += idx;
 	if (r==0 && (brt->flags & TOKU_DB_DUP)) {
 	    // There is something, and so we now want to find the rightmost extent.
 	    u_int32_t idx2;
-	    r = toku_omt_find(node->u.l.buffer, toku_cmd_leafval_bessel, &be, +1, 0, &idx2);
+	    r = toku_omt_find(node->u.l.buffer, toku_cmd_leafval_bessel, &be, +1, 0, &idx2, NULL);
 	    if (r==0) {
 		*greater += toku_omt_size(node->u.l.buffer)-idx2;
 		*equal   += idx2-idx;

newbrt/log.c

@@ -1022,7 +1022,7 @@ static int find_filenum (OMTVALUE v, void *brtv) {
 int toku_txn_note_brt (TOKUTXN txn, BRT brt) {
     OMTVALUE txnv;
     u_int32_t index;
-    int r = toku_omt_find_zero(brt->txns, find_ptr, txn, &txnv, &index);
+    int r = toku_omt_find_zero(brt->txns, find_ptr, txn, &txnv, &index, NULL);
     if (r==0) {
 	// It's already there.
 	assert((TOKUTXN)txnv==txn);
@@ -1039,9 +1039,9 @@ int toku_txn_note_brt (TOKUTXN txn, BRT brt) {
 static int remove_brt (OMTVALUE txnv, u_int32_t UU(idx), void *brtv) {
     TOKUTXN txn = txnv;
     BRT     brt = brtv;
-    OMTVALUE brtv_again;
+    OMTVALUE brtv_again=0;  // TODO BBB This is not entirely safe. Verify initialization needed.
     u_int32_t index;
-    int r = toku_omt_find_zero(txn->open_brts, find_filenum, brt, &brtv_again, &index);
+    int r = toku_omt_find_zero(txn->open_brts, find_filenum, brt, &brtv_again, &index, NULL);
     assert(r==0);
     assert((void*)brtv_again==brtv);
     r = toku_omt_delete_at(txn->open_brts, index);
@@ -1058,9 +1058,9 @@ int toku_txn_note_close_brt (BRT brt) {
 static int remove_txn (OMTVALUE brtv, u_int32_t UU(idx), void *txnv) {
     BRT brt     = brtv;
     TOKUTXN txn = txnv;
-    OMTVALUE txnv_again;
+    OMTVALUE txnv_again=0; // TODO BBB This is not entirely safe. Verify initialization needed.
     u_int32_t index;
-    int r = toku_omt_find_zero(brt->txns, find_ptr, txn, &txnv_again, &index);
+    int r = toku_omt_find_zero(brt->txns, find_ptr, txn, &txnv_again, &index, NULL);
     assert(r==0);
     assert((void*)txnv_again==txnv);
     r = toku_omt_delete_at(brt->txns, index);

newbrt/omt-internal.h

+/**
+  \brief OMT implementation header
+*/
+
+#if !defined(OMTI_H)
+#define OMTI_H
+
+#ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
+
+#include <stdint.h>
+
+/** Type for the node index */
+typedef u_int32_t node_idx;
+
+
+/** Define a NULL index in the node array */
+#define NODE_NULL UINT32_MAX
+
+/** OMT node */
+typedef struct omt_node *OMT_NODE;
+struct omt_node {
+    u_int32_t weight; /* Size of subtree rooted at this node 
+                         (including this one). */
+    node_idx  left;   /* Index of left  subtree. */
+    node_idx  right;  /* Index of right subtree. */
+    OMTVALUE  value;  /* The value stored in the node. */
+};
+
+/** Order Maintenance Tree */
+struct omt {
+    node_idx   root;
+
+    u_int32_t  node_capacity;
+    OMT_NODE   nodes;
+    node_idx   free_idx;
+
+    u_int32_t  tmparray_size;
+    node_idx*  tmparray;
+};
+
+//Initial max size of root-to-leaf path
+#define TOKU_OMTCURSOR_INITIAL_SIZE 64
+
+// Cursor for order maintenance tree
+struct omtcursor {
+    u_int32_t max_pathlen; //Max (root to leaf) path length;
+    u_int32_t pathlen;     //Length of current path
+    node_idx *path;
+    OMT       omt;         //Associated OMT
+};
+
+
+#endif  /* #ifndef OMTI_H */
+

newbrt/recover.c

@@ -607,7 +607,7 @@ void toku_recover_deleteleafentry (LSN lsn, FILENUM filenum, DISKOFF diskoff, u_
     node->log_lsn = lsn;
     {
 	OMTVALUE data = 0;
-	r=toku_omt_fetch(node->u.l.buffer, idx, &data);
+	r=toku_omt_fetch(node->u.l.buffer, idx, &data, NULL);
 	assert(r==0);
 	LEAFENTRY oldleafentry=data;
 	u_int32_t  len = leafentry_memsize(oldleafentry);

newbrt/roll.c

@@ -55,8 +55,8 @@ static int do_insertion (enum brt_cmd_type type, TXNID xid, FILENUM filenum, BYT
 				data
 				? toku_fill_dbt(&data_dbt, data->data, data->len)
 				: toku_init_dbt(&data_dbt) }};
-    OMTVALUE brtv;
-    r = toku_omt_find_zero(txn->open_brts, find_brt_from_filenum, &filenum, &brtv, NULL);
+    OMTVALUE brtv=NULL; // TODO BBB This is not entirely safe. Verify initialization needed.
+    r = toku_omt_find_zero(txn->open_brts, find_brt_from_filenum, &filenum, &brtv, NULL, NULL);
 
     if (r==DB_NOTFOUND) {
 	r = toku_cachefile_root_put_cmd(cf, &brtcmd, toku_txn_logger(txn));