closes #523

always have lock escalation to be turned on

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

src/lock_tree/locktree.c

@@ -1238,13 +1238,10 @@ static int toku__do_escalation(toku_lock_tree* tree, BOOL* locks_available) {
     r = 0;
     *locks_available = toku__lt_range_test_incr(tree, 0);
     /* Escalation is allowed if 1/10th of the locks (or more) are free. */
-    tree->lock_escalation_allowed = toku__lt_percent_ranges_free(tree,
-                                             TOKU_DISABLE_ESCALATION_THRESHOLD);
 cleanup:
     if (r!=0) {
         if (tree && locks_available) {
             *locks_available              = FALSE;
-            tree->lock_escalation_allowed = FALSE;
         }
     }
     return r;
@@ -1576,9 +1573,6 @@ int toku_lt_unlock(toku_lock_tree* tree, DB_TXN* txn) {
     
     toku__lt_range_decr(tree, ranges);
 
-    if (toku__lt_percent_ranges_free(tree, TOKU_ENABLE_ESCALATION_THRESHOLD)) {
-        tree->lock_escalation_allowed = TRUE;
-    }
 
     return 0;
 }

src/lock_tree/locktree.h

@@ -30,9 +30,6 @@ typedef enum {
                                    state */
 } TOKU_LT_ERROR;
 
-#define TOKU_DISABLE_ESCALATION_THRESHOLD 10
-#define TOKU_ENABLE_ESCALATION_THRESHOLD  20
-
 /** Convert error codes into a human-readable error message */
 char* toku_lt_strerror(TOKU_LT_ERROR r /**< Error code */) 
                        __attribute__((const,pure));

src/lock_tree/tests/test_00060_lock_escalation.c

@@ -368,11 +368,8 @@ void run_escalation_test(BOOL dups) {
     }
     assert(lt->lock_escalation_allowed);
     lt_insert_write(dups, ENOMEM, 'a', 100, 100);
-    assert(!lt->lock_escalation_allowed);
     lt_insert_write(dups, ENOMEM, 'b', 100, 100);
-    assert(!lt->lock_escalation_allowed);
     lt_insert_write(dups, ENOMEM, 'c', 100, 100);
-    assert(!lt->lock_escalation_allowed);
     lt_insert_read(dups, ENOMEM, 'a', 100, 100, 100, 100);
     lt_insert_read(dups, ENOMEM, 'b', 100, 100, 100, 100);
     lt_insert_read(dups, ENOMEM, 'c', 100, 100, 100, 100);