Addresses #1031

Invalidates cursors when we run off the end of a leaf.

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

newbrt/brt.c

@@ -3418,10 +3418,12 @@ static int brt_cursor_next_shortcut (BRT_CURSOR cursor, DBT *outkey, DBT *outval
         //Save current value in prev.
         save_omtcursor_current_in_prev(cursor);
 
+        u_int32_t starting_index;
         u_int32_t index;
         u_int32_t size = toku_omt_size(toku_omt_cursor_get_omt(cursor->omtcursor));
-        int r = toku_omt_cursor_current_index(cursor->omtcursor, &index);
+        int r = toku_omt_cursor_current_index(cursor->omtcursor, &starting_index);
         assert(r==0);
+        index = starting_index;
         while (index+1 < size) {
             r = toku_omt_cursor_next(cursor->omtcursor, &le);
             assert(r==0);
@@ -3437,7 +3439,8 @@ static int brt_cursor_next_shortcut (BRT_CURSOR cursor, DBT *outkey, DBT *outval
 
             return brt_cursor_copyout(cursor, outkey, outval);
         }
-        brt_cursor_invalidate_callback(cursor->omtcursor, cursor);
+        toku_omt_cursor_set_index(cursor->omtcursor, starting_index);
+        toku_omt_cursor_invalidate(cursor->omtcursor);
     }
     return -1;
 }
@@ -3578,9 +3581,11 @@ static int brt_cursor_prev_shortcut (BRT_CURSOR cursor, DBT *outkey, DBT *outval
         //Save current value in prev.
         save_omtcursor_current_in_prev(cursor);
 
-        u_int32_t index = 0;
-        int r = toku_omt_cursor_current_index(cursor->omtcursor, &index);
+        u_int32_t starting_index = 0;
+        u_int32_t index;
+        int r = toku_omt_cursor_current_index(cursor->omtcursor, &starting_index);
         assert(r==0);
+        index = starting_index;
         while (index>0) {
             r = toku_omt_cursor_prev(cursor->omtcursor, &le);
             assert(r==0);
@@ -3596,7 +3601,8 @@ static int brt_cursor_prev_shortcut (BRT_CURSOR cursor, DBT *outkey, DBT *outval
 
             return brt_cursor_copyout(cursor, outkey, outval);
         }
-        brt_cursor_invalidate_callback(cursor->omtcursor, cursor);
+        toku_omt_cursor_set_index(cursor->omtcursor, starting_index);
+        toku_omt_cursor_invalidate(cursor->omtcursor);
     }
     return -1;
 }

newbrt/omt.c

@@ -612,6 +612,11 @@ int toku_omt_cursor_is_valid (OMTCURSOR c) {
     return c->omt!=NULL;
 }
 
+void toku_omt_cursor_set_index(OMTCURSOR c, u_int32_t index) {
+    assert(c->omt);
+    c->index = index;
+}
+
 int toku_omt_cursor_next (OMTCURSOR c, OMTVALUE *v) {
     if (c->omt == NULL) return EINVAL;
     c->index++;

newbrt/omt.h

@@ -270,6 +270,11 @@ int toku_omt_delete_at(OMT omt, u_int32_t index);
 // Rationale: To delete an item, first find its index using toku_omt_find, then delete it.
 // Performance: time=O(\log N) amortized.
 
+void toku_omt_cursor_set_index(OMTCURSOR c, u_int32_t index);
+// Effect:
+//  Set the abstract index.
+// Requires:
+//  The cursor is not invalid.
 
 int toku_omt_fetch (OMT V, u_int32_t i, OMTVALUE *v, OMTCURSOR c);
 // Effect: Set *v=V_i