Merge branch 'bugs/mongo-399'

buildheader/make_tdb.cc

@@ -523,7 +523,7 @@ static void print_db_struct (void) {
 			 "int (*change_descriptor) (DB*, DB_TXN*, const DBT* descriptor, uint32_t) /* change row/dictionary descriptor for a db.  Available only while db is open */",
 			 "int (*getf_set)(DB*, DB_TXN*, uint32_t, DBT*, YDB_CALLBACK_FUNCTION, void*) /* same as DBC->c_getf_set without a persistent cursor) */",
 			 "int (*optimize)(DB*) /* Run garbage collecion and promote all transactions older than oldest. Amortized (happens during flattening) */",
-			 "int (*hot_optimize)(DB*, int (*progress_callback)(void *progress_extra, float progress), void *progress_extra)",
+			 "int (*hot_optimize)(DB*, DBT*, DBT*, int (*progress_callback)(void *progress_extra, float progress), void *progress_extra)",
 			 "int (*get_fragmentation)(DB*,TOKU_DB_FRAGMENTATION)",
 			 "int (*change_pagesize)(DB*,uint32_t)",
 			 "int (*change_readpagesize)(DB*,uint32_t)",

ft/ft-flusher.h

@@ -222,10 +222,14 @@ void toku_ft_hot_status_init(void) __attribute__((__constructor__));
 void toku_ft_hot_get_status(FT_HOT_STATUS);
 
 /**
- * Takes given FT and pushes all pending messages to the leaf nodes.
+ * Takes given FT and pushes all pending messages between left and right to the leaf nodes.
+ * All messages between left and right (inclusive) will be pushed, as will some others
+ * that happen to share buffers with messages near the boundary.
+ * If left is NULL, messages from beginning of FT are pushed. If right is NULL, that means
+ * we go until the end of the FT.
  */
 int
-toku_ft_hot_optimize(FT_HANDLE brt,
+toku_ft_hot_optimize(FT_HANDLE brt, DBT* left, DBT* right,
                       int (*progress_callback)(void *extra, float progress),
                       void *progress_extra);
 

ft/ft-hot-flusher.cc

@@ -155,6 +155,16 @@ hot_set_highest_key(struct hot_flusher_extra *flusher)
     }
 }
 
+static void
+hot_set_start_key(struct hot_flusher_extra *flusher, const DBT* start)
+{
+    toku_destroy_dbt(&flusher->highest_pivot_key);
+    if (start != NULL) {
+        // Otherwise, let's copy all the contents from one key to the other.
+        toku_clone_dbt(&flusher->highest_pivot_key, *start);
+    }
+}
+
 static int
 hot_just_pick_child(FT h,
                     FTNODE parent,
@@ -286,7 +296,7 @@ hot_flusher_destroy(struct hot_flusher_extra *flusher)
 // Entry point for Hot Optimize Table (HOT).  Note, this function is
 // not recursive.  It iterates over root-to-leaf paths.
 int
-toku_ft_hot_optimize(FT_HANDLE brt,
+toku_ft_hot_optimize(FT_HANDLE brt, DBT* left, DBT* right,
                       int (*progress_callback)(void *extra, float progress),
                       void *progress_extra)
 {
@@ -295,6 +305,7 @@ toku_ft_hot_optimize(FT_HANDLE brt,
     struct flusher_advice advice;
 
     hot_flusher_init(&advice, &flusher);
+    hot_set_start_key(&flusher, left);
 
     uint64_t loop_count = 0;
     MSN msn_at_start_of_hot = ZERO_MSN;  // capture msn from root at
@@ -368,6 +379,15 @@ toku_ft_hot_optimize(FT_HANDLE brt,
         if (flusher.max_current_key.data == NULL) {
             flusher.rightmost_leaf_seen = 1;
         }
+        else if (right) {
+            // if we have flushed past the bounds set for us,
+            // set rightmost_leaf_seen so we exit
+            FAKE_DB(db, &brt->ft->cmp_descriptor);
+            int cmp = brt->ft->compare_fun(&db, &flusher.max_current_key, right);
+            if (cmp > 0) {
+                flusher.rightmost_leaf_seen = 1;
+            }
+        }
 
         // Update HOT's progress.
         if (progress_callback != NULL) {

ft/tests/test-hot-with-bounds.cc

+/* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+// vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
+#ident "$Id$"
+/*
+COPYING CONDITIONS NOTICE:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation, and provided that the
+  following conditions are met:
+
+      * Redistributions of source code must retain this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below).
+
+      * Redistributions in binary form must reproduce this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below) in the documentation and/or other materials
+        provided with the distribution.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+
+COPYRIGHT NOTICE:
+
+  TokuDB, Tokutek Fractal Tree Indexing Library.
+  Copyright (C) 2007-2013 Tokutek, Inc.
+
+DISCLAIMER:
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+UNIVERSITY PATENT NOTICE:
+
+  The technology is licensed by the Massachusetts Institute of
+  Technology, Rutgers State University of New Jersey, and the Research
+  Foundation of State University of New York at Stony Brook under
+  United States of America Serial No. 11/760379 and to the patents
+  and/or patent applications resulting from it.
+
+PATENT MARKING NOTICE:
+
+  This software is covered by US Patent No. 8,185,551.
+
+PATENT RIGHTS GRANT:
+
+  "THIS IMPLEMENTATION" means the copyrightable works distributed by
+  Tokutek as part of the Fractal Tree project.
+
+  "PATENT CLAIMS" means the claims of patents that are owned or
+  licensable by Tokutek, both currently or in the future; and that in
+  the absence of this license would be infringed by THIS
+  IMPLEMENTATION or by using or running THIS IMPLEMENTATION.
+
+  "PATENT CHALLENGE" shall mean a challenge to the validity,
+  patentability, enforceability and/or non-infringement of any of the
+  PATENT CLAIMS or otherwise opposing any of the PATENT CLAIMS.
+
+  Tokutek hereby grants to you, for the term and geographical scope of
+  the PATENT CLAIMS, a non-exclusive, no-charge, royalty-free,
+  irrevocable (except as stated in this section) patent license to
+  make, have made, use, offer to sell, sell, import, transfer, and
+  otherwise run, modify, and propagate the contents of THIS
+  IMPLEMENTATION, where such license applies only to the PATENT
+  CLAIMS.  This grant does not include claims that would be infringed
+  only as a consequence of further modifications of THIS
+  IMPLEMENTATION.  If you or your agent or licensee institute or order
+  or agree to the institution of patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging that
+  THIS IMPLEMENTATION constitutes direct or contributory patent
+  infringement, or inducement of patent infringement, then any rights
+  granted to you under this License shall terminate as of the date
+  such litigation is filed.  If you or your agent or exclusive
+  licensee institute or order or agree to the institution of a PATENT
+  CHALLENGE, then Tokutek may terminate any rights granted to you
+  under this License.
+*/
+
+#ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
+#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
+/* The goal of this test.  Make sure that inserts stay behind deletes. */
+
+
+#include "test.h"
+
+#include <ft-cachetable-wrappers.h>
+#include "ft-flusher.h"
+#include "ft-flusher-internal.h"
+#include "checkpoint.h"
+
+static TOKUTXN const null_txn = 0;
+static DB * const null_db = 0;
+
+enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
+
+static void
+doit (void) {
+    BLOCKNUM node_leaf[3];
+    BLOCKNUM node_root;
+    
+    CACHETABLE ct;
+    FT_HANDLE t;
+
+    int r;
+
+    toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER);
+    unlink(TOKU_TEST_FILENAME);
+    r = toku_open_ft_handle(TOKU_TEST_FILENAME, 1, &t, NODESIZE, NODESIZE/2, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun);
+    assert(r==0);
+
+    toku_testsetup_initialize();  // must precede any other toku_testsetup calls
+
+    r = toku_testsetup_leaf(t, &node_leaf[0], 1, NULL, NULL);
+    assert(r==0);
+    r = toku_testsetup_leaf(t, &node_leaf[1], 1, NULL, NULL);
+    assert(r==0);
+    r = toku_testsetup_leaf(t, &node_leaf[2], 1, NULL, NULL);
+    assert(r==0);
+
+    int keylens[2];
+    keylens[0] = 2;
+    keylens[1] = 2;
+    char first[2];
+    first[0] = 'f';
+    first[1] = 0;
+    char second[2];
+    second[0] = 'p';
+    second[1] = 0;
+
+    char* keys[2];
+    keys[0] = first;
+    keys[1] = second;
+    r = toku_testsetup_nonleaf(t, 1, &node_root, 3, node_leaf, keys, keylens);
+    assert(r==0);
+
+    r = toku_testsetup_root(t, node_root);
+    assert(r==0);
+
+
+    r = toku_testsetup_insert_to_nonleaf(
+        t, 
+        node_root, 
+        FT_INSERT,
+        "a",
+        2,
+        NULL,
+        0
+        );
+    r = toku_testsetup_insert_to_nonleaf(
+        t, 
+        node_root, 
+        FT_INSERT,
+        "m",
+        2,
+        NULL,
+        0
+        );
+
+    r = toku_testsetup_insert_to_nonleaf(
+        t, 
+        node_root, 
+        FT_INSERT,
+        "z",
+        2,
+        NULL,
+        0
+        );
+
+
+    // at this point, we have inserted three messages into
+    // the root, one in each buffer, let's verify this.
+
+    FTNODE node = NULL;
+    struct ftnode_fetch_extra bfe;
+    fill_bfe_for_min_read(&bfe, t->ft);
+    toku_pin_ftnode_off_client_thread(
+        t->ft, 
+        node_root,
+        toku_cachetable_hash(t->ft->cf, node_root),
+        &bfe,
+        PL_WRITE_EXPENSIVE, 
+        0,
+        NULL,
+        &node
+        );
+    assert(node->height == 1);
+    assert(node->n_children == 3);
+    assert(toku_bnc_nbytesinbuf(BNC(node, 0)) > 0);
+    assert(toku_bnc_nbytesinbuf(BNC(node, 1)) > 0);
+    assert(toku_bnc_nbytesinbuf(BNC(node, 2)) > 0);
+    toku_unpin_ftnode(t->ft, node);
+
+    // now let's run a hot optimize, that should only flush the middle buffer
+    DBT left;
+    toku_fill_dbt(&left, "g", 2);
+    DBT right;
+    toku_fill_dbt(&right, "n", 2);
+    r = toku_ft_hot_optimize(t, &left, &right, NULL, NULL);
+    assert(r==0);
+
+    // at this point, we have should have flushed
+    // only the middle buffer, let's verify this.
+    node = NULL;
+    fill_bfe_for_min_read(&bfe, t->ft);
+    toku_pin_ftnode_off_client_thread(
+        t->ft, 
+        node_root,
+        toku_cachetable_hash(t->ft->cf, node_root),
+        &bfe,
+        PL_WRITE_EXPENSIVE, 
+        0,
+        NULL,
+        &node
+        );
+    assert(node->height == 1);
+    assert(node->n_children == 3);
+    assert(toku_bnc_nbytesinbuf(BNC(node, 0)) > 0);
+    assert(toku_bnc_nbytesinbuf(BNC(node, 1)) == 0);
+    assert(toku_bnc_nbytesinbuf(BNC(node, 2)) > 0);
+    toku_unpin_ftnode(t->ft, node);
+
+    r = toku_close_ft_handle_nolsn(t, 0);    assert(r==0);
+    toku_cachetable_close(&ct);
+}
+
+int
+test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute__((__unused__))) {
+    default_parse_args(argc, argv);
+    doit();
+    return 0;
+}

ft/tests/upgrade_test_simple.cc

@@ -143,7 +143,7 @@ static int
 do_hot_optimize(FT_HANDLE t, CACHETABLE UU(ct), void *extra)
 {
     float *CAST_FROM_VOIDP(fraction, extra);
-    int r = toku_ft_hot_optimize(t, progress, extra);
+    int r = toku_ft_hot_optimize(t, NULL, NULL, progress, extra);
     if (*fraction < 1.0) {
         CKERR2(r, 1);
     } else {

src/tests/filesize.cc

@@ -205,7 +205,7 @@ delete_n (uint32_t ah)
 static void
 optimize(void) {
     if (verbose) printf("Filesize: begin optimize dictionary\n");
-    int r = db->hot_optimize(db, NULL, NULL);
+    int r = db->hot_optimize(db, NULL, NULL, NULL, NULL);
     CKERR(r);
     if (verbose) printf("Filesize: end optimize dictionary\n");
 }

src/tests/hot-optimize-table-tests.cc

@@ -246,7 +246,7 @@ hot_test(DB* db, unsigned int size)
 
     // Flatten the tree.
     verbose ? printf("Calling hot optimize...\n") : 0;
-    r = db->hot_optimize(db, NULL, NULL);
+    r = db->hot_optimize(db, NULL, NULL, NULL, NULL);
     assert(r == 0);
     verbose ? printf("HOT Finished!\n") : 0;
     for (unsigned int i = 0; i < size; ++i) {

src/tests/test_4368.cc

@@ -112,7 +112,7 @@ test_main (int UU(argc), char UU(*const argv[])) {
   r = db->open(db, NULL, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); assert(r == 0);
 
   // call hot_optimize on an empty db. The empty db should have only a root node, which should invoke the bug
-  r = db->hot_optimize(db, NULL, NULL); assert_zero(r);
+  r = db->hot_optimize(db, NULL, NULL, NULL, NULL); assert_zero(r);
     
   r=db->close(db, 0);       assert(r==0);
   r=env->close(env, 0);     assert(r==0);

src/tests/test_kv_gen.h

@@ -179,7 +179,7 @@ static void __attribute__((unused))
 do_hot_optimize_on_dbs(DB_ENV *UU(env), DB **dbs, int num_dbs)
 {
     for (int i = 0; i < num_dbs; ++i) {
-        int r = dbs[i]->hot_optimize(dbs[i], dummy_progress, NULL);
+        int r = dbs[i]->hot_optimize(dbs[i], NULL, NULL, dummy_progress, NULL);
         CKERR(r);
     }
 }

src/tests/threaded_stress_test_helpers.h

@@ -1620,7 +1620,7 @@ static int UU() hot_op(DB_TXN *UU(txn), ARG UU(arg), void* UU(operation_extra),
     int r;
     for (int i = 0; run_test && i < arg->cli->num_DBs; i++) {
         DB* db = arg->dbp[i];
-        r = db->hot_optimize(db, hot_progress_callback, nullptr);
+        r = db->hot_optimize(db, NULL, NULL, hot_progress_callback, nullptr);
         if (run_test) {
             CKERR(r);
         }

src/ydb_db.cc

@@ -884,14 +884,13 @@ toku_db_optimize(DB *db) {
 }
 
 static int
-toku_db_hot_optimize(DB *db,
+toku_db_hot_optimize(DB *db, DBT* left, DBT* right,
                      int (*progress_callback)(void *extra, float progress),
                      void *progress_extra)
 {
     HANDLE_PANICKED_DB(db);
     int r = 0;
-    // If we areunable to get a directory read lock, do nothing.
-    r = toku_ft_hot_optimize(db->i->ft_handle,
+    r = toku_ft_hot_optimize(db->i->ft_handle, left, right,
                               progress_callback,
                               progress_extra);