addresses #523

create (but not yet implement) functions for lock escalation

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

src/lock_tree/locktree.h

@@ -68,6 +68,8 @@ struct __toku_lock_tree {
     u_int32_t           max_ranges;
     /** The current number of ranges. */
     u_int32_t*          num_ranges;
+    /** Whether lock escalation is allowed. */
+    BOOL                lock_escalation_allowed;
     /** The lock callback function. */
     int               (*lock_callback)(DB_TXN*, toku_lock_tree*);
     /** The key compare function */

src/lock_tree/tests/test_00040_write.c

@@ -198,12 +198,12 @@ void runtest(BOOL dups) {
     /* ********************* */
     setup_tree(dups);
     lt_insert_write(dups, 0, 'a', 1, 1);
-    lt_insert_read (dups, DB_LOCK_DEADLOCK, 'b', 1, 1, 1, 1);
+    lt_insert_read (dups, DB_LOCK_NOTGRANTED, 'b', 1, 1, 1, 1);
     close_tree();
     /* ********************* */
     setup_tree(dups);
     lt_insert_read (dups, 0, 'b', 1, 1, 1, 1);
-    lt_insert_write(dups, DB_LOCK_DEADLOCK, 'a', 1, 1);
+    lt_insert_write(dups, DB_LOCK_NOTGRANTED, 'a', 1, 1);
     close_tree();
     /* ********************* */
     setup_tree(dups);
@@ -212,7 +212,7 @@ void runtest(BOOL dups) {
     lt_insert_write(dups, 0, 'a', 3, 1);
     lt_insert_write(dups, 0, 'a', 4, 1);
     lt_insert_write(dups, 0, 'a', 5, 1);
-    lt_insert_read (dups, DB_LOCK_DEADLOCK, 'b', 2, 1, 4, 1);
+    lt_insert_read (dups, DB_LOCK_NOTGRANTED, 'b', 2, 1, 4, 1);
     close_tree();
     /* ********************* */
     setup_tree(dups);
@@ -221,7 +221,7 @@ void runtest(BOOL dups) {
     lt_insert_write(dups, 0, 'a', 3, 1);
     lt_insert_write(dups, 0, 'a', 4, 1);
     lt_insert_write(dups, 0, 'a', 5, 1);
-    lt_insert_write (dups, DB_LOCK_DEADLOCK, 'b', 2, 1);
+    lt_insert_write (dups, DB_LOCK_NOTGRANTED, 'b', 2, 1);
     close_tree();
     /* ********************* */
     setup_tree(dups);
@@ -250,7 +250,7 @@ void runtest(BOOL dups) {
     lt_insert_write(dups, 0, 'a', 7, 1);
     lt_insert_write(dups, 0, 'a', 8, 1);
     lt_insert_write(dups, 0, 'a', 9, 1);
-    lt_insert_read (dups, DB_LOCK_DEADLOCK, 'a', 3, 1, 7, 1);
+    lt_insert_read (dups, DB_LOCK_NOTGRANTED, 'a', 3, 1, 7, 1);
     close_tree();
     /* ********************* */
     setup_tree(dups);
@@ -263,7 +263,7 @@ void runtest(BOOL dups) {
     lt_insert_write(dups, 0, 'b', 7, 1);
     lt_insert_write(dups, 0, 'b', 8, 1);
     lt_insert_write(dups, 0, 'b', 9, 1);
-    lt_insert_read (dups, DB_LOCK_DEADLOCK, 'a', 3, 1, 7, 1);
+    lt_insert_read (dups, DB_LOCK_NOTGRANTED, 'a', 3, 1, 7, 1);
     close_tree();
     /* ********************* */
     setup_tree(dups);
@@ -279,7 +279,7 @@ void runtest(BOOL dups) {
     lt_insert_write(dups, 0, 'b', 2, 1);
     lt_insert_write(dups, 0, 'b', 3, 1);
     lt_insert_write(dups, 0, 'b', 4, 1);
-    lt_insert_read (dups, DB_LOCK_DEADLOCK, 'a', 3, 1, 7, 1);
+    lt_insert_read (dups, DB_LOCK_NOTGRANTED, 'a', 3, 1, 7, 1);
     close_tree();
     /* ********************* */
     setup_tree(dups);
@@ -303,10 +303,10 @@ void runtest(BOOL dups) {
     lt_insert_write(dups, 0, 'a', 2, 1);
     lt_insert_write(dups, 0, 'a', 3, 1);
     lt_insert_write(dups, 0, 'a', 4, 1);
-    lt_insert_read (dups, DB_LOCK_DEADLOCK, 'b', 3, 1, 3, 1);
+    lt_insert_read (dups, DB_LOCK_NOTGRANTED, 'b', 3, 1, 3, 1);
     lt_unlock('a');
     lt_insert_write(dups, 0, 'b', 3, 1);
-    lt_insert_read (dups, DB_LOCK_DEADLOCK, 'a', 3, 1, 3, 1);
+    lt_insert_read (dups, DB_LOCK_NOTGRANTED, 'a', 3, 1, 3, 1);
     lt_unlock('b');
     lt_insert_read (dups, 0, 'a', 3, 1, 3, 1);
     close_tree();

src/range_tree/linear.c

@@ -256,10 +256,10 @@ int toku_rt_next (toku_range_tree* range_tree, toku_range* out_range, BOOL* elem
     /* Check to see if range tree is in invalid iteration state */
     if (!range_tree->i.iter_is_valid) { r = EDOM;   goto cleanup; }
     
-    *elem_found = range_tree->i.iter_index < range_tree->i.ranges_len;
+    *elem_found                 = range_tree->i.iter_index < range_tree->numelements;
+    range_tree->i.iter_is_valid = range_tree->i.iter_index < range_tree->numelements;
     if (*elem_found) { *out_range = range_tree->i.ranges[range_tree->i.iter_index]; }
     range_tree->i.iter_index++;
-    range_tree->i.iter_is_valid = range_tree->i.iter_index < range_tree->i.ranges_len;
     r = 0;
 cleanup:
     if (range_tree && r!=0) { toku_rt_invalidate_iteration(range_tree); }