diff options
Diffstat (limited to 'storage/tokudb/ft-index/src')
129 files changed, 406 insertions, 3344 deletions
diff --git a/storage/tokudb/ft-index/src/indexer-undo-do.cc b/storage/tokudb/ft-index/src/indexer-undo-do.cc index 2201c4f37e3..559dfef7291 100644 --- a/storage/tokudb/ft-index/src/indexer-undo-do.cc +++ b/storage/tokudb/ft-index/src/indexer-undo-do.cc @@ -581,8 +581,8 @@ indexer_find_prev_xr(DB_INDEXER *UU(indexer), ULEHANDLE ule, uint64_t xrindex, u return prev_found; } -// inject "delete" message into brt with logging in recovery and rollback logs, -// and making assocation between txn and brt +// inject "delete" message into ft with logging in recovery and rollback logs, +// and making assocation between txn and ft static int indexer_ft_delete_provisional(DB_INDEXER *indexer, DB *hotdb, DBT *hotkey, XIDS xids, TOKUTXN txn) { int result = 0; @@ -630,8 +630,8 @@ indexer_ft_delete_committed(DB_INDEXER *indexer, DB *hotdb, DBT *hotkey, XIDS xi return result; } -// inject "insert" message into brt with logging in recovery and rollback logs, -// and making assocation between txn and brt +// inject "insert" message into ft with logging in recovery and rollback logs, +// and making assocation between txn and ft static int indexer_ft_insert_provisional(DB_INDEXER *indexer, DB *hotdb, DBT *hotkey, DBT *hotval, XIDS xids, TOKUTXN txn) { int result = 0; @@ -650,7 +650,7 @@ indexer_ft_insert_provisional(DB_INDEXER *indexer, DB *hotdb, DBT *hotkey, DBT * } // send an insert message into the tree without rollback or recovery logging -// and without associating the txn and the brt +// and without associating the txn and the ft static int indexer_ft_insert_committed(DB_INDEXER *indexer, DB *hotdb, DBT *hotkey, DBT *hotval, XIDS xids) { int result = 0; diff --git a/storage/tokudb/ft-index/src/indexer.cc b/storage/tokudb/ft-index/src/indexer.cc index d84f4f4ba8f..b91b738d4d4 100644 --- a/storage/tokudb/ft-index/src/indexer.cc +++ b/storage/tokudb/ft-index/src/indexer.cc @@ -699,44 +699,19 @@ abort_indexer(DB_INDEXER *indexer) { // derived from ha_tokudb::estimate_num_rows static int update_estimated_rows(DB_INDEXER *indexer) { - DBT key; toku_init_dbt(&key); - DBT data; toku_init_dbt(&data); - DBC* crsr = NULL; - DB_TXN* txn = NULL; - uint64_t less, equal, greater; - int is_exact; int error; - DB *db = indexer->i->src_db; + DB_TXN *txn = NULL; DB_ENV *db_env = indexer->i->env; - error = db_env->txn_begin(db_env, 0, &txn, DB_READ_UNCOMMITTED); - if (error) goto cleanup; - - error = db->cursor(db, txn, &crsr, 0); - if (error) { goto cleanup; } - - error = crsr->c_get(crsr, &key, &data, DB_FIRST); - if (error == DB_NOTFOUND) { - indexer->i->estimated_rows = 0; - error = 0; - goto cleanup; - } - else if (error) { goto cleanup; } - - error = db->key_range64(db, txn, &key, - &less, &equal, &greater, - &is_exact); - if (error) { goto cleanup; } - - indexer->i->estimated_rows = equal + greater; - error = 0; -cleanup: - if ( crsr != NULL ) { - int rr = crsr->c_close(crsr); - invariant(rr == 0); - crsr = NULL; + if (error == 0) { + DB_BTREE_STAT64 stats; + DB *db = indexer->i->src_db; + error = db->stat64(db, txn, &stats); + if (error == 0) { + indexer->i->estimated_rows = stats.bt_ndata; + } + txn->commit(txn, 0); } - txn->commit(txn, 0); return error; } diff --git a/storage/tokudb/ft-index/src/loader.cc b/storage/tokudb/ft-index/src/loader.cc index 93ac551632e..88db258e1ff 100644 --- a/storage/tokudb/ft-index/src/loader.cc +++ b/storage/tokudb/ft-index/src/loader.cc @@ -306,15 +306,15 @@ toku_loader_create_loader(DB_ENV *env, // time to open the big kahuna char **XMALLOC_N(N, new_inames_in_env); - FT_HANDLE *XMALLOC_N(N, brts); + FT_HANDLE *XMALLOC_N(N, fts); for (int i=0; i<N; i++) { - brts[i] = dbs[i]->i->ft_handle; + fts[i] = dbs[i]->i->ft_handle; } LSN load_lsn; rval = locked_load_inames(env, txn, N, dbs, new_inames_in_env, &load_lsn, puts_allowed); if ( rval!=0 ) { toku_free(new_inames_in_env); - toku_free(brts); + toku_free(fts); goto create_exit; } TOKUTXN ttxn = txn ? db_txn_struct_i(txn)->tokutxn : NULL; @@ -323,7 +323,7 @@ toku_loader_create_loader(DB_ENV *env, env->i->generate_row_for_put, src_db, N, - brts, dbs, + fts, dbs, (const char **)new_inames_in_env, compare_functions, loader->i->temp_file_template, @@ -334,11 +334,11 @@ toku_loader_create_loader(DB_ENV *env, compress_intermediates); if ( rval!=0 ) { toku_free(new_inames_in_env); - toku_free(brts); + toku_free(fts); goto create_exit; } loader->i->inames_in_env = new_inames_in_env; - toku_free(brts); + toku_free(fts); if (!puts_allowed) { rval = ft_loader_close_and_redirect(loader); diff --git a/storage/tokudb/ft-index/src/tests/CMakeLists.txt b/storage/tokudb/ft-index/src/tests/CMakeLists.txt index d85d24be001..366d392143a 100644 --- a/storage/tokudb/ft-index/src/tests/CMakeLists.txt +++ b/storage/tokudb/ft-index/src/tests/CMakeLists.txt @@ -20,9 +20,6 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) file(GLOB transparent_upgrade_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" upgrade*.cc) - file(GLOB tdb_dontrun_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" bdb-simple-deadlock*.cc) - string(REGEX REPLACE "\\.cc(;|$)" "\\1" tdb_dontrun_tests "${tdb_dontrun_srcs}") - file(GLOB srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.cc) list(REMOVE_ITEM srcs ${transparent_upgrade_srcs}) @@ -36,329 +33,10 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) string(REGEX REPLACE "\\.cc(;|$)" ".tdb\\1" stress_tests "${stress_test_srcs}") set(tdb_srcs ${srcs}) - list(REMOVE_ITEM tdb_srcs ${tdb_dontrun_srcs}) string(REGEX REPLACE "\\.cc(;|$)" ".tdb\\1" tdb_bins "${tdb_srcs}") list(REMOVE_ITEM tdb_srcs ${abortrecover_srcs} ${loader_srcs}) string(REGEX REPLACE "\\.cc(;|$)" ".tdb\\1" tdb_tests "${tdb_srcs}") - if(BDB_FOUND) - set(bdb_dontrun_srcs - backwards_10_each_le_and_msg - bigtxn27 - blackhole - blocking-prelock-range - blocking-set-range-reverse-0 - blocking-table-lock - bug1381 - bug627 - cachetable-race - checkpoint_callback - checkpoint_stress - cursor-isolation - cursor-set-del-rmw - cursor-set-range-rmw - db-put-simple-deadlock - del-simple - del-multiple - del-multiple-huge-primary-row - del-multiple-srcdb - directory_lock - diskfull - dump-env - env_loader_memory - env-put-multiple - env_nproc - env_startup - execute-updates - filesize - get_key_after_bytes_unit - get_last_key - helgrind1 - helgrind2 - helgrind3 - hotindexer-bw - hotindexer-error-callback - hotindexer-insert-committed-optimized - hotindexer-insert-committed - hotindexer-insert-provisional - hotindexer-lock-test - hotindexer-multiclient - hotindexer-nested-insert-committed - hotindexer-put-abort - hotindexer-put-commit - hotindexer-put-multiple - hotindexer-simple-abort - hotindexer-simple-abort-put - hotindexer-undo-do-test - hotindexer-with-queries - hot-optimize-table-tests - insert-dup-prelock - isolation - isolation-read-committed - keyrange - keyrange-merge - last-verify-time - loader-cleanup-test - loader-create-abort - loader-create-close - loader-dup-test - loader-no-puts - loader-reference-test - loader-stress-del - loader-stress-test - loader-tpch-load - locktree_escalation_stalls - lock-pressure - manyfiles - maxsize-for-loader - multiprocess - mvcc-create-table - mvcc-many-committed - mvcc-read-committed - openlimit17 - openlimit17-locktree - openlimit17-metafiles - perf_checkpoint_var - perf_child_txn - perf_cursor_nop - perf_iibench - perf_insert - perf_insert_multiple - perf_malloc_free - perf_nop - perf_ptquery - perf_ptquery2 - perf_rangequery - perf_read_txn - perf_read_txn_single_thread - perf_read_write - perf_txn_single_thread - perf_xmalloc_free - prelock-read-read - prelock-read-write - prelock-write-read - prelock-write-write - print_engine_status - powerfail - preload-db - preload-db-nested - progress - put-del-multiple-array-indexing - put-multiple - queries_with_deletes - recover-2483 - recover-3113 - recover-5146 - recover-child-rollback - recover-compare-db - recover-compare-db-descriptor - recover-del-multiple - recover-del-multiple-abort - recover-del-multiple-srcdb-fdelete-all - recover-delboth-after-checkpoint - recover-delboth-checkpoint - recover-descriptor - recover-descriptor2 - recover-descriptor3 - recover-descriptor4 - recover-descriptor5 - recover-descriptor6 - recover-descriptor7 - recover-descriptor8 - recover-descriptor9 - recover-descriptor10 - recover-descriptor11 - recover-descriptor12 - recover-fclose-in-checkpoint - recover-fcreate-basementnodesize - recover-flt1 - recover-flt2 - recover-flt3 - recover-flt4 - recover-flt5 - recover-flt6 - recover-flt7 - recover-flt8 - recover-flt9 - recover-flt10 - recover-hotindexer-simple-abort-put - recover-loader-test - recover-lsn-filter-multiple - recover-put-multiple - recover-put-multiple-abort - recover-put-multiple-fdelete-all - recover-put-multiple-fdelete-some - recover-put-multiple-srcdb-fdelete-all - recover-split-checkpoint - recover-tablelock - recover-test-logsuppress - recover-test-logsuppress-put - recover-test_stress1 - recover-test_stress2 - recover-test_stress3 - recover-test_stress_openclose - recover-upgrade-db-descriptor-multihandle - recover-upgrade-db-descriptor - recover-update-multiple - recover-update-multiple-abort - recover-update_aborts - recover-update_aborts_before_checkpoint - recover-update_aborts_before_close - recover-update_changes_values - recover-update_changes_values_before_checkpoint - recover-update_changes_values_before_close - recover-update_broadcast_aborts - recover-update_broadcast_aborts2 - recover-update_broadcast_aborts3 - recover-update_broadcast_aborts_before_checkpoint - recover-update_broadcast_aborts_before_close - recover-update_broadcast_changes_values - recover-update_broadcast_changes_values2 - recover-update_broadcast_changes_values3 - recover-update_broadcast_changes_values_before_checkpoint - recover-update_broadcast_changes_values_before_close - recover-update_changes_values_before_close - recovery_fileops_stress - recovery_fileops_unit - recovery_stress - redirect - replace-into-write-lock - root_fifo_2 - root_fifo_32 - root_fifo_41 - seqinsert - shutdown-3344 - stat64 - stat64-create-modify-times - stat64_flatten - stat64-null-txn - stat64-root-changes - stress-gc - stress-gc2 - test-xa-prepare - test1324 - test1572 - test3219 - test3522 - test3522b - test3529 - test_3645 - test_3529_insert_2 - test_3529_table_lock - test_3755 - test_4015 - test_4368 - test_4657 - test_5015 - test_5469 - test-5138 - test938c - test_abort1 - test_abort4 - test_abort5 - test_bad_implicit_promotion - test_blobs_leaf_split - test_bulk_fetch - test_compression_methods - test_cmp_descriptor - test_cursor_interrupt - test_cursor_with_read_txn - test_db_change_pagesize - test_db_change_xxx - test_cursor_delete_2119 - test_db_descriptor - test_db_descriptor_named_db - test_db_txn_locks_read_uncommitted - test_get_max_row_size - test_insert_many_gc - test_iterate_live_transactions - test_iterate_pending_lock_requests - test_large_update_broadcast_small_cachetable - test_lock_timeout_callback - test_locking_with_read_txn - test_locktree_close - test_logflush - test_multiple_checkpoints_block_commit - test_query - test_read_txn_invalid_ops - test_redirect_func - test_restrict - test_row_size_supported - test_simple_read_txn - test_stress0 - test_stress1 - test_stress2 - test_stress3 - test_stress4 - test_stress5 - test_stress6 - test_stress7 - test_stress_openclose - test_stress_with_verify - test_stress_hot_indexing - test_transactional_descriptor - test_trans_desc_during_chkpt - test_trans_desc_during_chkpt2 - test_trans_desc_during_chkpt3 - test_trans_desc_during_chkpt4 - test_txn_abort6 - test_txn_abort8 - test_txn_abort9 - test_txn_close_open_commit - test_txn_commit8 - test_txn_nested1 - test_txn_nested2 - test_txn_nested3 - test_txn_nested4 - test_txn_nested5 - test_update_abort_works - test_update_calls_back - test_update_can_delete_elements - test_update_changes_values - test_update_nonexistent_keys - test_update_previously_deleted - test_update_stress - test_update_txn_snapshot_works_concurrently - test_update_txn_snapshot_works_correctly_with_deletes - test_update_broadcast_abort_works - test_update_broadcast_calls_back - test_update_broadcast_can_delete_elements - test_update_broadcast_changes_values - test_update_broadcast_previously_deleted - test_update_broadcast_stress - test_update_broadcast_update_fun_has_choices - test_update_broadcast_with_empty_table - test_update_broadcast_indexer - test_update_broadcast_loader - test_update_broadcast_nested_updates - test_update_nested_updates - test_update_with_empty_table - test_updates_single_key - txn-ignore - transactional_fileops - update-multiple-data-diagonal - update-multiple-key0 - update-multiple-nochange - update-multiple-with-indexer - update-multiple-with-indexer-array - update - upgrade_simple - upgrade-test-1 - upgrade-test-2 - upgrade-test-3 - upgrade-test-4 - upgrade-test-5 - upgrade-test-6 - upgrade-test-7 - zombie_db - ) - set(bdb_srcs ${srcs}) - string(REGEX REPLACE "\\.cc(;|$)" "\\1" bdb_testbases "${bdb_srcs}") - list(REMOVE_ITEM bdb_testbases ${bdb_dontrun_srcs}) - string(REGEX REPLACE "(.)(;|$)" "\\1.bdb\\2" bdb_tests "${bdb_testbases}") - set(bdb_bins ${bdb_tests}) - endif() - set(tdb_tests_that_should_fail test_db_no_env.tdb test_log8.recover @@ -373,8 +51,6 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) list(REMOVE_ITEM tdb_bins test-5138.tdb) add_executable(test-5138.tdb test-5138.cc) target_link_libraries(test-5138.tdb ${LIBTOKUDB}_static ${ZLIB_LIBRARY} ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS}) - set_property(TARGET test-5138.tdb APPEND PROPERTY - COMPILE_DEFINITIONS "USE_TDB;IS_TDB=1;TOKUDB=1") add_space_separated_property(TARGET test-5138.tdb COMPILE_FLAGS -fvisibility=hidden) add_ydb_test(test-5138.tdb) @@ -387,25 +63,9 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) # We link the test with util directly so that the test code itself can use # some of those things (i.e. kibbutz in the threaded tests). target_link_libraries(${base}.tdb util ${LIBTOKUDB} ${LIBTOKUPORTABILITY}) - set_property(TARGET ${base}.tdb APPEND PROPERTY - COMPILE_DEFINITIONS "USE_TDB;IS_TDB=1;TOKUDB=1") add_space_separated_property(TARGET ${base}.tdb COMPILE_FLAGS -fvisibility=hidden) endforeach(bin) - if(BDB_FOUND) - foreach(bin ${bdb_bins}) - get_filename_component(base ${bin} NAME_WE) - - add_executable(${base}.bdb ${base}.cc) - set_property(TARGET ${base}.bdb APPEND PROPERTY - COMPILE_DEFINITIONS "USE_BDB;IS_TDB=0;TOKU_ALLOW_DEPRECATED") - set_target_properties(${base}.bdb PROPERTIES - INCLUDE_DIRECTORIES "${BDB_INCLUDE_DIR};${CMAKE_CURRENT_BINARY_DIR}/../../toku_include;${CMAKE_CURRENT_SOURCE_DIR}/../../toku_include;${CMAKE_CURRENT_SOURCE_DIR}/../../portability;${CMAKE_CURRENT_SOURCE_DIR}/../..") - target_link_libraries(${base}.bdb ${LIBTOKUPORTABILITY} ${BDB_LIBRARIES}) - add_space_separated_property(TARGET ${base}.bdb COMPILE_FLAGS -fvisibility=hidden) - endforeach(bin) - endif() - foreach(bin loader-cleanup-test.tdb diskfull.tdb) set_property(TARGET ${bin} APPEND PROPERTY COMPILE_DEFINITIONS DONT_DEPRECATE_WRITES) @@ -418,22 +78,6 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) endmacro(declare_custom_tests) declare_custom_tests(test1426.tdb) - if(BDB_FOUND) - macro(declare_custom_bdb_tests) - foreach(test ${ARGN}) - list(REMOVE_ITEM bdb_tests ${test}) - endforeach(test) - endmacro(declare_custom_bdb_tests) - - declare_custom_bdb_tests(test1426.bdb) - configure_file(run_test1426.sh . COPYONLY) - add_test(NAME ydb/test1426.tdb - COMMAND run_test1426.sh - $<TARGET_FILE:test1426.tdb> $<TARGET_FILE:test1426.bdb> - "test1426.tdb.ctest-data" "test1426.bdb.ctest-data" - $<TARGET_FILE:tokudb_dump> "${BDB_INCLUDE_DIR}/../bin/db_dump") - add_dependencies(test1426.tdb tokudb_dump) - endif() string(REGEX REPLACE "\\.cc(;|$)" ".tdb\\1" recover_would_be_tdb_tests "${recover_srcs}") declare_custom_tests(${recover_would_be_tdb_tests}) @@ -740,7 +384,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) setup_toku_test_properties(ydb/${test} ${test}) endforeach() - foreach(test ${tdb_tests} ${bdb_tests}) + foreach(test ${tdb_tests}) add_ydb_test(${test}) endforeach(test) @@ -822,16 +466,6 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) ydb/test_txn_nested5.tdb ydb/test_update_broadcast_stress.tdb ) - if (BDB_FOUND) - list(APPEND long_tests - ydb/root_fifo_1.bdb - ydb/root_fifo_31.bdb - ydb/rowsize.bdb - ydb/test_log10.bdb - ydb/test_log7.bdb - ydb/test_logmax.bdb - ) - endif (BDB_FOUND) set_tests_properties(${long_tests} PROPERTIES TIMEOUT 3600) ## some take even longer, with valgrind set(extra_long_tests @@ -847,11 +481,6 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) ydb/test3039.tdb ydb/test_update_stress.tdb ) - if (BDB_FOUND) - list(APPEND extra_long_tests - ydb/test_groupcommit_count.bdb - ) - endif (BDB_FOUND) set_tests_properties(${extra_long_tests} PROPERTIES TIMEOUT 7200) ## these really take a long time with valgrind set(phenomenally_long_tests @@ -861,10 +490,5 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) ydb/recover_stress.tdb ydb/test3529.tdb ) - if (BDB_FOUND) - list(APPEND phenomenally_long_tests - ydb/test1426.tdb - ) - endif (BDB_FOUND) set_tests_properties(${phenomenally_long_tests} PROPERTIES TIMEOUT 14400) endif(BUILD_TESTING OR BUILD_SRC_TESTS) diff --git a/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-detect.cc b/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-detect.cc deleted file mode 100644 index ce0dcab38a3..00000000000 --- a/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-detect.cc +++ /dev/null @@ -1,300 +0,0 @@ -/* -*- 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. - This software is covered by US Patent No. 8,489,638. - -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." -// verify that the BDB locker can detect deadlocks on the fly and allow -// the deadlock to be unwound by the deadlocked threads. the main thread -// polls for deadlocks with the lock_detect function. -// -// A write locks L -// B write locks M -// A tries to write lock M && B tries to write lock L -// One of A or B gets the DEADLOCK error, the other waits -// A and B release their locks - -#include "test.h" -#include "toku_pthread.h" -#include <portability/toku_atomic.h> - -struct test_seq { - int state; - toku_mutex_t lock; - toku_cond_t cv; -}; - -static void test_seq_init(struct test_seq *seq) { - seq->state = 0; - toku_mutex_init(&seq->lock, NULL); - toku_cond_init(&seq->cv, NULL); -} - -static void test_seq_destroy(struct test_seq *seq) { - toku_mutex_destroy(&seq->lock); - toku_cond_destroy(&seq->cv); -} - -static void test_seq_sleep(struct test_seq *seq, int new_state) { - toku_mutex_lock(&seq->lock); - while (seq->state != new_state) { - toku_cond_wait(&seq->cv, &seq->lock); - } - toku_mutex_unlock(&seq->lock); -} - -static void test_seq_next_state(struct test_seq *seq) { - toku_mutex_lock(&seq->lock); - seq->state++; - toku_cond_broadcast(&seq->cv); - toku_mutex_unlock(&seq->lock); -} - -struct locker_args { - DB_ENV *db_env; - struct test_seq *test_seq; - int *deadlock_count; -}; - -static void *run_locker_a(void *arg) { - struct locker_args *locker_args = (struct locker_args *) arg; - DB_ENV *db_env = locker_args->db_env; - struct test_seq *test_seq = locker_args->test_seq; - int r; - - uint32_t locker_a; - r = db_env->lock_id(db_env, &locker_a); assert(r == 0); - - DBT object_l = { .data = (char *) "L", .size = 1 }; - DBT object_m = { .data = (char *) "M", .size = 1 }; - - test_seq_sleep(test_seq, 0); - DB_LOCK lock_a_l; - r = db_env->lock_get(db_env, locker_a, DB_LOCK_NOWAIT, &object_l, DB_LOCK_WRITE, &lock_a_l); assert(r == 0); - test_seq_next_state(test_seq); - - test_seq_sleep(test_seq, 2); - DB_LOCK lock_a_m; - bool m_locked = false; - r = db_env->lock_get(db_env, locker_a, 0, &object_m, DB_LOCK_WRITE, &lock_a_m); - assert(r == 0 || r == DB_LOCK_DEADLOCK); - if (r == 0) - m_locked = true; - - r = db_env->lock_put(db_env, &lock_a_l); assert(r == 0); - - if (m_locked) { - r = db_env->lock_put(db_env, &lock_a_m); assert(r == 0); - } else { - (void) toku_sync_fetch_and_add(locker_args->deadlock_count, 1); - if (verbose) printf("%s:%u m deadlock\n", __FUNCTION__, __LINE__); - } - - r = db_env->lock_id_free(db_env, locker_a); assert(r == 0); - - return arg; -} - -static void *run_locker_b(void *arg) { - struct locker_args *locker_args = (struct locker_args *) arg; - DB_ENV *db_env = locker_args->db_env; - struct test_seq *test_seq = locker_args->test_seq; - int r; - - uint32_t locker_b; - r = db_env->lock_id(db_env, &locker_b); assert(r == 0); - - DBT object_l = { .data = (char *) "L", .size = 1 }; - DBT object_m = { .data = (char *) "M", .size = 1 }; - - test_seq_sleep(test_seq, 1); - DB_LOCK lock_b_m; - r = db_env->lock_get(db_env, locker_b, DB_LOCK_NOWAIT, &object_m, DB_LOCK_WRITE, &lock_b_m); assert(r == 0); - test_seq_next_state(test_seq); - - test_seq_sleep(test_seq, 2); - DB_LOCK lock_b_l; - bool l_locked = false; - r = db_env->lock_get(db_env, locker_b, 0, &object_l, DB_LOCK_WRITE, &lock_b_l); - assert(r == 0 || r == DB_LOCK_DEADLOCK); - if (r == 0) - l_locked = true; - - r = db_env->lock_put(db_env, &lock_b_m); assert(r == 0); - - if (l_locked) { - r = db_env->lock_put(db_env, &lock_b_l); assert(r == 0); - } else { - (void) toku_sync_fetch_and_add(locker_args->deadlock_count, 1); - if (verbose) printf("%s:%u l deadlock\n", __FUNCTION__, __LINE__); - } - - r = db_env->lock_id_free(db_env, locker_b); assert(r == 0); - - return arg; -} - -static void simple_deadlock(DB_ENV *db_env) { - int r; - - struct test_seq test_seq; ZERO_STRUCT(test_seq); test_seq_init(&test_seq); - - int deadlock_count = 0 ; - - toku_pthread_t tid_a; - struct locker_args args_a = { db_env, &test_seq, &deadlock_count }; - r = toku_pthread_create(&tid_a, NULL, run_locker_a, &args_a); assert(r == 0); - - toku_pthread_t tid_b; - struct locker_args args_b = { db_env, &test_seq, &deadlock_count }; - r = toku_pthread_create(&tid_b, NULL, run_locker_b, &args_b); assert(r == 0); - - while (1) { - sleep(10); - int rejected = 0; - r = db_env->lock_detect(db_env, 0, DB_LOCK_YOUNGEST, &rejected); assert(r == 0); - if (verbose) - printf("%s %d\n", __FUNCTION__, rejected); - if (rejected == 0) - break; - } - - void *ret = NULL; - r = toku_pthread_join(tid_a, &ret); assert(r == 0); - r = toku_pthread_join(tid_b, &ret); assert(r == 0); - - assert(deadlock_count == 1); - - test_seq_destroy(&test_seq); -} - -int test_main(int argc, char * const argv[]) { - uint64_t cachesize = 0; - int do_txn = 1; - const char *db_env_dir = TOKU_TEST_FILENAME; - int db_env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_THREAD; - - // parse_args(argc, argv); - for (int i = 1; i < argc; i++) { - if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) { - verbose++; - continue; - } - if (strcmp(argv[i], "-q") == 0 || strcmp(argv[i], "--quiet") == 0) { - if (verbose > 0) - verbose--; - continue; - } - assert(0); - } - - // setup env - int r; - char rm_cmd[strlen(db_env_dir) + strlen("rm -rf ") + 1]; - snprintf(rm_cmd, sizeof(rm_cmd), "rm -rf %s", db_env_dir); - r = system(rm_cmd); assert(r == 0); - - r = toku_os_mkdir(db_env_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); assert(r == 0); - - DB_ENV *db_env = NULL; - r = db_env_create(&db_env, 0); assert(r == 0); - if (cachesize) { - const uint64_t gig = 1 << 30; - r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); - } - if (!do_txn) - db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); - r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); - - // run test - simple_deadlock(db_env); - - // close env - r = db_env->close(db_env, 0); assert(r == 0); db_env = NULL; - - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-nowait.cc b/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-nowait.cc deleted file mode 100644 index 036fb8d0115..00000000000 --- a/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-nowait.cc +++ /dev/null @@ -1,177 +0,0 @@ -/* -*- 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. - This software is covered by US Patent No. 8,489,638. - -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." -// verify that a simle write lock deadlock is detected by the BDB locker -// A write locks L -// B write locks M -// A tries to write lock M, gets DB_LOCK_NOTGRANTED -// B tries to write lock L, gets DB_LOCK_NOTGRANTED - -#include "test.h" - -static void simple_deadlock(DB_ENV *db_env) { - int r; - - uint32_t locker_a; - r = db_env->lock_id(db_env, &locker_a); assert(r == 0); - uint32_t locker_b; - r = db_env->lock_id(db_env, &locker_b); assert(r == 0); - - DBT object_l = { .data = (char *) "L", .size = 1 }; - DBT object_m = { .data = (char *) "M", .size = 1 }; - - DB_LOCK lock_a_l; - r = db_env->lock_get(db_env, locker_a, DB_LOCK_NOWAIT, &object_l, DB_LOCK_WRITE, &lock_a_l); assert(r == 0); - - DB_LOCK lock_b_m; - r = db_env->lock_get(db_env, locker_b, DB_LOCK_NOWAIT, &object_m, DB_LOCK_WRITE, &lock_b_m); assert(r == 0); - - DB_LOCK lock_a_m; - r = db_env->lock_get(db_env, locker_a, DB_LOCK_NOWAIT, &object_m, DB_LOCK_WRITE, &lock_a_m); assert(r == DB_LOCK_NOTGRANTED); - - DB_LOCK lock_b_l; - r = db_env->lock_get(db_env, locker_b, DB_LOCK_NOWAIT, &object_l, DB_LOCK_WRITE, &lock_b_l); assert(r == DB_LOCK_NOTGRANTED); - - r = db_env->lock_put(db_env, &lock_a_l); assert(r == 0); - r = db_env->lock_put(db_env, &lock_b_m); assert(r == 0); - - r = db_env->lock_id_free(db_env, locker_a); assert(r == 0); - r = db_env->lock_id_free(db_env, locker_b); assert(r == 0); -} - -int test_main(int argc, char * const argv[]) { - uint64_t cachesize = 0; - int do_txn = 1; - const char *db_env_dir = TOKU_TEST_FILENAME; - int db_env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_THREAD; - - // parse_args(argc, argv); - for (int i = 1; i < argc; i++) { - if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) { - verbose++; - continue; - } - if (strcmp(argv[i], "-q") == 0 || strcmp(argv[i], "--quiet") == 0) { - if (verbose > 0) - verbose--; - continue; - } - assert(0); - } - - // setup env - int r; - char rm_cmd[strlen(db_env_dir) + strlen("rm -rf ") + 1]; - snprintf(rm_cmd, sizeof(rm_cmd), "rm -rf %s", db_env_dir); - r = system(rm_cmd); assert(r == 0); - - r = toku_os_mkdir(db_env_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); assert(r == 0); - - DB_ENV *db_env = NULL; - r = db_env_create(&db_env, 0); assert(r == 0); - if (cachesize) { - const uint64_t gig = 1 << 30; - r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); - } - if (!do_txn) - db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); - r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if 0 && defined(USE_BDB) - r = db_env->set_lk_detect(db_env, DB_LOCK_YOUNGEST); assert(r == 0); -#endif - - // run test - simple_deadlock(db_env); - - // close env - r = db_env->close(db_env, 0); assert(r == 0); db_env = NULL; - - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-on-the-fly.cc b/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-on-the-fly.cc deleted file mode 100644 index 12386e173c3..00000000000 --- a/storage/tokudb/ft-index/src/tests/bdb-simple-deadlock-on-the-fly.cc +++ /dev/null @@ -1,292 +0,0 @@ -/* -*- 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. - This software is covered by US Patent No. 8,489,638. - -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." -// verify that the BDB locker can detect deadlocks on the fly and allow -// the deadlock to be unwound by the deadlocked threads. we use the -// set_lk_detect function to force the locker to check for deadlocks. -// -// A write locks L -// B write locks M -// A tries to write lock M && B tries to write lock L -// One of A or B should get the DEADLOCK error, the other waits -// A and B release their locks - -#include "test.h" -#include "toku_pthread.h" -#include <portability/toku_atomic.h> - -struct test_seq { - int state; - toku_mutex_t lock; - toku_cond_t cv; -}; - -static void test_seq_init(struct test_seq *seq) { - seq->state = 0; - toku_mutex_init(&seq->lock, NULL); - toku_cond_init(&seq->cv, NULL); -} - -static void test_seq_destroy(struct test_seq *seq) { - toku_mutex_destroy(&seq->lock); - toku_cond_destroy(&seq->cv); -} - -static void test_seq_sleep(struct test_seq *seq, int new_state) { - toku_mutex_lock(&seq->lock); - while (seq->state != new_state) { - toku_cond_wait(&seq->cv, &seq->lock); - } - toku_mutex_unlock(&seq->lock); -} - -static void test_seq_next_state(struct test_seq *seq) { - toku_mutex_lock(&seq->lock); - seq->state++; - toku_cond_broadcast(&seq->cv); - toku_mutex_unlock(&seq->lock); -} - -struct locker_args { - DB_ENV *db_env; - struct test_seq *test_seq; - int *deadlock_count; -}; - -static void *run_locker_a(void *arg) { - struct locker_args *locker_args = (struct locker_args *) arg; - DB_ENV *db_env = locker_args->db_env; - struct test_seq *test_seq = locker_args->test_seq; - int r; - - uint32_t locker_a; - r = db_env->lock_id(db_env, &locker_a); assert(r == 0); - - DBT object_l = { .data = (char *) "L", .size = 1 }; - DBT object_m = { .data = (char *) "M", .size = 1 }; - - test_seq_sleep(test_seq, 0); - DB_LOCK lock_a_l; - r = db_env->lock_get(db_env, locker_a, DB_LOCK_NOWAIT, &object_l, DB_LOCK_WRITE, &lock_a_l); assert(r == 0); - test_seq_next_state(test_seq); - - test_seq_sleep(test_seq, 2); - DB_LOCK lock_a_m; - bool m_locked = false; - r = db_env->lock_get(db_env, locker_a, 0, &object_m, DB_LOCK_WRITE, &lock_a_m); - assert(r == 0 || r == DB_LOCK_DEADLOCK); - if (r == 0) - m_locked = true; - - r = db_env->lock_put(db_env, &lock_a_l); assert(r == 0); - - if (m_locked) { - r = db_env->lock_put(db_env, &lock_a_m); assert(r == 0); - } else { - (void) toku_sync_fetch_and_add(locker_args->deadlock_count, 1); - if (verbose) printf("%s:%u m deadlock\n", __FUNCTION__, __LINE__); - } - - r = db_env->lock_id_free(db_env, locker_a); assert(r == 0); - - return arg; -} - -static void *run_locker_b(void *arg) { - struct locker_args *locker_args = (struct locker_args *) arg; - DB_ENV *db_env = locker_args->db_env; - struct test_seq *test_seq = locker_args->test_seq; - int r; - - uint32_t locker_b; - r = db_env->lock_id(db_env, &locker_b); assert(r == 0); - - DBT object_l = { .data = (char *) "L", .size = 1 }; - DBT object_m = { .data = (char *) "M", .size = 1 }; - - test_seq_sleep(test_seq, 1); - DB_LOCK lock_b_m; - r = db_env->lock_get(db_env, locker_b, DB_LOCK_NOWAIT, &object_m, DB_LOCK_WRITE, &lock_b_m); assert(r == 0); - test_seq_next_state(test_seq); - - test_seq_sleep(test_seq, 2); - DB_LOCK lock_b_l; - bool l_locked = false; - r = db_env->lock_get(db_env, locker_b, 0, &object_l, DB_LOCK_WRITE, &lock_b_l); - assert(r == 0 || r == DB_LOCK_DEADLOCK); - if (r == 0) - l_locked = true; - - r = db_env->lock_put(db_env, &lock_b_m); assert(r == 0); - - if (l_locked) { - r = db_env->lock_put(db_env, &lock_b_l); assert(r == 0); - } else { - (void) toku_sync_fetch_and_add(locker_args->deadlock_count, 1); - if (verbose) printf("%s:%u l deadlock\n", __FUNCTION__, __LINE__); - } - - r = db_env->lock_id_free(db_env, locker_b); assert(r == 0); - - return arg; -} - -static void simple_deadlock(DB_ENV *db_env) { - int r; - int deadlock_count = 0; - - struct test_seq test_seq; ZERO_STRUCT(test_seq); test_seq_init(&test_seq); - - toku_pthread_t tid_a; - struct locker_args args_a = { db_env, &test_seq, &deadlock_count }; - r = toku_pthread_create(&tid_a, NULL, run_locker_a, &args_a); assert(r == 0); - - toku_pthread_t tid_b; - struct locker_args args_b = { db_env, &test_seq, &deadlock_count }; - r = toku_pthread_create(&tid_b, NULL, run_locker_b, &args_b); assert(r == 0); - - void *ret = NULL; - r = toku_pthread_join(tid_a, &ret); assert(r == 0); - r = toku_pthread_join(tid_b, &ret); assert(r == 0); - - assert(deadlock_count == 1); - - test_seq_destroy(&test_seq); -} - -int test_main(int argc, char * const argv[]) { - uint64_t cachesize = 0; - int do_txn = 1; - const char *db_env_dir = TOKU_TEST_FILENAME; - int db_env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_THREAD; - - // parse_args(argc, argv); - for (int i = 1; i < argc; i++) { - if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) { - verbose++; - continue; - } - if (strcmp(argv[i], "-q") == 0 || strcmp(argv[i], "--quiet") == 0) { - if (verbose > 0) - verbose--; - continue; - } - assert(0); - } - - // setup env - int r; - char rm_cmd[strlen(db_env_dir) + strlen("rm -rf ") + 1]; - snprintf(rm_cmd, sizeof(rm_cmd), "rm -rf %s", db_env_dir); - r = system(rm_cmd); assert(r == 0); - - r = toku_os_mkdir(db_env_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); assert(r == 0); - - DB_ENV *db_env = NULL; - r = db_env_create(&db_env, 0); assert(r == 0); - if (cachesize) { - const uint64_t gig = 1 << 30; - r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); - } - if (!do_txn) - db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); - r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if defined(USE_BDB) - r = db_env->set_lk_detect(db_env, DB_LOCK_YOUNGEST); assert(r == 0); -#endif - - // run test - simple_deadlock(db_env); - - // close env - r = db_env->close(db_env, 0); assert(r == 0); db_env = NULL; - - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/bdb.suppressions b/storage/tokudb/ft-index/src/tests/bdb.suppressions deleted file mode 100644 index 5e06d9a84e7..00000000000 --- a/storage/tokudb/ft-index/src/tests/bdb.suppressions +++ /dev/null @@ -1,87 +0,0 @@ -{ - bdb_writes_undefined_data_to_disk - Memcheck:Param - pwrite64(buf) - fun:pwrite64 - fun:__os_io - obj:/lib/libdb-4.3.so - fun:__memp_bhwrite - fun:__memp_sync_int - fun:__memp_fsync - fun:__db_sync - fun:__db_refresh - fun:__db_close - fun:__fop_subdb_setup - fun:__db_open - fun:__db_open_pp -} - -{ - bdb_leaks_db_home_strdup - Memcheck:Leak - fun:_vgrZU_libcZdsoZa_malloc - fun:__os_malloc - fun:__os_strdup - fun:__db_open_pp - fun:main -} - -{ - bdb_leaks_in_db_create - Memcheck:Leak - fun:_vgrZU_libcZdsoZa_malloc - fun:__os_malloc - fun:__os_calloc - fun:__bam_db_create - fun:db_create - fun:main -} - -{ - bdb_leaks_if_you_open_twice - Memcheck:Leak - fun:_vgrZU_libcZdsoZa_malloc - fun:__os_malloc - fun:__os_strdup - fun:__db_open_pp -} - -{ - bdb_leaks_again - Memcheck:Leak - fun:_vgrZU_libcZdsoZa_malloc - fun:__os_malloc - fun:__os_strdup - fun:__db_home - obj:/lib/libdb-4.3.so - fun:__dbenv_open -} - -{ - <bdb_leaks> - Memcheck:Leak - fun:_vgrZU_libcZdsoZa_malloc - fun:__os_malloc - fun:__os_calloc - fun:__bam_db_create - fun:db_create -} - -{ - <bdb_leaks> - Memcheck:Leak - fun:_vgrZU_libcZdsoZa_malloc - fun:__os_malloc - fun:__os_calloc - fun:__bam_db_create - fun:db_create -} - -{ - <bdb_leaks> - Memcheck:Leak - fun:_vgrZU_libcZdsoZa_malloc - fun:__os_malloc - fun:__os_calloc - fun:db_create -} diff --git a/storage/tokudb/ft-index/src/tests/big-nested-abort-abort.cc b/storage/tokudb/ft-index/src/tests/big-nested-abort-abort.cc index 0707773d6b5..882c3441a8f 100644 --- a/storage/tokudb/ft-index/src/tests/big-nested-abort-abort.cc +++ b/storage/tokudb/ft-index/src/tests/big-nested-abort-abort.cc @@ -175,11 +175,7 @@ setup (void) { r=db_env_create(&env, 0); CKERR(r); -#ifndef TOKUDB - r=env->set_lk_max_objects(env, N); CKERR(r); -#else r=env->set_redzone(env, 0); CKERR(r); -#endif env->set_errfile(env, stderr); r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/big-nested-abort-commit.cc b/storage/tokudb/ft-index/src/tests/big-nested-abort-commit.cc index 711f235275e..98dde05cfde 100644 --- a/storage/tokudb/ft-index/src/tests/big-nested-abort-commit.cc +++ b/storage/tokudb/ft-index/src/tests/big-nested-abort-commit.cc @@ -174,9 +174,6 @@ setup (void) { r=db_env_create(&env, 0); CKERR(r); -#ifndef TOKUDB - r=env->set_lk_max_objects(env, N); CKERR(r); -#endif env->set_errfile(env, stderr); r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/big-nested-commit-abort.cc b/storage/tokudb/ft-index/src/tests/big-nested-commit-abort.cc index 0469867396d..ec8707530fa 100644 --- a/storage/tokudb/ft-index/src/tests/big-nested-commit-abort.cc +++ b/storage/tokudb/ft-index/src/tests/big-nested-commit-abort.cc @@ -169,9 +169,6 @@ setup (void) { r=db_env_create(&env, 0); CKERR(r); -#ifndef TOKUDB - r=env->set_lk_max_objects(env, N); CKERR(r); -#endif env->set_errfile(env, stderr); r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/big-nested-commit-commit.cc b/storage/tokudb/ft-index/src/tests/big-nested-commit-commit.cc index ad25b5e90e8..189bc97769f 100644 --- a/storage/tokudb/ft-index/src/tests/big-nested-commit-commit.cc +++ b/storage/tokudb/ft-index/src/tests/big-nested-commit-commit.cc @@ -168,13 +168,8 @@ setup (void) { r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB r=env->set_redzone(env, 0); CKERR(r); -#endif -#ifndef TOKUDB - r=env->set_lk_max_objects(env, N); CKERR(r); -#endif env->set_errfile(env, stderr); r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/blocking-first-empty.cc b/storage/tokudb/ft-index/src/tests/blocking-first-empty.cc index 72267437a4a..6ccf879005d 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-first-empty.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-first-empty.cc @@ -98,7 +98,6 @@ struct my_callback_context { DBT val; }; -#if TOKUDB static int blocking_first_callback(DBT const *a UU(), DBT const *b UU(), void *e UU()) { DBT const *found_key = a; DBT const *found_val = b; @@ -107,7 +106,6 @@ static int blocking_first_callback(DBT const *a UU(), DBT const *b UU(), void *e copy_dbt(&context->val, found_val); return 0; } -#endif static void blocking_first(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime) { int r; @@ -122,11 +120,7 @@ static void blocking_first(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptim DBC *cursor = NULL; r = db->cursor(db, txn, &cursor, 0); assert(r == 0); // get a write lock on -inf +inf -#if TOKUDB r = cursor->c_getf_first(cursor, DB_RMW, blocking_first_callback, &context); assert(r == DB_NOTFOUND); -#else - r = cursor->c_get(cursor, &context.key, &context.val, DB_FIRST + DB_RMW); assert(r == DB_NOTFOUND); -#endif usleep(sleeptime); @@ -219,9 +213,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-first.cc b/storage/tokudb/ft-index/src/tests/blocking-first.cc index 1bd414a90aa..6d255023274 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-first.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-first.cc @@ -116,7 +116,6 @@ struct my_callback_context { DBT val; }; -#if TOKUDB static int blocking_first_callback(DBT const *a UU(), DBT const *b UU(), void *e UU()) { DBT const *found_key = a; DBT const *found_val = b; @@ -125,7 +124,6 @@ static int blocking_first_callback(DBT const *a UU(), DBT const *b UU(), void *e copy_dbt(&context->val, found_val); return 0; } -#endif static void blocking_first(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime) { int r; @@ -140,11 +138,7 @@ static void blocking_first(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptim DBC *cursor = NULL; r = db->cursor(db, txn, &cursor, 0); assert(r == 0); // get a write lock on -inf ... 0 -#if TOKUDB r = cursor->c_getf_first(cursor, DB_RMW, blocking_first_callback, &context); assert(r == 0); -#else - r = cursor->c_get(cursor, &context.key, &context.val, DB_FIRST + DB_RMW); assert(r == 0); -#endif usleep(sleeptime); r = cursor->c_close(cursor); assert(r == 0); @@ -236,9 +230,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-last.cc b/storage/tokudb/ft-index/src/tests/blocking-last.cc index 5ca6ce5ec6a..403f31bca61 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-last.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-last.cc @@ -116,7 +116,6 @@ struct my_callback_context { DBT val; }; -#if TOKUDB static int blocking_last_callback(DBT const *a UU(), DBT const *b UU(), void *e UU()) { DBT const *found_key = a; DBT const *found_val = b; @@ -125,7 +124,6 @@ static int blocking_last_callback(DBT const *a UU(), DBT const *b UU(), void *e copy_dbt(&context->val, found_val); return 0; } -#endif static void blocking_last(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime) { int r; @@ -140,11 +138,7 @@ static void blocking_last(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime DBC *cursor = NULL; r = db->cursor(db, txn, &cursor, 0); assert(r == 0); // get a write lock on -inf ... 0 -#if TOKUDB r = cursor->c_getf_last(cursor, DB_RMW, blocking_last_callback, &context); assert(r == 0); -#else - r = cursor->c_get(cursor, &context.key, &context.val, DB_LAST + DB_RMW); assert(r == 0); -#endif usleep(sleeptime); r = cursor->c_close(cursor); assert(r == 0); @@ -236,9 +230,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc b/storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc index fb591feff28..f71c89aa3e7 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-next-prev-deadlock.cc @@ -124,7 +124,6 @@ struct my_callback_context { DBT val; }; -#if TOKUDB static int blocking_next_callback(DBT const *a UU(), DBT const *b UU(), void *e UU()) { DBT const *found_key = a; DBT const *found_val = b; @@ -133,7 +132,6 @@ static int blocking_next_callback(DBT const *a UU(), DBT const *b UU(), void *e copy_dbt(&context->val, found_val); return 0; } -#endif static void blocking_next(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long sleeptime) { int r; @@ -150,11 +148,7 @@ static void blocking_next(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee uint64_t i; for (i = 0; ; i++) { -#if TOKUDB r = cursor->c_getf_next(cursor, DB_RMW, blocking_next_callback, &context); -#else - r = cursor->c_get(cursor, &context.key, &context.val, DB_NEXT + DB_RMW); -#endif if (r != 0) break; if (verbose) @@ -196,11 +190,7 @@ static void blocking_prev(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee uint64_t i; for (i = 0; ; i++) { -#if TOKUDB r = cursor->c_getf_prev(cursor, DB_RMW, blocking_next_callback, &context); -#else - r = cursor->c_get(cursor, &context.key, &context.val, DB_PREV + DB_RMW); -#endif if (r != 0) break; if (verbose) @@ -305,11 +295,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#else - r = db_env->set_lk_detect(db_env, DB_LOCK_YOUNGEST); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-next-prev.cc b/storage/tokudb/ft-index/src/tests/blocking-next-prev.cc index 86644a13cf5..ec1ae8ff340 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-next-prev.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-next-prev.cc @@ -123,7 +123,6 @@ struct my_callback_context { DBT val; }; -#if TOKUDB static int blocking_next_callback(DBT const *a UU(), DBT const *b UU(), void *e UU()) { DBT const *found_key = a; DBT const *found_val = b; @@ -132,7 +131,6 @@ static int blocking_next_callback(DBT const *a UU(), DBT const *b UU(), void *e copy_dbt(&context->val, found_val); return 0; } -#endif static void blocking_next(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long sleeptime) { int r; @@ -149,11 +147,7 @@ static void blocking_next(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee uint64_t i; for (i = 0; ; i++) { -#if TOKUDB r = cursor->c_getf_next(cursor, 0, blocking_next_callback, &context); -#else - r = cursor->c_get(cursor, &context.key, &context.val, DB_NEXT); -#endif if (r != 0) break; if (verbose) @@ -199,11 +193,7 @@ static void blocking_prev(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee uint64_t i; for (i = 0; ; i++) { -#if TOKUDB r = cursor->c_getf_prev(cursor, 0, blocking_next_callback, &context); -#else - r = cursor->c_get(cursor, &context.key, &context.val, DB_PREV); -#endif if (r != 0) break; if (verbose) diff --git a/storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc b/storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc index cece47cbeec..15065dcf244 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-prelock-range.cc @@ -181,9 +181,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc b/storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc index c43bcfad5f0..b91198a4438 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-put-timeout.cc @@ -156,11 +156,7 @@ static void t_b(DB_ENV *db_env, DB *db, struct test_seq *seq) { DBT key = { .data = &k, .size = sizeof k }; DBT val = { .data = &k, .size = sizeof k }; r = db->put(db, txn_b, &key, &val, 0); -#if USE_BDB - assert(r == DB_LOCK_DEADLOCK); -#else assert(r == DB_LOCK_NOTGRANTED); -#endif r = txn_b->abort(txn_b); assert(r == 0); } @@ -212,31 +208,12 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if USE_BDB - db_timeout_t t; - r = db_env->get_timeout(db_env, &t, DB_SET_LOCK_TIMEOUT); assert(r == 0); - if (verbose) printf("lock %d\n", t); - r = db_env->get_timeout(db_env, &t, DB_SET_TXN_TIMEOUT); assert(r == 0); - if (verbose) printf("txn %d\n", t); - - r = db_env->set_timeout(db_env, 5000000, DB_SET_LOCK_TIMEOUT); assert(r == 0); - r = db_env->set_timeout(db_env, 5000000, DB_SET_TXN_TIMEOUT); assert(r == 0); - - r = db_env->get_timeout(db_env, &t, DB_SET_LOCK_TIMEOUT); assert(r == 0); - if (verbose) printf("lock %d\n", t); - r = db_env->get_timeout(db_env, &t, DB_SET_TXN_TIMEOUT); assert(r == 0); - if (verbose) printf("txn %d\n", t); - - r = db_env->set_lk_detect(db_env, DB_LOCK_EXPIRE); assert(r == 0); -#endif -#if USE_TDB uint64_t lock_timeout_msec; r = db_env->get_lock_timeout(db_env, &lock_timeout_msec); assert(r == 0); if (verbose) printf("lock timeout: %" PRIu64 "\n", lock_timeout_msec); r = db_env->set_lock_timeout(db_env, 5000, nullptr); assert(r == 0); r = db_env->get_lock_timeout(db_env, &lock_timeout_msec); assert(r == 0); if (verbose) printf("lock timeout: %" PRIu64 "\n", lock_timeout_msec); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc b/storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc index 9c8ad60787b..06c51b6fede 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-put-wakeup.cc @@ -208,9 +208,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-put.cc b/storage/tokudb/ft-index/src/tests/blocking-put.cc index afd083986d8..8100862881a 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-put.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-put.cc @@ -180,9 +180,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc b/storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc index 8d2dad831a2..896d4a82e12 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-set-range-0.cc @@ -117,7 +117,6 @@ struct my_callback_context { DBT val; }; -#if TOKUDB static int blocking_set_range_callback(DBT const *a UU(), DBT const *b UU(), void *e UU()) { DBT const *found_key = a; DBT const *found_val = b; @@ -126,7 +125,6 @@ static int blocking_set_range_callback(DBT const *a UU(), DBT const *b UU(), voi copy_dbt(&context->val, found_val); return 0; } -#endif static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime, uint64_t the_key) { int r; @@ -144,11 +142,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee uint64_t k = htonl(the_key); DBT key = { .data = &k, .size = sizeof k }; -#if TOKUDB r = cursor->c_getf_set_range(cursor, DB_RMW, &key, blocking_set_range_callback, &context); assert(r == 0); -#else - r = cursor->c_get(cursor, &key, &context.val, DB_SET_RANGE + DB_RMW); assert(r == 0); -#endif uint64_t v; assert(context.val.size == sizeof v); memcpy(&v, context.val.data, context.val.size); @@ -246,9 +240,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc b/storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc index 838d18ed6d5..841809fadbe 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-set-range-n.cc @@ -117,7 +117,6 @@ struct my_callback_context { DBT val; }; -#if TOKUDB static int blocking_set_range_callback(DBT const *a UU(), DBT const *b UU(), void *e UU()) { DBT const *found_key = a; DBT const *found_val = b; @@ -126,7 +125,6 @@ static int blocking_set_range_callback(DBT const *a UU(), DBT const *b UU(), voi copy_dbt(&context->val, found_val); return 0; } -#endif static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime, uint64_t the_key) { int r; @@ -144,11 +142,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee uint64_t k = htonl(the_key); DBT key = { .data = &k, .size = sizeof k }; -#if TOKUDB r = cursor->c_getf_set_range(cursor, DB_RMW, &key, blocking_set_range_callback, &context); assert(r == DB_NOTFOUND); -#else - r = cursor->c_get(cursor, &key, &context.val, DB_SET_RANGE + DB_RMW); assert(r == DB_NOTFOUND); -#endif usleep(sleeptime); r = cursor->c_close(cursor); assert(r == 0); @@ -241,9 +235,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc b/storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc index 7d06dc4c9e0..f63bb3c0e5b 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-set-range-reverse-0.cc @@ -142,11 +142,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee uint64_t k = htonl(the_key); DBT key = { .data = &k, .size = sizeof k }; -#if TOKUDB r = cursor->c_getf_set_range_reverse(cursor, 0, &key, blocking_set_range_callback, &context); assert(r == 0); -#else - r = cursor->c_get(cursor, &key, &context.val, DB_SET_RANGE_REVERSE); assert(r == 0); -#endif uint64_t v; assert(context.val.size == sizeof v); memcpy(&v, context.val.data, context.val.size); @@ -244,9 +240,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-set.cc b/storage/tokudb/ft-index/src/tests/blocking-set.cc index d229321aa43..dd0196ff276 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-set.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-set.cc @@ -112,7 +112,6 @@ static void populate(DB_ENV *db_env, DB *db, uint64_t nrows) { r = txn->commit(txn, 0); assert(r == 0); } -#if TOKUDB static int blocking_set_callback(DBT const *a UU(), DBT const *b UU(), void *e UU()) { // DBT const *found_key = a; DBT const *found_val = b; @@ -123,7 +122,6 @@ static int blocking_set_callback(DBT const *a UU(), DBT const *b UU(), void *e U memcpy(my_val->data, found_val->data, found_val->size); return 0; } -#endif static void blocking_set(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime) { int r; @@ -140,11 +138,7 @@ static void blocking_set(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime) uint64_t k = htonl(0); // set to key 0 DBT key = { .data = &k, .size = sizeof k }; -#if TOKUDB r = cursor->c_getf_set(cursor, DB_RMW, &key, blocking_set_callback, &val); assert(r == 0); -#else - r = cursor->c_get(cursor, &key, &val, DB_SET + DB_RMW); assert(r == 0); -#endif uint64_t v; assert(val.size == sizeof v); memcpy(&v, val.data, val.size); @@ -226,9 +220,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/blocking-table-lock.cc b/storage/tokudb/ft-index/src/tests/blocking-table-lock.cc index 2ae82319a7e..42e824debbf 100644 --- a/storage/tokudb/ft-index/src/tests/blocking-table-lock.cc +++ b/storage/tokudb/ft-index/src/tests/blocking-table-lock.cc @@ -174,9 +174,7 @@ int test_main(int argc, char * const argv[]) { r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert(r == 0); } r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/checkpoint1.cc b/storage/tokudb/ft-index/src/tests/checkpoint1.cc index 3620b9006a8..9fe56cdbc36 100644 --- a/storage/tokudb/ft-index/src/tests/checkpoint1.cc +++ b/storage/tokudb/ft-index/src/tests/checkpoint1.cc @@ -118,9 +118,7 @@ checkpoint1 (void) toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); r = db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB r = env->set_redzone(env, 0); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/checkpoint_fairness.cc b/storage/tokudb/ft-index/src/tests/checkpoint_fairness.cc index c94e1f4b1ab..03d5c47f4e5 100644 --- a/storage/tokudb/ft-index/src/tests/checkpoint_fairness.cc +++ b/storage/tokudb/ft-index/src/tests/checkpoint_fairness.cc @@ -147,9 +147,7 @@ int test_main(int argc, char * const argv[]) { // try to starve the checkpoint { int chk_r = db_env_create(&env, 0); CKERR(chk_r); } -#ifdef USE_TDB { int chk_r = env->set_redzone(env, 0); CKERR(chk_r); } -#endif { const int size = 10+strlen(env_dir); char cmd[size]; diff --git a/storage/tokudb/ft-index/src/tests/checkpoint_stress.cc b/storage/tokudb/ft-index/src/tests/checkpoint_stress.cc index ebbaf4085fc..976ba8e8555 100644 --- a/storage/tokudb/ft-index/src/tests/checkpoint_stress.cc +++ b/storage/tokudb/ft-index/src/tests/checkpoint_stress.cc @@ -272,13 +272,10 @@ random_acts(void * d) { } } - -#if IS_TDB && !TOKU_WINDOWS return intothevoid; -#endif } -uint64_t max_windows_cachesize = 256 << 20; +uint64_t max_cachesize = 256 << 20; static void run_test (int iter, int die) { @@ -296,7 +293,7 @@ run_test (int iter, int die) { const int32_t K256 = 256 * 1024; uint64_t cachebytes = 0; cachebytes = K256 * (iter + 1) - (128 * 1024); - if (cachebytes > max_windows_cachesize) + if (cachebytes > max_cachesize) cachebytes = 0; if (iter & 2) cachebytes = 0; // use default cachesize half the time diff --git a/storage/tokudb/ft-index/src/tests/cilktests/Makefile b/storage/tokudb/ft-index/src/tests/cilktests/Makefile deleted file mode 100644 index d5a4b45fffa..00000000000 --- a/storage/tokudb/ft-index/src/tests/cilktests/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -default: build -TARGETS = get.parallel get.serial -CPPFLAGS = -I../../../include -I../../../toku_include -I../../../linux -CFLAGS = -Wall -W -Werror -g $(OPTFLAGS) -LOADLIBES = -L../../../lib -ltokuportability -ltokudb -LDFLAGS = -Wl,-rpath,../../../lib -build: $(TARGETS) -CILKPP=/home/bradley/cilkarts/8503/cilk/bin/cilk++ -CXX=/home/bradley/cilkarts/8503/cilk/bin/c++ -CILKSCREEN=/home/bradley/cilkarts/8503/cilk/bin/cilkscreen - -%.parallel: %.cilk - $(CILKPP) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LOADLIBES) -%.serial: %.cilk - $(CILKPP) -fcilk-stub $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LOADLIBES) -check: check_get.parallel check_get.serial -check_%.parallel: %.parallel - $(CILKSCREEN) ./$< -check_%.serial: %.serial - valgrind ./$< - -foo.serial foo.parallel: CPPFLAGS= -foo.serial foo.parallel: LOADLIBES= -foo.serial foo.parallel: LDFLAGS= -foo.serial: CFLAGS=-lpthread - -%.o: %.cilk - $(CILKPP) $(CPPFLAGS) $(CFLAGS) $< -c -o $@ - -foo2: foo2.o bar2.o - $(CILKPP) foo2.o bar2.o -o $@ -lpthread -L/home/bradley/cilkarts/8503/cilk/lib64 -lcilkrts -Wl,-rpath=/home/bradley/cilkarts/8503/cilk/lib64 - -broken: - $(CXX) foo2.o bar2.o -o $@ -lpthread -L/home/bradley/cilkarts/8503/cilk/lib64 -lcilkrts -Wl,-rpath=/home/bradley/cilkarts/8503/cilk/lib64 - -measurecilkrun.parallel: OPTFLAGS=-O2 -measurecilkrun.parallel: LDFLAGS= -measurecilkrun.parallel: LOADLIBES= -measurecilkrun.parallel: CPPFLAGS= -check_measurecilkrun.parallel: CILKSCREEN= diff --git a/storage/tokudb/ft-index/src/tests/cilktests/bar2.cilk b/storage/tokudb/ft-index/src/tests/cilktests/bar2.cilk deleted file mode 100644 index 3939cee64bc..00000000000 --- a/storage/tokudb/ft-index/src/tests/cilktests/bar2.cilk +++ /dev/null @@ -1,22 +0,0 @@ -#include <cilk.h> -#include <stdio.h> -#include "foo2.h" - -extern "Cilk++" -int foo2 (int i) { - return i+1; -} - -int foo (int i) { - int r; - r = cilk_spawn foo2 (i+1); - cilk_sync; - return r+1; -} - -extern "C++" -void do_foo (void) { - printf("Running cilk\n"); - int r = cilk::run(&foo, 3); - printf("Done r =%d\n", r); -} diff --git a/storage/tokudb/ft-index/src/tests/cilktests/foo.cilk b/storage/tokudb/ft-index/src/tests/cilktests/foo.cilk deleted file mode 100644 index dfc5540db4b..00000000000 --- a/storage/tokudb/ft-index/src/tests/cilktests/foo.cilk +++ /dev/null @@ -1,41 +0,0 @@ -#include <pthread.h> -#include <unistd.h> -#include <assert.h> -#include <stdio.h> - -pthread_t pt[2]; -pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; - -extern "C" void* start (void *extra __attribute__((__unused__))) { - { int r = pthread_mutex_lock(&mutex); assert(r==0); } - printf("T%lx got lock\n", pthread_self()); - sleep(1); - printf("T%lx releasing lock\n", pthread_self()); - { int r = pthread_mutex_unlock(&mutex); assert(r==0); } - return 0; -} - -void create_pthread(void) { - for (int i=0; i<2; i++) { - int r = pthread_create(&pt[i], 0, start, NULL); - assert(r==0); - } -} - -void join_pthread (void) { - for (int i=0; i<2; i++) { - int r = pthread_join(pt[i], NULL); - assert(r==0); - } -} - -void foo (void) { -} - -int cilk_main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) { - create_pthread(); - cilk_spawn foo(); - cilk_sync; - join_pthread(); - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/cilktests/foo2.cpp b/storage/tokudb/ft-index/src/tests/cilktests/foo2.cpp deleted file mode 100644 index edc8e7f8cf0..00000000000 --- a/storage/tokudb/ft-index/src/tests/cilktests/foo2.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -// vim: expandtab:ts=8:sw=4:softtabstop=4: -/* -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. - This software is covered by US Patent No. 8,489,638. - -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." - -#include <pthread.h> -#include <unistd.h> -#include <assert.h> -#include <stdio.h> -#include "foo2.h" -#include "cilk.h" - -pthread_t pt[2]; -pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; - -extern "C" void* start (void *extra __attribute__((__unused__))) { - { int r = pthread_mutex_lock(&mutex); assert(r==0); } - printf("T%lx got lock\n", pthread_self()); - sleep(1); - printf("T%lx releasing lock\n", pthread_self()); - { int r = pthread_mutex_unlock(&mutex); assert(r==0); } - return 0; -} - -void create_pthread(void) { - for (int i=0; i<2; i++) { - int r = pthread_create(&pt[i], 0, start, NULL); - assert(r==0); - } -} - -void join_pthread (void) { - for (int i=0; i<2; i++) { - int r = pthread_join(pt[i], NULL); - assert(r==0); - } -} - -int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) { - __cilkscreen_disable_instrumentation(); - create_pthread(); - __cilkscreen_enable_instrumentation(); - do_foo(); - join_pthread(); - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/cilktests/get.cilk b/storage/tokudb/ft-index/src/tests/cilktests/get.cilk deleted file mode 100644 index 810ab332581..00000000000 --- a/storage/tokudb/ft-index/src/tests/cilktests/get.cilk +++ /dev/null @@ -1,27 +0,0 @@ -/* Perform a DB->get in a cilk thread */ - -#include <assert.h> -#include <db.h> -#include <stdlib.h> -#include <toku_os.h> - -#define DIR __FILE__ ".dir" - -DB_ENV *env; - -void foo (void) { - printf("foo\n"); -} - -const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN|DB_PRIVATE; - -int cilk_main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) { - system("rm -rf " DIR); - toku_os_mkdir(DIR, 0777); - { int r = db_env_create(&env, 0); assert(r==0); } - { int r = env->open(env, DIR, envflags,S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); } - cilk_spawn foo(); - cilk_sync; - { int r = env->close(env, 0); assert(r==0); } - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/cilktests/measurecilkrun.cilk b/storage/tokudb/ft-index/src/tests/cilktests/measurecilkrun.cilk deleted file mode 100644 index b6949b7e989..00000000000 --- a/storage/tokudb/ft-index/src/tests/cilktests/measurecilkrun.cilk +++ /dev/null @@ -1,106 +0,0 @@ -#include <pthread.h> -#include <unistd.h> -#include <assert.h> -#include <stdio.h> -#include "cilk.h" -#include <sys/time.h> - -int foo (int i) { - return i+1; -} - -int fooi (void* iv) { - int *ip=(int*)iv; - return foo(*ip); -} - -extern "C++" { - -int N = 1000; - -double tdiff (struct timeval *after, struct timeval *before) -{ - return after->tv_sec - before->tv_sec + (1e-6)*(after->tv_usec - before->tv_usec); -} - - -void do_cilkrun (void) { - cilk::run(&foo, 0); -} - -static cilk::context *ctx; -void do_cilkcxt (void) { - int i = 0; - int j __attribute__((__unused__)) = ctx->run(&fooi, (void*)&i); -} - -void do_N_cilkcxt (void) { - struct timeval start,end; - gettimeofday(&start, 0); - cilk::context ctx; - int r=0; - for (int i=0; i<N; i++) { - int j=ctx.run(&fooi, (void*)&i); - r+=j; - } - gettimeofday(&end, 0); - printf("%.3fus per ctx.run (tot=%d)\n", 1e6*tdiff(&end, &start)/N, 0); -} - - -extern "Cilk++" int cilk_in_pt (int i) { - assert(i==0); - return 0; -} - -pthread_t pt_for_cilk; -extern void* do_pt_for_cilk(void *extra __attribute__((__unused__))) { - cilk::run(&cilk_in_pt, 0); - return 0; -} - -void setup_cilk_in_pthread (void) { - int r = pthread_create(&pt_for_cilk, 0, do_pt_for_cilk, NULL); - assert(r==0); -} - -void do_cilk_in_pthread (void) { -} - -void* do_something (void *extra __attribute__((__unused__))) { - return 0; -} - -void do_pthread(void) { - pthread_t pt; - {int r = pthread_create(&pt, 0, do_something, NULL); assert(r==0);} - {int r = pthread_join(pt, NULL); assert(r==0);} -} - -void measure(void (*f)(void), const char *string) { - const int maxiter=4; - for (int j=0; j<maxiter; j++) { - int M = (j+1==maxiter) ? N : 1<<j; - struct timeval start,end; - gettimeofday(&start, 0); - for (int i=0; i<M; i++) { - f(); - } - gettimeofday(&end, 0); - printf("%9.3fus per call (%d calls) for %s\n", 1e6*tdiff(&end, &start)/M, M, string); - } - printf("\n"); -} - -int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) { - measure(do_pthread, "pthread"); - measure(do_cilkrun, "cilkrun"); - - ctx = new cilk::context; - measure(do_cilkcxt, "cilkcxt"); - delete ctx; - - return 0; -} - -} /* end extern "C" */ diff --git a/storage/tokudb/ft-index/src/tests/create-datadir.cc b/storage/tokudb/ft-index/src/tests/create-datadir.cc index bcf37621780..ecd0b032897 100644 --- a/storage/tokudb/ft-index/src/tests/create-datadir.cc +++ b/storage/tokudb/ft-index/src/tests/create-datadir.cc @@ -114,13 +114,9 @@ static void run_test (void) { r = db_create(&db, env, 0); CKERR(r); r = db->open(db, NULL, "bdir/b.db", NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); -#if USE_TDB CKERR(r); //Success, so need a new handle r = db->close(db, 0); CKERR(r); r = db_create(&db, env, 0); CKERR(r); -#else - assert(r != 0); -#endif char path[TOKU_PATH_MAX+1]; r = toku_os_mkdir(toku_path_join(path, 2, TOKU_TEST_FILENAME, "bdir"), 0777); assert(r == 0); r = db->open(db, NULL, "bdir/b.db", NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); @@ -137,13 +133,6 @@ static void run_test (void) { r = db->open(db, NULL, "c.db", NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); r = db->close(db, 0); CKERR(r); -#if 0 - // test fname with absolute path - r = db_create(&db, env, 0); CKERR(r); - r = db->open(db, NULL, "/tmp/d.db", NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); - r = db->close(db, 0); CKERR(r); -#endif - r = env->close(env, 0); CKERR(r); } diff --git a/storage/tokudb/ft-index/src/tests/cursor-more-than-a-leaf-provdel.cc b/storage/tokudb/ft-index/src/tests/cursor-more-than-a-leaf-provdel.cc index 5b3ba8a37cb..2927bb7c5ff 100644 --- a/storage/tokudb/ft-index/src/tests/cursor-more-than-a-leaf-provdel.cc +++ b/storage/tokudb/ft-index/src/tests/cursor-more-than-a-leaf-provdel.cc @@ -104,22 +104,14 @@ setup (void) { r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB r=env->set_redzone(env, 0); CKERR(r); r=env->set_default_bt_compare(env, int_dbt_cmp); CKERR(r); -#endif env->set_errfile(env, stderr); -#ifdef USE_BDB - r=env->set_lk_max_objects(env, 2*num_insert); CKERR(r); -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); r=env->txn_begin(env, 0, &txn, 0); assert(r==0); -#ifdef USE_BDB - r=db->set_bt_compare(db, int_dbt_cmp); CKERR(r); -#endif r=db->open(db, txn, "foo.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=txn->commit(txn, 0); assert(r==0); } diff --git a/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc b/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc index 004a7aad12d..d60725c4966 100644 --- a/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc +++ b/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock-threads.cc @@ -184,9 +184,6 @@ static void simple_deadlock(DB_ENV *db_env, DB *db, int do_txn, int n) { } uint32_t txn_flags = 0; -#if USE_BDB - txn_flags = DB_TXN_NOWAIT; // force no wait for BDB to avoid a bug described below -#endif DB_TXN *txn_a = NULL; if (do_txn) { @@ -209,7 +206,6 @@ static void simple_deadlock(DB_ENV *db_env, DB *db, int do_txn, int n) { test_seq_next_state(&test_seq); test_seq_sleep(&test_seq, 2); - // BDB does not time out this lock request, so the test hangs. it looks like a bug in bdb's __lock_get_internal. insert_row(db, txn_a, htonl(n-1), n-1, DB_LOCK_NOTGRANTED); test_seq_next_state(&test_seq); @@ -268,16 +264,8 @@ int test_main(int argc, char * const argv[]) { } if (!do_txn) db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); -#if USE_BDB - r = db_env->set_flags(db_env, DB_TIME_NOTGRANTED, 1); assert(r == 0); // force DB_LOCK_DEADLOCK to DB_LOCK_NOTGRANTED -#endif r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if defined(USE_TDB) r = db_env->set_lock_timeout(db_env, 0, nullptr); assert(r == 0); // no wait -#elif defined(USE_BDB) - r = db_env->set_lk_detect(db_env, DB_LOCK_YOUNGEST); assert(r == 0); - r = db_env->set_timeout(db_env, 10000, DB_SET_LOCK_TIMEOUT); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock.cc b/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock.cc index d373752994a..acc841b8d78 100644 --- a/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock.cc +++ b/storage/tokudb/ft-index/src/tests/db-put-simple-deadlock.cc @@ -88,7 +88,7 @@ PATENT RIGHTS GRANT: #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." -// this test demonstrates that a simple deadlock with 2 transactions on a single thread works with tokudb, hangs with bdb +// this test demonstrates that a simple deadlock with 2 transactions on a single thread works with tokudb #include "test.h" @@ -115,9 +115,6 @@ static void simple_deadlock(DB_ENV *db_env, DB *db, int do_txn, int n) { } uint32_t txn_flags = 0; -#if USE_BDB - txn_flags = DB_TXN_NOWAIT; // force no wait for BDB to avoid a bug described below -#endif DB_TXN *txn_a = NULL; if (do_txn) { @@ -133,7 +130,6 @@ static void simple_deadlock(DB_ENV *db_env, DB *db, int do_txn, int n) { insert_row(db, txn_b, htonl(n-1), n-1, 0); - // if the txn_flags is 0, then BDB does not time out this lock request, so the test hangs. it looks like a bug in bdb's __lock_get_internal. insert_row(db, txn_a, htonl(n-1), n-1, DB_LOCK_NOTGRANTED); insert_row(db, txn_b, htonl(0), 0, DB_LOCK_NOTGRANTED); @@ -148,7 +144,7 @@ int test_main(int argc, char * const argv[]) { uint64_t cachesize = 0; uint32_t pagesize = 0; int do_txn = 1; - int nrows = 1000; // for BDB, insert enough rows to create a tree with more than one page in it. this avoids a page locking conflict. + int nrows = 1000; const char *db_env_dir = TOKU_TEST_FILENAME; const char *db_filename = "simple_deadlock"; int db_env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG | DB_THREAD; @@ -187,14 +183,7 @@ int test_main(int argc, char * const argv[]) { } if (!do_txn) db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); -#if USE_BDB - r = db_env->set_flags(db_env, DB_TIME_NOTGRANTED, 1); assert(r == 0); // force DB_LOCK_DEADLOCK to DB_LOCK_NOTGRANTED -#endif r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if defined(USE_BDB) - r = db_env->set_lk_detect(db_env, DB_LOCK_YOUNGEST); assert(r == 0); - r = db_env->set_timeout(db_env, 1000, DB_SET_LOCK_TIMEOUT); assert(r == 0); -#endif // create the db DB *db = NULL; r = db_create(&db, db_env, 0); assert(r == 0); diff --git a/storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc b/storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc index 54682db81af..e459652101d 100644 --- a/storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc +++ b/storage/tokudb/ft-index/src/tests/db-put-simple-lockwait.cc @@ -213,11 +213,7 @@ int test_main(int argc, char * const argv[]) { if (!do_txn) db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if TOKUDB r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#else - r = db_env->set_lk_detect(db_env, DB_LOCK_YOUNGEST); assert(r == 0); -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc b/storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc index 1a546825fc4..ddd2893cae0 100644 --- a/storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc +++ b/storage/tokudb/ft-index/src/tests/db-put-update-deadlock.cc @@ -91,7 +91,6 @@ PATENT RIGHTS GRANT: // for all i: T(i) reads 0, gets a read lock on 0 // for all i: T(i) writes 0, enters a deadlock // tokudb detects deadlock on the fly -// bdb detects deadlock on the fly or uses a deadlock detector // --poll runs the deadlock detector until all the txns are resolved #include "test.h" @@ -201,18 +200,6 @@ static void update_deadlock(DB_ENV *db_env, DB *db, int do_txn, int nrows, int n } #endif -#if defined(USE_BDB) - // check for deadlocks - if (poll_deadlock) { - while (n_txns > 0) { - sleep(10); - int rejected = 0; - r = db_env->lock_detect(db_env, 0, DB_LOCK_YOUNGEST, &rejected); assert(r == 0); - printf("%s rejected %d\n", __FUNCTION__, rejected); - } - } -#endif - // cleanup for (int i = 0; i < ntxns; i++) { void *ret = NULL; @@ -274,14 +261,7 @@ int test_main(int argc, char * const argv[]) { if (!do_txn) db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert(r == 0); -#if defined(TOKUDB) r = db_env->set_lock_timeout(db_env, 30 * 1000, nullptr); assert(r == 0); -#endif -#if defined(USE_BDB) - if (!poll_deadlock) { - r = db_env->set_lk_detect(db_env, DB_LOCK_YOUNGEST); assert(r == 0); - } -#endif // create the db DB *db = NULL; diff --git a/storage/tokudb/ft-index/src/tests/dump-env.cc b/storage/tokudb/ft-index/src/tests/dump-env.cc index 9e1459b80ec..8348c25f2bd 100644 --- a/storage/tokudb/ft-index/src/tests/dump-env.cc +++ b/storage/tokudb/ft-index/src/tests/dump-env.cc @@ -106,22 +106,14 @@ setup (void) { } r=db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB r=env->set_redzone(env, 0); CKERR(r); r=env->set_default_bt_compare(env, int_dbt_cmp); CKERR(r); -#endif env->set_errfile(env, stderr); -#ifdef USE_BDB - r=env->set_lk_max_objects(env, 2*num_insert); CKERR(r); -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); r=env->txn_begin(env, 0, &txn, 0); assert(r==0); -#ifdef USE_BDB - r=db->set_bt_compare(db, int_dbt_cmp); CKERR(r); -#endif r=db->open(db, txn, "foo.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=txn->commit(txn, 0); assert(r==0); } diff --git a/storage/tokudb/ft-index/src/tests/filesize.cc b/storage/tokudb/ft-index/src/tests/filesize.cc index c1b7ad2df30..b47be955efd 100644 --- a/storage/tokudb/ft-index/src/tests/filesize.cc +++ b/storage/tokudb/ft-index/src/tests/filesize.cc @@ -196,11 +196,7 @@ delete_n (uint32_t ah) ndelete_notfound++; else ndelete_failed++; -#ifdef USE_BDB - assert(r==0 || r==DB_NOTFOUND); -#else CKERR(r); -#endif } static void diff --git a/storage/tokudb/ft-index/src/tests/hotindexer-undo-do-test.cc b/storage/tokudb/ft-index/src/tests/hotindexer-undo-do-test.cc index e1a2070a036..51f60652d14 100644 --- a/storage/tokudb/ft-index/src/tests/hotindexer-undo-do-test.cc +++ b/storage/tokudb/ft-index/src/tests/hotindexer-undo-do-test.cc @@ -97,14 +97,14 @@ PATENT RIGHTS GRANT: #include <ft/tokuconst.h> #include <ft/fttypes.h> -#include <ft/omt.h> #include <ft/leafentry.h> #include <ft/ule.h> #include <ft/ule-internal.h> #include <ft/le-cursor.h> -#include "indexer-internal.h" #include <ft/xids-internal.h> +#include "indexer-internal.h" + struct txn { TXNID xid; TOKUTXN_STATE state; diff --git a/storage/tokudb/ft-index/src/tests/inflate.cc b/storage/tokudb/ft-index/src/tests/inflate.cc index 5a727544be5..8311b591c86 100644 --- a/storage/tokudb/ft-index/src/tests/inflate.cc +++ b/storage/tokudb/ft-index/src/tests/inflate.cc @@ -165,11 +165,7 @@ delete_n (uint32_t ah) DBT key; dbt_init(&key, &an, 4); int r = db->del(db, NULL, &key, DB_DELETE_ANY); -#ifdef USE_BDB - assert(r==0 || r==DB_NOTFOUND); -#else CKERR(r); -#endif } static void diff --git a/storage/tokudb/ft-index/src/tests/inflate2.cc b/storage/tokudb/ft-index/src/tests/inflate2.cc index 2bb930446a2..e5b8b6f270f 100644 --- a/storage/tokudb/ft-index/src/tests/inflate2.cc +++ b/storage/tokudb/ft-index/src/tests/inflate2.cc @@ -179,11 +179,7 @@ delete_n_now (uint32_t ah) DBT key; dbt_init(&key, &an, 4); int r = db->del(db, NULL, &key, DB_DELETE_ANY); -#ifdef USE_BDB - assert(r==0 || r==DB_NOTFOUND); -#else CKERR(r); -#endif get_n(ah, DB_NOTFOUND); } diff --git a/storage/tokudb/ft-index/src/tests/loader-blobs-create-leaf.c.notyet b/storage/tokudb/ft-index/src/tests/loader-blobs-create-leaf.c.notyet deleted file mode 100644 index 04a26a5cc25..00000000000 --- a/storage/tokudb/ft-index/src/tests/loader-blobs-create-leaf.c.notyet +++ /dev/null @@ -1,149 +0,0 @@ -// verify that the loader can deal with blobs larger than the node size - -#include "test.h" - -static int my_bt_compare(DB *db, const DBT *a, const DBT *b) { - db = db; - assert(a->size == 8 && b->size == 8); - return memcmp(a->data, b->data, 8); -} - -static int my_row_generate(DB *dest_db, DB *src_db, DBT *dest_key, DBT *dest_val, const DBT *src_key, const DBT *src_val) { - dest_db = dest_db; src_db = src_db; dest_key = dest_key; dest_val = dest_val; src_key = src_key; src_val = src_val; - assert(dest_key->flags == DB_DBT_REALLOC); - dest_key->data = toku_realloc(dest_key->data, src_key->size); - memcpy(dest_key->data, src_key->data, src_key->size); - dest_key->size = src_key->size; - assert(dest_val->flags == DB_DBT_REALLOC); - dest_val->data = toku_realloc(dest_val->data, src_val->size); - memcpy(dest_val->data, src_val->data, src_val->size); - dest_val->size = src_val->size; - return 0; -} - -static void insert(DB_LOADER *loader, int k, int val_size) { - int r; - - // generate the key - char key_buffer[8]; - memset(key_buffer, 0, sizeof key_buffer); - int newa = htonl(k); - memcpy(key_buffer, &newa, sizeof newa); - - // generate the value - char *val_buffer = toku_malloc(val_size); assert(val_buffer); - memset(val_buffer, 0, val_size); - - DBT key = { .data = key_buffer, .size = sizeof key_buffer }; - DBT value = { .data = val_buffer, .size = val_size }; - r = loader->put(loader, &key, &value); - if (DISALLOW_PUTS) { - assert(r == EINVAL); - } - else { - assert_zero(r); - } - - toku_free(val_buffer); -} - -int test_main(int argc, char * const argv[]) { - uint32_t loader_flags = 0; -#if defined(TOKUDB) - char *db_env_dir = "blobs.leafsplit.env.tokudb"; -#else - char *db_env_dir = "blobs.leafsplit.env.bdb"; -#endif - int db_env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG; - char *db_filename = "blobs.db"; - int do_txn = 1; - u_int64_t cachesize = 0; - u_int32_t pagesize = 0; - - int i; - for (i = 1; i < argc; i++) { - char *arg = argv[i]; - if (strcmp(arg, "-v") == 0 || strcmp(arg, "--verbose") == 0) { - verbose++; - continue; - } - if (strcmp(arg, "-q") == 0) { - if (verbose > 0) verbose--; - continue; - } - if (strcmp(arg, "-z") == 0) { - loader_flags |= LOADER_COMPRESS_INTERMEDIATES; - continue; - } - if (strcmp(arg, "-p") == 0) { - loader_flags |= LOADER_DISALLOW_PUTS; - continue; - } - if (strcmp(arg, "--txn") == 0 && i+1 < argc) { - do_txn = atoi(argv[++i]); - continue; - } - if (strcmp(arg, "--pagesize") == 0 && i+1 < argc) { - pagesize = atoi(argv[++i]); - continue; - } - if (strcmp(arg, "--cachesize") == 0 && i+1 < argc) { - cachesize = atol(argv[++i]); - continue; - } - - assert(0); - } - - int r; - char rm_cmd[strlen(db_env_dir) + strlen("rm -rf ") + 1]; - snprintf(rm_cmd, sizeof(rm_cmd), "rm -rf %s", db_env_dir); - r = system(rm_cmd); assert_zero(r); - - r = toku_os_mkdir(db_env_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); assert_zero(r); - - // create and open the env - DB_ENV *db_env = NULL; - r = db_env_create(&db_env, 0); assert_zero(r); - if (cachesize) { - const u_int64_t gig = 1 << 30; - r = db_env->set_cachesize(db_env, cachesize / gig, cachesize % gig, 1); assert_zero(r); - } - r = db_env->set_generate_row_callback_for_put(db_env, my_row_generate); assert_zero(r); - r = db_env->set_default_bt_compare(db_env, my_bt_compare); assert_zero(r); - if (!do_txn) - db_env_open_flags &= ~(DB_INIT_TXN | DB_INIT_LOG); - r = db_env->open(db_env, db_env_dir, db_env_open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert_zero(r); - - // create the db - DB *db = NULL; - r = db_create(&db, db_env, 0); assert_zero(r); - DB_TXN *create_txn = NULL; - if (do_txn) { - r = db_env->txn_begin(db_env, NULL, &create_txn, 0); assert_zero(r); - } - if (pagesize) { - r = db->set_pagesize(db, pagesize); assert_zero(r); - } - r = db->open(db, create_txn, db_filename, NULL, DB_BTREE, DB_CREATE, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); assert_zero(r); - - DB_LOADER *loader = NULL; - uint32_t db_flags = 0; - uint32_t dbt_flags = 0; - r = db_env->create_loader(db_env, create_txn, &loader, db, 1, &db, &db_flags, &dbt_flags, loader_flags); assert_zero(r); - - insert(loader, 1, 8000000); - insert(loader, 2, 1); - - r = loader->close(loader); assert_zero(r); - - if (do_txn) { - r = create_txn->commit(create_txn, 0); assert_zero(r); - } - - // shutdown - r = db->close(db, 0); assert_zero(r); db = NULL; - r = db_env->close(db_env, 0); assert_zero(r); db_env = NULL; - - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/medium-nested-commit-commit.cc b/storage/tokudb/ft-index/src/tests/medium-nested-commit-commit.cc index e1c815695cc..48d9102d523 100644 --- a/storage/tokudb/ft-index/src/tests/medium-nested-commit-commit.cc +++ b/storage/tokudb/ft-index/src/tests/medium-nested-commit-commit.cc @@ -177,9 +177,6 @@ test_setup (void) { r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_env_create(&env, 0); CKERR(r); -#ifndef TOKUDB - r=env->set_lk_max_objects(env, N); CKERR(r); -#endif env->set_errfile(env, stderr); r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/recover-compare-db-descriptor.cc b/storage/tokudb/ft-index/src/tests/recover-compare-db-descriptor.cc index 8da0e58af8d..58ae0b007e3 100644 --- a/storage/tokudb/ft-index/src/tests/recover-compare-db-descriptor.cc +++ b/storage/tokudb/ft-index/src/tests/recover-compare-db-descriptor.cc @@ -100,8 +100,6 @@ const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG const char *namea="a.db"; const char *nameb="b.db"; -#if USE_TDB - static int my_compare(DB *UU(db), const DBT *a, const DBT *b) { assert(db); assert(db->cmp_descriptor); @@ -112,17 +110,13 @@ static int my_compare(DB *UU(db), const DBT *a, const DBT *b) { return memcmp(a->data, b->data, a->size); } -#endif - static void change_descriptor(DB_ENV* env, DB* db) { -#if USE_TDB DBT descriptor; dbt_init(&descriptor, descriptor_contents, sizeof(descriptor_contents)); IN_TXN_COMMIT(env, NULL, txn_desc, 0, { { int chk_r = db->change_descriptor(db, txn_desc, &descriptor, DB_UPDATE_CMP_DESCRIPTOR); CKERR(chk_r); } }); -#endif } static void @@ -136,9 +130,7 @@ do_x1_shutdown (bool do_commit, bool do_abort) { DB *dba, *dbb; r = db_env_create(&env, 0); CKERR(r); r = env->set_data_dir(env, "data"); CKERR(r); -#if USE_TDB r = env->set_default_bt_compare(env, my_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); r = dba->open(dba, NULL, namea, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); @@ -181,9 +173,7 @@ do_x1_recover (bool did_commit) { r = toku_os_mkdir(datadir, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_env_create(&env, 0); CKERR(r); r = env->set_data_dir(env, "data"); CKERR(r); -#if USE_TDB r = env->set_default_bt_compare(env, my_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); r = dba->open(dba, NULL, namea, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/recover-compare-db.cc b/storage/tokudb/ft-index/src/tests/recover-compare-db.cc index 0102a36db6a..7e1de1ef3fe 100644 --- a/storage/tokudb/ft-index/src/tests/recover-compare-db.cc +++ b/storage/tokudb/ft-index/src/tests/recover-compare-db.cc @@ -98,16 +98,12 @@ const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG const char *namea="a.db"; const char *nameb="b.db"; -#if USE_TDB - static int my_compare(DB *UU(db), const DBT *a, const DBT *b) { assert(db); assert(a->size == b->size); return memcmp(a->data, b->data, a->size); } -#endif - static void do_x1_shutdown (bool do_commit, bool do_abort) { int r; @@ -116,9 +112,7 @@ do_x1_shutdown (bool do_commit, bool do_abort) { DB_ENV *env; DB *dba, *dbb; r = db_env_create(&env, 0); CKERR(r); -#if USE_TDB r = env->set_default_bt_compare(env, my_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); r = dba->open(dba, NULL, namea, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); @@ -155,9 +149,7 @@ do_x1_recover (bool did_commit) { DB *dba, *dbb; int r; r = db_env_create(&env, 0); CKERR(r); -#if USE_TDB r = env->set_default_bt_compare(env, my_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); r = dba->open(dba, NULL, namea, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/recover-fcreate-basementnodesize.cc b/storage/tokudb/ft-index/src/tests/recover-fcreate-basementnodesize.cc index 2297a095e69..228528a5327 100644 --- a/storage/tokudb/ft-index/src/tests/recover-fcreate-basementnodesize.cc +++ b/storage/tokudb/ft-index/src/tests/recover-fcreate-basementnodesize.cc @@ -99,7 +99,6 @@ static const char *namea="a.db"; uint32_t nodesizea = 0; static const char *nameb="b.db"; uint32_t nodesizeb = 32*1024; static void do_remove(DB_ENV *env, const char *filename) { -#if TOKUDB int r; DBT dname; DBT iname; @@ -112,12 +111,6 @@ static void do_remove(DB_ENV *env, const char *filename) { toku_path_join(rmpath, 2, TOKU_TEST_FILENAME, iname.data); toku_os_recursive_delete(rmpath); toku_free(iname.data); -#else - (void) env; - char rmpath[TOKU_PATH_MAX+1]; - toku_path_join(rmpath, 2, TOKU_TEST_FILENAME, filename); - toku_os_recursive_delete(rmpath); -#endif } static void run_test (void) { diff --git a/storage/tokudb/ft-index/src/tests/recover-fcreate-nodesize.cc b/storage/tokudb/ft-index/src/tests/recover-fcreate-nodesize.cc index d0a695b16ad..619704efcf2 100644 --- a/storage/tokudb/ft-index/src/tests/recover-fcreate-nodesize.cc +++ b/storage/tokudb/ft-index/src/tests/recover-fcreate-nodesize.cc @@ -100,7 +100,6 @@ static const char *namea="a.db"; uint32_t nodesizea = 0; static const char *nameb="b.db"; uint32_t nodesizeb = 64*1024; static void do_remove(DB_ENV *env, const char *filename) { -#if TOKUDB int r; DBT dname; DBT iname; @@ -113,12 +112,6 @@ static void do_remove(DB_ENV *env, const char *filename) { toku_path_join(rmpath, 2, TOKU_TEST_FILENAME, iname.data); toku_os_recursive_delete(rmpath); toku_free(iname.data); -#else - (void) env; - char rmpath[TOKU_PATH_MAX+1]; - toku_path_join(rmpath, 2, TOKU_TEST_FILENAME, filename); - toku_os_recursive_delete(rmpath); -#endif } static void run_test (void) { diff --git a/storage/tokudb/ft-index/src/tests/recover-missing-dbfile-2.cc b/storage/tokudb/ft-index/src/tests/recover-missing-dbfile-2.cc index 777fb3499e6..59f963ef503 100644 --- a/storage/tokudb/ft-index/src/tests/recover-missing-dbfile-2.cc +++ b/storage/tokudb/ft-index/src/tests/recover-missing-dbfile-2.cc @@ -109,9 +109,7 @@ static void run_test (void) { DB_ENV *env; r = db_env_create(&env, 0); CKERR(r); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); DB *dba; @@ -160,9 +158,7 @@ static void run_recover (void) { CKERR(r); r = db_env_create(&env, 0); CKERR(r); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags + DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); assert(r == DB_RUNRECOVERY); @@ -184,9 +180,7 @@ static void run_no_recover (void) { int r; r = db_env_create(&env, 0); CKERR(r); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags & ~DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = env->close(env, 0); CKERR(r); exit(0); diff --git a/storage/tokudb/ft-index/src/tests/recover-missing-dbfile.cc b/storage/tokudb/ft-index/src/tests/recover-missing-dbfile.cc index 1287ac71c18..a71f91d7417 100644 --- a/storage/tokudb/ft-index/src/tests/recover-missing-dbfile.cc +++ b/storage/tokudb/ft-index/src/tests/recover-missing-dbfile.cc @@ -109,9 +109,7 @@ static void run_test (void) { DB *dba; r = db_env_create(&env, 0); CKERR(r); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); @@ -151,9 +149,7 @@ static void run_recover (void) { CKERR(r); r = db_env_create(&env, 0); CKERR(r); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags + DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR2(r, DB_RUNRECOVERY); @@ -175,9 +171,7 @@ static void run_no_recover (void) { int r; r = db_env_create(&env, 0); CKERR(r); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags & ~DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = env->close(env, 0); CKERR(r); exit(0); diff --git a/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor-multihandle.cc b/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor-multihandle.cc index 67ffd36560f..3914badda0b 100644 --- a/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor-multihandle.cc +++ b/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor-multihandle.cc @@ -105,8 +105,6 @@ const char *namea="a.db"; int verified = 0; uint32_t forced_version = 2; -#if USE_TDB - static int my_compare(DB *UU(db), const DBT *a, const DBT *b) { assert(db); assert(db->cmp_descriptor); @@ -121,18 +119,14 @@ static int my_compare(DB *UU(db), const DBT *a, const DBT *b) { return memcmp(a->data, b->data, a->size); } -#endif - static void change_descriptor(DB* db, int which, DB_ENV* env) { -#if USE_TDB DBT descriptor; size_t len = strlen(descriptor_contents[which])+1; dbt_init(&descriptor, descriptor_contents[which], len); IN_TXN_COMMIT(env, NULL, txn_desc, 0, { { int chk_r = db->change_descriptor(db, txn_desc, &descriptor, DB_UPDATE_CMP_DESCRIPTOR); CKERR(chk_r); } }); -#endif } static void @@ -146,9 +140,7 @@ do_x1_shutdown (bool do_commit, bool do_abort) { DB *dba, *dbb; r = db_env_create(&env, 0); CKERR(r); r = env->set_data_dir(env, "data"); CKERR(r); -#if USE_TDB r = env->set_default_bt_compare(env, my_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); @@ -194,9 +186,7 @@ do_x1_recover (bool did_commit) { r = toku_os_mkdir(datadir, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_env_create(&env, 0); CKERR(r); r = env->set_data_dir(env, "data"); CKERR(r); -#if USE_TDB r = env->set_default_bt_compare(env, my_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); r = dba->open(dba, NULL, namea, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor.cc b/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor.cc index 31cacc9d354..5bf6e1be049 100644 --- a/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor.cc +++ b/storage/tokudb/ft-index/src/tests/recover-upgrade-db-descriptor.cc @@ -105,8 +105,6 @@ const char *namea="a.db"; int verified = 0; uint32_t forced_version = 2; -#if USE_TDB - static int my_compare(DB *UU(db), const DBT *a, const DBT *b) { assert(db); assert(db->cmp_descriptor); @@ -121,18 +119,14 @@ static int my_compare(DB *UU(db), const DBT *a, const DBT *b) { return memcmp(a->data, b->data, a->size); } -#endif - static void change_descriptor(DB* db, int which, DB_ENV* env) { -#if USE_TDB DBT descriptor; size_t len = strlen(descriptor_contents[which])+1; dbt_init(&descriptor, descriptor_contents[which], len); IN_TXN_COMMIT(env, NULL, txn_desc, 0, { { int chk_r = db->change_descriptor(db, txn_desc, &descriptor, DB_UPDATE_CMP_DESCRIPTOR); CKERR(chk_r); } }); -#endif } static void @@ -146,9 +140,7 @@ do_x1_shutdown (bool do_commit, bool do_abort) { DB *dba; r = db_env_create(&env, 0); CKERR(r); r = env->set_data_dir(env, "data"); CKERR(r); -#if USE_TDB r = env->set_default_bt_compare(env, my_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); @@ -197,9 +189,7 @@ do_x1_recover (bool did_commit) { r = toku_os_mkdir(datadir, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_env_create(&env, 0); CKERR(r); r = env->set_data_dir(env, "data"); CKERR(r); -#if USE_TDB r = env->set_default_bt_compare(env, my_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, envflags|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = db_create(&dba, env, 0); CKERR(r); r = dba->open(dba, NULL, namea, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/recovery_stress.cc b/storage/tokudb/ft-index/src/tests/recovery_stress.cc index 26190bae824..9e6b3117031 100644 --- a/storage/tokudb/ft-index/src/tests/recovery_stress.cc +++ b/storage/tokudb/ft-index/src/tests/recovery_stress.cc @@ -95,7 +95,7 @@ PATENT RIGHTS GRANT: #include "checkpoint_test.h" -static const uint64_t max_windows_cachesize = 256 << 20; +static const uint64_t max_cachesize = 256 << 20; static const int NUM_DICTIONARIES = 1; static const int OPER_STEPS = 6; @@ -495,7 +495,7 @@ static void run_test (int iter) { uint64_t cachebytes = 0; // 0 => use default size const int32_t K256 = 256 * 1024; cachebytes = K256 * (iter + 1) - (128 * 1024); - if (cachebytes > max_windows_cachesize) + if (cachebytes > max_cachesize) cachebytes = 0; if (iter & 2) cachebytes = 0; // use default cachesize half the time diff --git a/storage/tokudb/ft-index/src/tests/root_fifo_2.cc b/storage/tokudb/ft-index/src/tests/root_fifo_2.cc index 98f209bf769..b8d3ac63f27 100644 --- a/storage/tokudb/ft-index/src/tests/root_fifo_2.cc +++ b/storage/tokudb/ft-index/src/tests/root_fifo_2.cc @@ -184,11 +184,7 @@ static void root_fifo_2(int n, int create_outside) { // cleanup r = env->close(env, 0); -#if TOKUDB assert(r == 0); env = null_env; -#else - printf("%s:%d env close r=%d\n", __FUNCTION__, __LINE__, r); -#endif } int test_main(int argc, char *const argv[]) { diff --git a/storage/tokudb/ft-index/src/tests/rowsize.cc b/storage/tokudb/ft-index/src/tests/rowsize.cc index 38232321915..0965231e621 100644 --- a/storage/tokudb/ft-index/src/tests/rowsize.cc +++ b/storage/tokudb/ft-index/src/tests/rowsize.cc @@ -102,9 +102,7 @@ static void setup_env (void) { {int r = toku_os_mkdir(envdir, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); } {int r = db_env_create(&env, 0); CKERR(r); } //env->set_errfile(env, stderr); -#ifdef TOKUDB CKERR(env->set_redzone(env, 0)); -#endif { int r = env->open(env, envdir, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); } { int r = db_create(&db, env, 0); CKERR(r); } { int r = db->open(db, NULL, "foo.db", 0, DB_BTREE, DB_CREATE | DB_AUTO_COMMIT, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); } @@ -119,14 +117,11 @@ static void put (const char *keystring, int size, bool should_work) { DBT k, v; dbt_init(&k, keystring, 1+strlen(keystring)); dbt_init(&v, toku_xcalloc(size, 1), size); -#ifdef USE_BDB -#define DB_YES_OVERWRITE 0 -#endif static DB_TXN *txn = NULL; { int r = env->txn_begin(env, 0, &txn, 0); CKERR(r); } { int r = db->put(db, NULL, &k, &v, 0); - if (!IS_TDB || should_work) { + if (should_work) { CKERR(r); } else { assert(r!=0); diff --git a/storage/tokudb/ft-index/src/tests/simple.cc b/storage/tokudb/ft-index/src/tests/simple.cc index ed55a1e847e..d51cf446f4c 100644 --- a/storage/tokudb/ft-index/src/tests/simple.cc +++ b/storage/tokudb/ft-index/src/tests/simple.cc @@ -136,9 +136,7 @@ test_main (int argc, char * const argv[]) { parse_args(argc, argv); setup(FLAGS_LOG); env->txn_checkpoint(env, 0, 0, 0); -#ifdef USE_TDB print_engine_status(env); -#endif test_shutdown(); return 0; } diff --git a/storage/tokudb/ft-index/src/tests/test-prepare.cc b/storage/tokudb/ft-index/src/tests/test-prepare.cc index a29241596f0..ea3949cf6fe 100644 --- a/storage/tokudb/ft-index/src/tests/test-prepare.cc +++ b/storage/tokudb/ft-index/src/tests/test-prepare.cc @@ -103,9 +103,7 @@ static void clean_env (const char *envdir) { static void setup_env (DB_ENV **envp, const char *envdir) { { int chk_r = db_env_create(envp, 0); CKERR(chk_r); } (*envp)->set_errfile(*envp, stderr); -#ifdef TOKUDB { int chk_r = (*envp)->set_redzone(*envp, 0); CKERR(chk_r); } -#endif { int chk_r = (*envp)->open(*envp, envdir, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(chk_r); } } diff --git a/storage/tokudb/ft-index/src/tests/test-prepare2.cc b/storage/tokudb/ft-index/src/tests/test-prepare2.cc index ce4cf4869ef..eb79a1e8e18 100644 --- a/storage/tokudb/ft-index/src/tests/test-prepare2.cc +++ b/storage/tokudb/ft-index/src/tests/test-prepare2.cc @@ -105,9 +105,7 @@ static void clean_env (const char *envdir) { static void setup_env (DB_ENV **envp, const char *envdir) { { int chk_r = db_env_create(envp, 0); CKERR(chk_r); } (*envp)->set_errfile(*envp, stderr); -#ifdef TOKUDB { int chk_r = (*envp)->set_redzone(*envp, 0); CKERR(chk_r); } -#endif { int chk_r = (*envp)->open(*envp, envdir, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(chk_r); } } diff --git a/storage/tokudb/ft-index/src/tests/test-prepare3.cc b/storage/tokudb/ft-index/src/tests/test-prepare3.cc index 4cd13050310..352518b8579 100644 --- a/storage/tokudb/ft-index/src/tests/test-prepare3.cc +++ b/storage/tokudb/ft-index/src/tests/test-prepare3.cc @@ -105,9 +105,7 @@ static void clean_env (const char *envdir) { static void setup_env (DB_ENV **envp, const char *envdir) { { int chk_r = db_env_create(envp, 0); CKERR(chk_r); } (*envp)->set_errfile(*envp, stderr); -#ifdef TOKUDB { int chk_r = (*envp)->set_redzone(*envp, 0); CKERR(chk_r); } -#endif { int chk_r = (*envp)->open(*envp, envdir, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(chk_r); } } diff --git a/storage/tokudb/ft-index/src/tests/test-xa-prepare.cc b/storage/tokudb/ft-index/src/tests/test-xa-prepare.cc index 751589c5d91..d409eefb382 100644 --- a/storage/tokudb/ft-index/src/tests/test-xa-prepare.cc +++ b/storage/tokudb/ft-index/src/tests/test-xa-prepare.cc @@ -103,9 +103,7 @@ static void clean_env (const char *envdir) { static void setup_env (DB_ENV **envp, const char *envdir) { { int chk_r = db_env_create(envp, 0); CKERR(chk_r); } (*envp)->set_errfile(*envp, stderr); -#ifdef TOKUDB { int chk_r = (*envp)->set_redzone(*envp, 0); CKERR(chk_r); } -#endif { int chk_r = (*envp)->open(*envp, envdir, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(chk_r); } } diff --git a/storage/tokudb/ft-index/src/tests/test.h b/storage/tokudb/ft-index/src/tests/test.h index b5ab33ccfee..4cbfcf426d6 100644 --- a/storage/tokudb/ft-index/src/tests/test.h +++ b/storage/tokudb/ft-index/src/tests/test.h @@ -107,17 +107,13 @@ PATENT RIGHTS GRANT: #include "toku_assert.h" #include <signal.h> #include <time.h> -#if defined(USE_TDB) + #include "ydb.h" //TDB uses DB_NOTFOUND for c_del and DB_CURRENT errors. #ifdef DB_KEYEMPTY #error #endif #define DB_KEYEMPTY DB_NOTFOUND -#endif -#ifndef DB_DELETE_ANY -#define DB_DELETE_ANY 0 -#endif // Certain tests fail when row locks taken for read are not shared. // This switch prevents them from failing so long as read locks are not shared. @@ -144,13 +140,6 @@ int verbose=0; fflush(stderr); \ } while (0) -// If the error code depends on BDB vs TDB use this -#ifdef USE_TDB -#define CKERR_depending(r,tdbexpect,bdbexpect) CKERR2(r,tdbexpect) -#else -#define CKERR_depending(r,tdbexpect,bdbexpect) CKERR2(r,bdbexpect) -#endif - static __attribute__((__unused__)) void parse_args (int argc, char * const argv[]) { const char *argv0=argv[0]; @@ -174,7 +163,6 @@ parse_args (int argc, char * const argv[]) { } } -#ifdef USE_TDB static __attribute__((__unused__)) void print_engine_status(DB_ENV * UU(env)) { if (verbose) { // verbose declared statically in this file @@ -187,9 +175,7 @@ print_engine_status(DB_ENV * UU(env)) { printf("%s", buff); } } -#endif -#ifdef USE_TDB static __attribute__((__unused__)) uint64_t get_engine_status_val(DB_ENV * UU(env), const char * keyname) { uint64_t rval = 0; @@ -213,7 +199,6 @@ get_engine_status_val(DB_ENV * UU(env), const char * keyname) { CKERR2(found, 1); return rval; } -#endif static __attribute__((__unused__)) DBT * dbt_init(DBT *dbt, const void *data, uint32_t size) { @@ -293,13 +278,8 @@ uint_dbt_cmp (DB *db, const DBT *a, const DBT *b) { return 0; } -#ifdef USE_TDB #define SET_TRACE_FILE(x) toku_set_trace_file(x) #define CLOSE_TRACE_FILE(x) toku_close_trace_file() -#else -#define SET_TRACE_FILE(x) ((void)0) -#define CLOSE_TRACE_FILE(x) ((void)0) -#endif #include <memory.h> @@ -361,19 +341,11 @@ void print_time_now(void) { static void UU() multiply_locks_for_n_dbs(DB_ENV *env, int num_dbs) { -#ifdef USE_TDB uint64_t current_max_lock_memory; int r = env->get_lk_max_memory(env, ¤t_max_lock_memory); CKERR(r); r = env->set_lk_max_memory(env, current_max_lock_memory * num_dbs); CKERR(r); -#else - uint32_t current_max_locks; - int r = env->get_lk_max_locks(env, ¤t_max_locks); - CKERR(r); - r = env->set_lk_max_locks(env, current_max_locks * num_dbs); - CKERR(r); -#endif } static inline void @@ -402,7 +374,6 @@ static void copy_dbt(DBT *dest, const DBT *src) { } // DBT_ARRAY is a toku-specific type -#ifdef USE_TDB UU() static int env_update_multiple_test_no_array( @@ -507,7 +478,6 @@ static int env_del_multiple_test_no_array( } return r; } -#endif /* Some macros for evaluating blocks or functions within the scope of a * transaction. */ @@ -535,20 +505,8 @@ main(int argc, char * const argv[]) #endif { int r; -#if IS_TDB && TOKU_WINDOWS - int rinit = toku_ydb_init(); - CKERR(rinit); -#endif -#if !IS_TDB && DB_VERSION_MINOR==4 && DB_VERSION_MINOR == 7 - db_env_set_func_malloc(toku_malloc); - db_env_set_func_free(toku_free); - db_env_set_func_realloc(toku_realloc); -#endif toku_os_initialize_settings(1); r = test_main(argc, argv); -#if IS_TDB && TOKU_WINDOWS - toku_ydb_destroy(); -#endif return r; } diff --git a/storage/tokudb/ft-index/src/tests/test1426.cc b/storage/tokudb/ft-index/src/tests/test1426.cc deleted file mode 100644 index 40ca1dee345..00000000000 --- a/storage/tokudb/ft-index/src/tests/test1426.cc +++ /dev/null @@ -1,196 +0,0 @@ -/* -*- 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. - This software is covered by US Patent No. 8,489,638. - -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." -#include "test.h" -/* Test for #1426. Make sure deletes and inserts in a FIFO work. */ -/* This test is run using a special makefile rule that runs the TDB version and the BDB version, dumps their outputs, and compares them */ - -#include <db.h> -#include <memory.h> -#include <fcntl.h> - -// |DB_INIT_TXN| DB_INIT_LOG | DB_RECOVER -const int envflags = DB_CREATE|DB_INIT_MPOOL|DB_INIT_LOCK |DB_THREAD |DB_PRIVATE; - -DB_ENV *env; -DB *db; -DB_TXN * const null_txn = NULL; - -static void -empty_cachetable (void) -// Make all the cachetable entries clean. -// Brute force it by closing and reopening everything. -{ - int r; - r = db->close(db, 0); CKERR(r); - r = env->close(env, 0); CKERR(r); - r = db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB - r = env->set_cachesize(env, 0, 10000000, 1); CKERR(r); -#endif - r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); - r = db_create(&db, env, 0); CKERR(r); - r = db->open(db, null_txn, "main", 0, DB_BTREE, 0, 0666); CKERR(r); -} - -static void -do_insert_delete_fifo (void) -{ - int r; - toku_os_recursive_delete(TOKU_TEST_FILENAME); - toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); - - r = db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB - r = env->set_cachesize(env, 0, 10000000, 1); CKERR(r); -#endif - r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); - r = db_create(&db, env, 0); CKERR(r); - r = db->set_pagesize(db, 4096); CKERR(r); - r = db->open(db, null_txn, "main", 0, DB_BTREE, DB_CREATE, 0666); CKERR(r); - { - uint64_t i; - uint64_t n_deleted = 0; - uint64_t N=20000; // total number to insert - uint64_t M= 5000; // size of rolling fifo - uint64_t D= 200; // number to delete at once - for (i=0; i<N; i++) { - { - char k[100],v[100]; - int keylen = snprintf(k, sizeof k, "%016" PRIu64 "key", i); - uint32_t rand1 = myrandom(); - uint32_t rand2 = myrandom(); - uint32_t rand3 = myrandom(); - int vallen = snprintf(v, sizeof v, "%016" PRIu64 "val%08x%08x%08x", i, rand1, rand2, rand3); - DBT kt, vt; - r = db->put(db, null_txn, dbt_init(&kt, k, keylen) , dbt_init(&vt, v, vallen), 0); CKERR(r); - } - if (i%D==0) { - // Once every D steps, delete everything until there are only M things left. - // Flush the data down the tree for all the values we will do - { - uint64_t peek_here = n_deleted; - while (peek_here + M < i) { - char k[100]; - int keylen = snprintf(k, sizeof k, "%016" PRIu64 "key", peek_here); - DBT kt; - DBT vt; - memset(&vt, 0, sizeof(vt)); - vt.flags = DB_DBT_MALLOC; - r = db->get(db, null_txn, dbt_init(&kt, k, keylen), &vt, 0); CKERR(r); - peek_here++; - toku_free(vt.data); - } - } - empty_cachetable(); - while (n_deleted + M < i) { - char k[100]; - int keylen = snprintf(k, sizeof k, "%016" PRIu64 "key", n_deleted); - DBT kt; - r = db->del(db, null_txn, dbt_init(&kt, k, keylen), 0); - if (r!=0) printf("error %d %s", r, db_strerror(r)); - CKERR(r); - n_deleted++; - empty_cachetable(); - } - } - } - } - r = db->close(db, 0); CKERR(r); - r = env->close(env, 0); CKERR(r); -} - -int -test_main (int argc, char *const argv[]) -{ - parse_args(argc, argv); - do_insert_delete_fifo(); - return 0; -} - diff --git a/storage/tokudb/ft-index/src/tests/test1753.cc b/storage/tokudb/ft-index/src/tests/test1753.cc index 1eee0977f06..d4d09ecaf79 100644 --- a/storage/tokudb/ft-index/src/tests/test1753.cc +++ b/storage/tokudb/ft-index/src/tests/test1753.cc @@ -99,10 +99,6 @@ DB_TXN *null_txn=0; static void do_test1753 (int do_create_on_reopen) { - if (IS_TDB==0 && DB_VERSION_MAJOR==4 && DB_VERSION_MINOR<7 && do_create_on_reopen==0) { - return; // do_create_on_reopen==0 segfaults in 4.6 - } - int r; toku_os_recursive_delete(TOKU_TEST_FILENAME); toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); diff --git a/storage/tokudb/ft-index/src/tests/test1842.cc b/storage/tokudb/ft-index/src/tests/test1842.cc index f5fccfb54bc..43702da5694 100644 --- a/storage/tokudb/ft-index/src/tests/test1842.cc +++ b/storage/tokudb/ft-index/src/tests/test1842.cc @@ -137,9 +137,7 @@ setup_db (uint32_t dup_mode) { toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); r = db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB r = env->set_default_bt_compare(env, int_dbt_cmp); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_LOCK | DB_INIT_TXN | DB_PRIVATE | DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); @@ -148,9 +146,6 @@ setup_db (uint32_t dup_mode) { r = env->txn_begin(env, 0, &txn, 0); CKERR(r); r = db_create(&db, env, 0); CKERR(r); -#ifndef TOKUDB - r=db->set_bt_compare(db, int_dbt_cmp); CKERR(r); -#endif r = db->set_flags(db, dup_mode); assert(r == 0); CKERR(r); r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = txn->commit(txn, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test3039.cc b/storage/tokudb/ft-index/src/tests/test3039.cc index e944eb0cd00..aaaeebc7c36 100644 --- a/storage/tokudb/ft-index/src/tests/test3039.cc +++ b/storage/tokudb/ft-index/src/tests/test3039.cc @@ -112,11 +112,7 @@ static DB_ENV *env = NULL; static DB *db; // BDB cannot handle big transactions by default (runs out of locks). -#ifdef TOKUDB #define N_PER_XACTION 10000 -#else -#define N_PER_XACTION 1000 -#endif static void create_db (uint64_t N) { n_rows = N; @@ -124,9 +120,7 @@ static void create_db (uint64_t N) { toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); { int r = db_env_create(&env, 0); CKERR(r); } env->set_errfile(env, stderr); -#ifdef TOKUDB env->set_redzone(env, 0); -#endif { int r = env->set_cachesize(env, 0, 400*4096, 1); CKERR(r); } { int r = env->open(env, TOKU_TEST_FILENAME, envflags, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); } DB_TXN *txn; diff --git a/storage/tokudb/ft-index/src/tests/test3219.cc b/storage/tokudb/ft-index/src/tests/test3219.cc index 523b3548271..95bff0f445d 100644 --- a/storage/tokudb/ft-index/src/tests/test3219.cc +++ b/storage/tokudb/ft-index/src/tests/test3219.cc @@ -92,7 +92,7 @@ PATENT RIGHTS GRANT: // This test, when run under helgrind, should detect the race problem documented in #3219. // The test: // checkpointing runs (in one thread) -// another thread does a brt lookup. +// another thread does an ft lookup. // We expect to see a lock-acquisition error. diff --git a/storage/tokudb/ft-index/src/tests/test4573-logtrim.cc b/storage/tokudb/ft-index/src/tests/test4573-logtrim.cc index a7a121b5d9e..a439f886103 100644 --- a/storage/tokudb/ft-index/src/tests/test4573-logtrim.cc +++ b/storage/tokudb/ft-index/src/tests/test4573-logtrim.cc @@ -92,7 +92,7 @@ PATENT RIGHTS GRANT: const int envflags = DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_RECOVER; -const int my_lg_max = IS_TDB ? 100 : (4096*2); +const int my_lg_max = 100; int test_main (int UU(argc), char UU(*const argv[])) { int r; diff --git a/storage/tokudb/ft-index/src/tests/test5092.cc b/storage/tokudb/ft-index/src/tests/test5092.cc index 5cfc0557496..6572c4df246 100644 --- a/storage/tokudb/ft-index/src/tests/test5092.cc +++ b/storage/tokudb/ft-index/src/tests/test5092.cc @@ -103,9 +103,7 @@ static void clean_env (const char *envdir) { static void setup_env (DB_ENV **envp, const char *envdir) { { int chk_r = db_env_create(envp, 0); CKERR(chk_r); } (*envp)->set_errfile(*envp, stderr); -#ifdef TOKUDB { int chk_r = (*envp)->set_redzone(*envp, 0); CKERR(chk_r); } -#endif { int chk_r = (*envp)->open(*envp, envdir, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(chk_r); } } diff --git a/storage/tokudb/ft-index/src/tests/test938.cc b/storage/tokudb/ft-index/src/tests/test938.cc index 5f7af0b618e..bb4b9464a2d 100644 --- a/storage/tokudb/ft-index/src/tests/test938.cc +++ b/storage/tokudb/ft-index/src/tests/test938.cc @@ -215,9 +215,7 @@ test_main(int argc, char *const argv[]) { DB_TXN *txn; { r = db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB r = env->set_redzone(env, 0); CKERR(r); -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); env->set_errfile(env, stderr); r=env->txn_begin(env, 0, &txn, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test938c.cc b/storage/tokudb/ft-index/src/tests/test938c.cc index 6d3d0a6b6e6..f3914ccb302 100644 --- a/storage/tokudb/ft-index/src/tests/test938c.cc +++ b/storage/tokudb/ft-index/src/tests/test938c.cc @@ -153,9 +153,7 @@ test_main(int argc, char *const argv[]) { DB_TXN *txn; { r = db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB r = env->set_redzone(env, 0); CKERR(r); -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); env->set_errfile(env, stderr); r=env->txn_begin(env, 0, &txn, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test_abort1.cc b/storage/tokudb/ft-index/src/tests/test_abort1.cc index 456f5811b73..27f5d68348c 100644 --- a/storage/tokudb/ft-index/src/tests/test_abort1.cc +++ b/storage/tokudb/ft-index/src/tests/test_abort1.cc @@ -113,20 +113,6 @@ test_db_open_aborts (void) { r=db_env_create(&env, 0); assert(r==0); r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_PRIVATE|DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); -#if 0 - { - DB_TXN *tid; - r=env->txn_begin(env, 0, &tid, 0); assert(r==0); - r=db->open(db, tid, "foo.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); - r=tid->abort(tid); assert(r==0); - } - { - toku_struct_stat buf; - r=toku_stat(ENVDIR "/foo.db", &buf); - assert(r!=0); - assert(errno==ENOENT); - } -#endif { DB_TXN *tid; r=env->txn_begin(env, 0, &tid, 0); assert(r==0); @@ -142,7 +128,6 @@ test_db_open_aborts (void) { r=tid->abort(tid); assert(r==0); } { -#if USE_TDB { DBT dname; DBT iname; @@ -152,7 +137,6 @@ test_db_open_aborts (void) { r = env->get_iname(env, &dname, &iname); CKERR2(r, DB_NOTFOUND); } -#endif toku_struct_stat statbuf; char filename[TOKU_PATH_MAX+1]; r = toku_stat(toku_path_join(filename, 2, TOKU_TEST_FILENAME, "foo.db"), &statbuf); @@ -209,7 +193,6 @@ test_db_put_aborts (void) { // The database should exist { char *filename; -#if USE_TDB { DBT dname; DBT iname; @@ -221,9 +204,6 @@ test_db_put_aborts (void) { CAST_FROM_VOIDP(filename, iname.data); assert(filename); } -#else - filename = toku_xstrdup("foo.db"); -#endif toku_struct_stat statbuf; char fullfile[TOKU_PATH_MAX+1]; r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, filename), &statbuf); diff --git a/storage/tokudb/ft-index/src/tests/test_abort2.cc b/storage/tokudb/ft-index/src/tests/test_abort2.cc index 6c63717a99d..e8beb73dcf2 100644 --- a/storage/tokudb/ft-index/src/tests/test_abort2.cc +++ b/storage/tokudb/ft-index/src/tests/test_abort2.cc @@ -149,13 +149,6 @@ do_test_abort2 (void) { r=db_create(&db, env, 0); CKERR(r); r=env->txn_begin(env, 0, &txn, 0); CKERR(r); r=db->open(db, txn, "foo.db", 0, DB_BTREE, 0, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); -#ifndef TOKUDB - { - uint32_t ps; - r=db->get_pagesize(db, &ps); CKERR(r); - assert(ps==4096); - } -#endif r=txn->commit(txn, 0); assert(r==0); r=env->txn_begin(env, 0, &txn, 0); assert(r==0); diff --git a/storage/tokudb/ft-index/src/tests/test_abort3.cc b/storage/tokudb/ft-index/src/tests/test_abort3.cc index 05f810efe45..705ae5cfce2 100644 --- a/storage/tokudb/ft-index/src/tests/test_abort3.cc +++ b/storage/tokudb/ft-index/src/tests/test_abort3.cc @@ -120,11 +120,7 @@ static void op_delete (int i) { int r = db->del(db, txn, dbt_init(&key, hello, strlen(hello)+1), DB_DELETE_ANY); -#ifdef TOKUDB assert(r==0); -#else - assert(r==DB_NOTFOUND || r==0); -#endif } static void lookup (int i, int expect, int expectj) { diff --git a/storage/tokudb/ft-index/src/tests/test_abort4.cc b/storage/tokudb/ft-index/src/tests/test_abort4.cc index 73b82d78c40..0d575c78b12 100644 --- a/storage/tokudb/ft-index/src/tests/test_abort4.cc +++ b/storage/tokudb/ft-index/src/tests/test_abort4.cc @@ -200,7 +200,6 @@ verify_and_tear_down(int close_first) { int r; { char *filename; -#if USE_TDB { DBT dname; DBT iname; @@ -212,9 +211,6 @@ verify_and_tear_down(int close_first) { CAST_FROM_VOIDP(filename, iname.data); assert(filename); } -#else - filename = toku_xstrdup("foo.db"); -#endif toku_struct_stat statbuf; char fullfile[TOKU_PATH_MAX+1]; r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, filename), &statbuf); diff --git a/storage/tokudb/ft-index/src/tests/test_abort5.cc b/storage/tokudb/ft-index/src/tests/test_abort5.cc index d8837238dd3..803e0c4fa22 100644 --- a/storage/tokudb/ft-index/src/tests/test_abort5.cc +++ b/storage/tokudb/ft-index/src/tests/test_abort5.cc @@ -231,7 +231,6 @@ verify_and_tear_down(int close_first) { int r; { char *filename; -#if USE_TDB { DBT dname; DBT iname; @@ -243,9 +242,6 @@ verify_and_tear_down(int close_first) { CAST_FROM_VOIDP(filename, iname.data); assert(filename); } -#else - filename = toku_xstrdup("foo.db"); -#endif toku_struct_stat statbuf; char fullfile[TOKU_PATH_MAX+1]; r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, filename), &statbuf); diff --git a/storage/tokudb/ft-index/src/tests/test_abort_delete_first.cc b/storage/tokudb/ft-index/src/tests/test_abort_delete_first.cc index 721414c90dd..ff55cb2e3ae 100644 --- a/storage/tokudb/ft-index/src/tests/test_abort_delete_first.cc +++ b/storage/tokudb/ft-index/src/tests/test_abort_delete_first.cc @@ -205,12 +205,12 @@ do_abort_delete_first_or_last(int N, r=db->close(db, 0); CKERR(r); r=env->close(env, 0); CKERR(r); -#if defined(TOKUDB) && defined(__unix__) - char cmd[sizeof("../../utils/tokudb_dump -h foo.db >") + 2 * TOKU_PATH_MAX]; - snprintf(cmd, sizeof(cmd), "../../utils/tokudb_dump -h %s foo.db > %s", TOKU_TEST_FILENAME, DEV_NULL_FILE); + + // Oh man, this is gross. + char cmd[sizeof("../../tools/tokudb_dump -h foo.db >") + 2 * TOKU_PATH_MAX]; + snprintf(cmd, sizeof(cmd), "../../tools/tokudb_dump -h %s foo.db > %s", TOKU_TEST_FILENAME, DEV_NULL_FILE); r=system(cmd); CKERR(r); -#endif } int diff --git a/storage/tokudb/ft-index/src/tests/test_archive1.cc b/storage/tokudb/ft-index/src/tests/test_archive1.cc index 1a6f521854f..8aa045b061e 100644 --- a/storage/tokudb/ft-index/src/tests/test_archive1.cc +++ b/storage/tokudb/ft-index/src/tests/test_archive1.cc @@ -135,14 +135,7 @@ test_main (int argc, char *const argv[]) { CKERR(r); //this test no longer produces a list with any entries for TDB // - txn_checkpoint trims unused logfiles -#if IS_TDB assert(list == 0); -#else - assert(list); - assert(list[0]); - if (verbose) printf("file[0]=%s\n", list[0]); - toku_free(list); -#endif } r=db->close(db, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test_blobs_leaf_split.cc b/storage/tokudb/ft-index/src/tests/test_blobs_leaf_split.cc index dca73400644..e567e4d58a8 100644 --- a/storage/tokudb/ft-index/src/tests/test_blobs_leaf_split.cc +++ b/storage/tokudb/ft-index/src/tests/test_blobs_leaf_split.cc @@ -112,11 +112,7 @@ static void insert(DB *db, DB_TXN *txn, int k, int val_size) { } int test_main(int argc, char * const argv[]) { -#if defined(TOKUDB) const char *db_env_dir = "dir.blobs.leafsplit.env.tdb"; -#else - const char *db_env_dir = "dir.blobs.leafsplit.env.bdb"; -#endif int db_env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL | DB_INIT_TXN | DB_INIT_LOCK | DB_INIT_LOG; const char *db_filename = "blobs.db"; int do_txn = 1; diff --git a/storage/tokudb/ft-index/src/tests/test_cachesize.cc b/storage/tokudb/ft-index/src/tests/test_cachesize.cc index 2c3357b584b..2af678ff53a 100644 --- a/storage/tokudb/ft-index/src/tests/test_cachesize.cc +++ b/storage/tokudb/ft-index/src/tests/test_cachesize.cc @@ -101,10 +101,6 @@ PATENT RIGHTS GRANT: static uint64_t size_from (uint32_t gbytes, uint32_t bytes) { -#ifdef USE_BDB - if (sizeof (intptr_t) == 4 && gbytes == 4 && bytes == 0) - return 0xffffffff; -#endif return ((uint64_t)gbytes << 30) + bytes; } @@ -119,11 +115,6 @@ expect_le (uint64_t a, uint32_t gbytes, uint32_t bytes) { uint64_t b = size_from(gbytes, bytes); if (a != b && verbose) printf("WARNING: expect %" PRIu64 " got %" PRIu64 "\n", a, b); -#ifdef USE_BDB - if (a > b) { - assert(a == 4ULL<<30 && b == a-1); return; - } -#endif assert(a <= b); } diff --git a/storage/tokudb/ft-index/src/tests/test_cursor_delete2.cc b/storage/tokudb/ft-index/src/tests/test_cursor_delete2.cc index bb326c80fc5..73a7182e2fd 100644 --- a/storage/tokudb/ft-index/src/tests/test_cursor_delete2.cc +++ b/storage/tokudb/ft-index/src/tests/test_cursor_delete2.cc @@ -125,7 +125,7 @@ test_cursor_delete2 (void) { r = txn->commit(txn, 0); CKERR(r); r = dbenv->txn_begin(dbenv, 0, &txn, 0); CKERR(r); - r = db->del(db, txn, dbt_init(&key, "a", 2), DB_DELETE_ANY); CKERR_depending(r,0,DB_NOTFOUND); + r = db->del(db, txn, dbt_init(&key, "a", 2), DB_DELETE_ANY); CKERR(r); r = txn->commit(txn, 0); CKERR(r); r = dbenv->txn_begin(dbenv, 0, &txn, 0); CKERR(r); @@ -139,7 +139,7 @@ test_cursor_delete2 (void) { r = dbenv->txn_begin(dbenv, 0, &txn, 0); CKERR(r); r = db->del(db, txn, dbt_init(&key, "a", 2), 0); CKERR(r); - r = db->del(db, txn, dbt_init(&key, "a", 2), DB_DELETE_ANY); CKERR_depending(r,0,DB_NOTFOUND); + r = db->del(db, txn, dbt_init(&key, "a", 2), DB_DELETE_ANY); CKERR(r); r = txn->commit(txn, 0); CKERR(r); r = db->close(db, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test_db_dbt_mem_behavior.cc b/storage/tokudb/ft-index/src/tests/test_db_dbt_mem_behavior.cc index 36ff6ca45eb..eb5d7f87893 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_dbt_mem_behavior.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_dbt_mem_behavior.cc @@ -223,14 +223,12 @@ test_main(int argc, char *const argv[]) { assert(!was_truncated); bool ulen_should_change = false; -#if defined(USE_TDB) if (flags[j] == DB_DBT_REALLOC) { ulen_should_change = (bool)(old_ulen < sizeof(DATA)); } else if (flags[j] == DB_DBT_MALLOC) { ulen_should_change = (bool)(old_ulen != sizeof(DATA)*2); } -#endif assert(ulen_should_change == (bool)ulen_changed); assert(size_full); assert(doclone == !small_buffer); diff --git a/storage/tokudb/ft-index/src/tests/test_db_delete.cc b/storage/tokudb/ft-index/src/tests/test_db_delete.cc index 8b4337bae85..66fc506d44b 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_delete.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_delete.cc @@ -136,9 +136,7 @@ test_db_delete (int n, int dup_mode) { /* create the dup database file */ DB_ENV *env; r = db_env_create(&env, 0); assert(r == 0); -#ifdef TOKUDB r = env->set_redzone(env, 0); assert(r == 0); -#endif r = env->open(env, TOKU_TEST_FILENAME, DB_CREATE+DB_PRIVATE+DB_INIT_MPOOL, 0); assert(r == 0); DB *db; @@ -179,16 +177,7 @@ test_db_delete (int n, int dup_mode) { } expect_db_del(db, htonl(n), 0, DB_NOTFOUND); -#if defined(USE_TDB) expect_db_del(db, htonl(n), DB_DELETE_ANY, 0); -#endif -#if defined(USE_BDB) && defined(DB_DELETE_ANY) - #if DB_DELETE_ANY == 0 - expect_db_del(db, htonl(n), DB_DELETE_ANY, DB_NOTFOUND); - #else - expect_db_del(db, htonl(n), DB_DELETE_ANY, EINVAL); - #endif -#endif r = db->close(db, 0); assert(r == 0); r = env->close(env, 0); assert(r == 0); @@ -208,9 +197,7 @@ test_db_get_datasize0 (void) { /* create the dup database file */ DB_ENV *env; r = db_env_create(&env, 0); assert(r == 0); -#ifdef TOKUDB r = env->set_redzone(env, 0); assert(r == 0); -#endif r = env->open(env, TOKU_TEST_FILENAME, DB_CREATE+DB_PRIVATE+DB_INIT_MPOOL, 0); assert(r == 0); DB *db; diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_open_nocreate.cc b/storage/tokudb/ft-index/src/tests/test_db_env_open_nocreate.cc index be3deef6c6d..a690a4f33a9 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_env_open_nocreate.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_env_open_nocreate.cc @@ -117,11 +117,7 @@ test_main(int argc, char *const argv[]) { int do_private; for (do_private=0; do_private<2; do_private++) { -#ifdef USE_TDB if (do_private==0) continue; // See #208. -#else - if (do_private==1) continue; // See #530. BDB 4.6.21 segfaults if DB_PRIVATE is passed when no environment previously exists. -#endif int private_flags = do_private ? (DB_CREATE|DB_PRIVATE) : 0; toku_os_recursive_delete(TOKU_TEST_FILENAME); @@ -136,37 +132,12 @@ test_main(int argc, char *const argv[]) { r = db_env_create(&dbenv, 0); CKERR(r); r = dbenv->open(dbenv, TOKU_TEST_FILENAME, private_flags|DB_INIT_MPOOL, 0); -#ifdef USE_TDB // TokuDB has no trouble opening an environment if the directory exists. CKERR(r); assert(r==0); -#else - if (r!=ENOENT) printf("%s:%d %d: %s\n", __FILE__, __LINE__, r,db_strerror(r)); - assert(r==ENOENT); -#endif dbenv->close(dbenv,0); // free memory } -#ifndef USE_TDB - // Now make sure that if we have a non-private DB that we can tell if it opened or not. - DB *db; - toku_os_recursive_delete(TOKU_TEST_FILENAME); - toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); - r = db_env_create(&dbenv, 0); - CKERR(r); - r = dbenv->open(dbenv, TOKU_TEST_FILENAME, DB_CREATE|DB_INIT_MPOOL, 0); - CKERR(r); - r=db_create(&db, dbenv, 0); - CKERR(r); - db->close(db, 0); - dbenv->close(dbenv,0); // free memory - r = db_env_create(&dbenv, 0); - CKERR(r); - r = dbenv->open(dbenv, TOKU_TEST_FILENAME, DB_INIT_MPOOL, 0); - CKERR(r); - dbenv->close(dbenv,0); // free memory -#endif - return 0; } diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_open_open_close.cc b/storage/tokudb/ft-index/src/tests/test_db_env_open_open_close.cc index 58030826b30..d9336a8b48e 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_env_open_open_close.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_env_open_open_close.cc @@ -117,18 +117,7 @@ test_main(int argc, char*const* argv) { r = dbenv->open(dbenv, TOKU_TEST_FILENAME, DB_CREATE|DB_INIT_MPOOL|DB_PRIVATE, 0666); if (verbose) printf("r=%d\n", r); -#ifdef USE_TDB assert(r == EINVAL); -#elif USE_BDB -#if DB_VERSION_MAJOR >= 5 - assert(r == EINVAL); -#else - if (verbose) printf("test_db_env_open_open_close.bdb skipped. (BDB apparently does not follow the spec).\n"); - assert(r == 0); -#endif -#else -#error -#endif r = dbenv->close(dbenv, 0); assert(r == 0); diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_set_lg_dir.cc b/storage/tokudb/ft-index/src/tests/test_db_env_set_lg_dir.cc index bdc1b6ef91a..ffdaf5cb833 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_env_set_lg_dir.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_env_set_lg_dir.cc @@ -121,13 +121,8 @@ test_main(int argc, char *const argv[]) { r = dbenv->open(dbenv, TOKU_TEST_FILENAME, DB_INIT_TXN|DB_INIT_LOG|DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL, 0); CKERR(r); -#ifdef USE_TDB - // According to the BDB man page, you may not call set_lg_dir after doing the open. - // Some versions of BDB don't actually check this or complain r = dbenv->set_lg_dir(dbenv, "."); assert(r == EINVAL); -#endif - r = dbenv->close(dbenv, 0); assert(r == 0); diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_set_tmp_dir.cc b/storage/tokudb/ft-index/src/tests/test_db_env_set_tmp_dir.cc index f9e47e7add0..150b0b29049 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_env_set_tmp_dir.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_env_set_tmp_dir.cc @@ -121,13 +121,8 @@ test_main(int argc, char *const argv[]) { r = dbenv->open(dbenv, TOKU_TEST_FILENAME, DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL, 0); CKERR(r); -#ifdef USE_TDB - // According to the BDB man page, you may not call set_tmp_dir after doing the open. - // Some versions of BDB don't actually check this or complain r = dbenv->set_tmp_dir(dbenv, "."); assert(r == EINVAL); -#endif - r = dbenv->close(dbenv, 0); assert(r == 0); diff --git a/storage/tokudb/ft-index/src/tests/test_db_env_strdup_null.cc b/storage/tokudb/ft-index/src/tests/test_db_env_strdup_null.cc index aa9d50c424f..1f65f7a54ed 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_env_strdup_null.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_env_strdup_null.cc @@ -108,13 +108,10 @@ test_main (int UU(argc), char UU(*const argv[])) { toku_os_recursive_delete(TOKU_TEST_FILENAME); r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); r=db_env_create(&env, 0); assert(r==0); -// None of this stuff works with BDB. TDB does more error checking. -#ifdef USE_TDB r=env->set_data_dir(env, NULL); assert(r==EINVAL); r=env->open(env, TOKU_TEST_FILENAME, DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); env->set_errpfx(env, NULL); assert(1); //Did not crash. r=env->set_tmp_dir(env, NULL); assert(r==EINVAL); -#endif r=env->close(env, 0); assert(r==0); return 0; } diff --git a/storage/tokudb/ft-index/src/tests/test_db_get_put_flags.cc b/storage/tokudb/ft-index/src/tests/test_db_get_put_flags.cc index 328436b4cd3..bb5403732b5 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_get_put_flags.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_get_put_flags.cc @@ -136,9 +136,7 @@ setup (uint32_t flags) { toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); /* Open/create primary */ r = db_env_create(&dbenv, 0); assert(r == 0); -#ifdef USE_TDB r = dbenv->set_redzone(dbenv, 0); CKERR(r); -#endif r = dbenv->open(dbenv, TOKU_TEST_FILENAME, DB_CREATE+DB_PRIVATE+DB_INIT_MPOOL, 0); assert(r == 0); r = db_create(&dbp, dbenv, 0); CKERR(r); dbp->set_errfile(dbp,0); // Turn off those annoying errors @@ -182,13 +180,6 @@ get_bad_flags (DB* db, uint32_t flags, int r_expect, int keyint, int dataint) { assert(*(int*)data.data == dataint); } -#ifdef USE_TDB -#define EINVAL_FOR_TDB_OK_FOR_BDB EINVAL -#else -#define EINVAL_FOR_TDB_OK_FOR_BDB 0 -#endif - - PUT_TEST put_tests[] = { {0, DB_NODUPDATA, EINVAL, 0, 0}, //r_expect must change to 0, once implemented. {0, 0, 0, 0, 0}, diff --git a/storage/tokudb/ft-index/src/tests/test_db_remove.cc b/storage/tokudb/ft-index/src/tests/test_db_remove.cc index f254fbee17c..7c5009a703d 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_remove.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_remove.cc @@ -114,11 +114,7 @@ static void test_db_remove (void) { // Now remove it, while it is open. r = env->dbremove(env, NULL, fname, 0, 0); -#ifdef USE_TDB assert(r!=0); -#else - assert(r==0); -#endif r = db1->close(db1, 0); assert(r==0); r = env->close(env, 0); assert(r == 0); diff --git a/storage/tokudb/ft-index/src/tests/test_db_txn_locks_nonheaviside.cc b/storage/tokudb/ft-index/src/tests/test_db_txn_locks_nonheaviside.cc index f0eb79d5527..9451b107e1a 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_txn_locks_nonheaviside.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_txn_locks_nonheaviside.cc @@ -236,10 +236,8 @@ setup_dbs (void) { /* Open/create primary */ r = db_env_create(&dbenv, 0); CKERR(r); -#ifdef TOKUDB r = dbenv->set_default_bt_compare(dbenv, int_dbt_cmp); CKERR(r); -#endif uint32_t env_txn_flags = DB_INIT_TXN | DB_INIT_LOCK; uint32_t env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL; r = dbenv->open(dbenv, TOKU_TEST_FILENAME, env_open_flags | env_txn_flags, 0600); @@ -247,10 +245,6 @@ setup_dbs (void) { r = db_create(&db, dbenv, 0); CKERR(r); -#ifndef TOKUDB - r = db->set_bt_compare( db, int_dbt_cmp); - CKERR(r); -#endif char a; for (a = 'a'; a <= 'z'; a++) init_txn(a); @@ -665,16 +659,6 @@ test (void) { int test_main(int argc, char *const argv[]) { parse_args(argc, argv); - if (!IS_TDB) { - if (verbose) { - printf("Warning: " __FILE__" does not work in BDB.\n"); - } - } else { - test(); - /* - test_abort(0); - test_abort(DB_DUP | DB_DUPSORT); - */ - } + test(); return 0; } diff --git a/storage/tokudb/ft-index/src/tests/test_db_txn_locks_read_uncommitted.cc b/storage/tokudb/ft-index/src/tests/test_db_txn_locks_read_uncommitted.cc index 5e9a947b9e6..277fbaee8be 100644 --- a/storage/tokudb/ft-index/src/tests/test_db_txn_locks_read_uncommitted.cc +++ b/storage/tokudb/ft-index/src/tests/test_db_txn_locks_read_uncommitted.cc @@ -178,10 +178,8 @@ setup_dbs (void) { /* Open/create primary */ r = db_env_create(&dbenv, 0); CKERR(r); -#ifdef TOKUDB r = dbenv->set_default_bt_compare(dbenv, int_dbt_cmp); CKERR(r); -#endif uint32_t env_txn_flags = DB_INIT_TXN | DB_INIT_LOCK; uint32_t env_open_flags = DB_CREATE | DB_PRIVATE | DB_INIT_MPOOL; r = dbenv->open(dbenv, TOKU_TEST_FILENAME, env_open_flags | env_txn_flags, 0600); @@ -189,10 +187,6 @@ setup_dbs (void) { r = db_create(&db, dbenv, 0); CKERR(r); -#ifndef TOKUDB - r = db->set_bt_compare( db, int_dbt_cmp); - CKERR(r); -#endif char a; for (a = 'a'; a <= 'z'; a++) init_txn(a, 0); @@ -256,28 +250,9 @@ table_scan(char txn, bool success) { static void table_prelock(char txn, bool success) { int r; -#if defined USE_TDB && USE_TDB r = db->pre_acquire_table_lock(db, txns[(int)txn]); if (success) CKERR(r); else CKERR2s(r, DB_LOCK_NOTGRANTED, DB_LOCK_DEADLOCK); -#else - DBT key; - DBT data; - - assert(txns[(int)txn] && cursors[(int)txn]); - r = cursors[(int)txn]->c_get(cursors[(int)txn], - dbt_init(&key, 0, 0), - dbt_init(&data, 0, 0), - DB_FIRST | DB_RMW); - while (r==0) { - r = cursors[(int)txn]->c_get(cursors[(int)txn], - dbt_init(&key, 0, 0), - dbt_init(&data, 0, 0), - DB_NEXT | DB_RMW); - } - if (success) CKERR2(r, DB_NOTFOUND); - else CKERR2s(r, DB_LOCK_NOTGRANTED, DB_LOCK_DEADLOCK); -#endif } static void diff --git a/storage/tokudb/ft-index/src/tests/test_env_close_flags.cc b/storage/tokudb/ft-index/src/tests/test_env_close_flags.cc index b393c5e1399..50fcd3fa50a 100644 --- a/storage/tokudb/ft-index/src/tests/test_env_close_flags.cc +++ b/storage/tokudb/ft-index/src/tests/test_env_close_flags.cc @@ -114,12 +114,7 @@ test_main (int argc __attribute__((__unused__)), char *const argv[] __attribute r=db_env_create(&env, 0); assert(r==0); env->set_errfile(env,0); // Turn off those annoying errors r=env->close (env, 1); - //BDB does not check this in some versions -#if defined(USE_TDB) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) assert(r==EINVAL); -#else - assert(r==0); -#endif toku_os_recursive_delete(TOKU_TEST_FILENAME); r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); @@ -135,11 +130,6 @@ test_main (int argc __attribute__((__unused__)), char *const argv[] __attribute env->set_errfile(env,0); // Turn off those annoying errors r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_PRIVATE|DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=env->close (env, 1); - //BDB does not check this. -#if defined(USE_TDB) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) assert(r==EINVAL); -#else - assert(r==0); -#endif return 0; } diff --git a/storage/tokudb/ft-index/src/tests/test_env_create_db_create.cc b/storage/tokudb/ft-index/src/tests/test_env_create_db_create.cc index 0425b2191d4..8e706ebf04e 100644 --- a/storage/tokudb/ft-index/src/tests/test_env_create_db_create.cc +++ b/storage/tokudb/ft-index/src/tests/test_env_create_db_create.cc @@ -104,13 +104,7 @@ test_main (int UU(argc), char UU(*const argv[])) { r = db_env_create(&env, 0); assert(r == 0); r = db_create(&db, env, 0); -// BDB doesnt' actually barf on this case. -#ifdef USE_TDB assert(r != 0); -#else - r = db->close(db, 0); - assert(r == 0); -#endif r = env->close(env, 0); assert(r == 0); return 0; diff --git a/storage/tokudb/ft-index/src/tests/test_env_open_flags.cc b/storage/tokudb/ft-index/src/tests/test_env_open_flags.cc index 7bded023a29..8d9b147e46d 100644 --- a/storage/tokudb/ft-index/src/tests/test_env_open_flags.cc +++ b/storage/tokudb/ft-index/src/tests/test_env_open_flags.cc @@ -125,25 +125,19 @@ test_main(int argc, char *const argv[]) { toku_os_recursive_delete(TOKU_TEST_FILENAME); toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); -#ifdef USE_TDB char tracefile[TOKU_PATH_MAX+1]; toku_set_trace_file(toku_path_join(tracefile, 2, TOKU_TEST_FILENAME, "trace.tktrace")); -#endif /* test flags */ test_env_open_flags(0, ENOENT); -#ifdef TOKUDB // This one segfaults in BDB 4.6.21 test_env_open_flags(DB_PRIVATE, ENOENT); -#endif test_env_open_flags(DB_PRIVATE+DB_CREATE, 0); test_env_open_flags(DB_PRIVATE+DB_CREATE+DB_INIT_MPOOL, 0); test_env_open_flags(DB_PRIVATE+DB_RECOVER, EINVAL); test_env_open_flags(DB_PRIVATE+DB_CREATE+DB_INIT_MPOOL+DB_RECOVER, EINVAL); -#ifdef USE_TDB toku_close_trace_file(); -#endif return 0; } diff --git a/storage/tokudb/ft-index/src/tests/test_txn_abort8.cc b/storage/tokudb/ft-index/src/tests/test_equal_keys_with_different_bytes.cc index 176b5544c78..6567822c929 100644 --- a/storage/tokudb/ft-index/src/tests/test_txn_abort8.cc +++ b/storage/tokudb/ft-index/src/tests/test_equal_keys_with_different_bytes.cc @@ -30,7 +30,7 @@ COPYING CONDITIONS NOTICE: COPYRIGHT NOTICE: TokuDB, Tokutek Fractal Tree Indexing Library. - Copyright (C) 2007-2013 Tokutek, Inc. + Copyright (C) 2014 Tokutek, Inc. DISCLAIMER: @@ -86,71 +86,64 @@ PATENT RIGHTS GRANT: under this License. */ -#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." +#ident "Copyright (c) 2014 Tokutek Inc. All rights reserved." + +#include <string> + #include "test.h" -#include <stdio.h> - -#include <stdlib.h> -#include <unistd.h> -#include <memory.h> -#include <sys/stat.h> -#include <db.h> - -// -static void -test_abort_close (void) { - -#ifndef USE_TDB -#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3 - if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR); - return; -#else - toku_os_recursive_delete(TOKU_TEST_FILENAME); - toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); +static int compare_strings_case_insensitive(DB *db, const DBT *a, const DBT *b) { + invariant_notnull(db); + return strcasecmp(reinterpret_cast<char *>(a->data), + reinterpret_cast<char *>(b->data)); +} + +static void test_equal_keys_with_different_bytes(void) { int r; - DB_ENV *env; - r = db_env_create(&env, 0); assert(r == 0); - r = env->set_data_dir(env, TOKU_TEST_FILENAME); - r = env->set_lg_dir(env, TOKU_TEST_FILENAME); - env->set_errfile(env, stdout); - r = env->open(env, 0, DB_INIT_MPOOL + DB_INIT_LOG + DB_INIT_LOCK + DB_INIT_TXN + DB_PRIVATE + DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); - if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); - assert(r == 0); - DB_TXN *txn = 0; - r = env->txn_begin(env, 0, &txn, 0); assert(r == 0); + DB_ENV *env; + r = db_env_create(&env, 0); CKERR(r); + r = env->set_default_bt_compare(env, compare_strings_case_insensitive); + r = env->open(env, TOKU_TEST_FILENAME, DB_CREATE+DB_PRIVATE+DB_INIT_MPOOL+DB_INIT_TXN, 0); CKERR(r); DB *db; - r = db_create(&db, env, 0); assert(r == 0); - r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); assert(r == 0); - - { - toku_struct_stat statbuf; - char fullfile[TOKU_PATH_MAX+1]; - r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, "test.db"), &statbuf); - assert(r==0); - } - - // Close before abort. - r = db->close(db, 0); - - r = txn->abort(txn); assert(r == 0); - - r = env->close(env, 0); assert(r == 0); - - { - toku_struct_stat statbuf; - char fullfile[TOKU_PATH_MAX+1]; - r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, "test.db"), &statbuf); - assert(r!=0); - } -#endif -#endif + r = db_create(&db, env, 0); CKERR(r); + r = db->open(db, NULL, "db", NULL, DB_BTREE, DB_CREATE, 0666); CKERR(r); + + DBT key; + + // put 'key' + dbt_init(&key, "key", sizeof("key")); + r = db->put(db, NULL, &key, &key, 0); CKERR(r); + + // del 'KEY' - should match 'key' + dbt_init(&key, "KEY", sizeof("KEY")); + r = db->del(db, NULL, &key, 0); CKERR(r); + + DBT val; + char val_buf[10]; + dbt_init(&val, val_buf, sizeof(val_buf)); + + // search should fail for 'key' + dbt_init(&key, "key", sizeof("key")); + r = db->get(db, NULL, &key, &val, 0); CKERR2(r, DB_NOTFOUND); + + // search should fail for 'KEY' + dbt_init(&key, "KEY", sizeof("KEY")); + r = db->get(db, NULL, &key, &val, 0); CKERR2(r, DB_NOTFOUND); + + r = db->close(db, 0); CKERR(r); + r = env->close(env, 0); CKERR(r); } int -test_main(int UU(argc), char UU(*const argv[])) { - test_abort_close(); +test_main(int argc, char *const argv[]) { + parse_args(argc, argv); + + toku_os_recursive_delete(TOKU_TEST_FILENAME); + int r = toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); + + test_equal_keys_with_different_bytes(); + return 0; } diff --git a/storage/tokudb/ft-index/src/tests/test_groupcommit_count.cc b/storage/tokudb/ft-index/src/tests/test_groupcommit_count.cc index acf0d5f7076..c24efb5562f 100644 --- a/storage/tokudb/ft-index/src/tests/test_groupcommit_count.cc +++ b/storage/tokudb/ft-index/src/tests/test_groupcommit_count.cc @@ -101,12 +101,7 @@ DB_ENV *env; DB *db; int do_sync=1; -#ifdef TOKUDB #define NITER 100 -#else -// BDB is slow. Reduce the work. -#define NITER 25 -#endif static void *start_a_thread (void *i_p) { int *CAST_FROM_VOIDP(which_thread_p, i_p); @@ -214,12 +209,7 @@ do_test (int N) { } } -#ifdef TOKUDB int log_max_n_threads_over_10 = 3; -#else -// BDB is slow. Reduce the work. -int log_max_n_threads_over_10 = 2; -#endif static void my_parse_args (int argc, char *const argv[]) { @@ -267,9 +257,7 @@ test_main (int argc, char *const argv[]) { prev_count=0; db_env_set_func_fsync(do_fsync); -#if TOKUDB db_env_set_num_bucket_mutexes(32); -#endif toku_os_recursive_delete(env_path); { int r=toku_os_mkdir(env_path, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); } diff --git a/storage/tokudb/ft-index/src/tests/test_locktree_close.cc b/storage/tokudb/ft-index/src/tests/test_locktree_close.cc index f3d220059b6..10efefd0b62 100644 --- a/storage/tokudb/ft-index/src/tests/test_locktree_close.cc +++ b/storage/tokudb/ft-index/src/tests/test_locktree_close.cc @@ -106,7 +106,7 @@ test_cursor (void) { DB_ENV * env; DB *db; DB_TXN * const null_txn = 0; - const char * const fname = "test.cursor.brt"; + const char * const fname = "test.cursor.ft"; int r; /* create the dup database file */ diff --git a/storage/tokudb/ft-index/src/tests/test_log1.cc b/storage/tokudb/ft-index/src/tests/test_log1.cc index 11e402d7be9..3c03249c845 100644 --- a/storage/tokudb/ft-index/src/tests/test_log1.cc +++ b/storage/tokudb/ft-index/src/tests/test_log1.cc @@ -123,7 +123,6 @@ static void make_db (bool close_env) { CKERR(r); } char *filename; -#if USE_TDB { DBT dname; DBT iname; @@ -135,10 +134,6 @@ static void make_db (bool close_env) { CAST_FROM_VOIDP(filename, iname.data); assert(filename); } -#else - filename = toku_xstrdup("foo.db"); -#endif - r=tid->commit(tid, 0); assert(r==0); r=db->close(db, 0); assert(r==0); diff --git a/storage/tokudb/ft-index/src/tests/test_log10.cc b/storage/tokudb/ft-index/src/tests/test_log10.cc index 48535f1871a..599eb16d3ae 100644 --- a/storage/tokudb/ft-index/src/tests/test_log10.cc +++ b/storage/tokudb/ft-index/src/tests/test_log10.cc @@ -120,9 +120,7 @@ static void insert_some (int outeri, bool close_env) { DB *db; DB_TXN *tid; r=db_env_create(&env, 0); assert(r==0); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|create_flag, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); @@ -148,13 +146,6 @@ static void insert_some (int outeri, bool close_env) { key.data = hello; key.size=strlen(hello)+1; data.data = there; data.size=strlen(there)+1; r=db->put(db, tid, &key, &data, 0); CKERR(r); -#ifndef TOKUDB - // BDB cannot handle such a big txn. - if (i%1000==999) { - r=tid->commit(tid, 0); assert(r==0); - r=env->txn_begin(env, 0, &tid, 0); assert(r==0); - } -#endif } r=tid->commit(tid, 0); assert(r==0); r=db->close(db, 0); assert(r==0); @@ -173,9 +164,7 @@ static void make_db (bool close_env) { toku_os_recursive_delete(TOKU_TEST_FILENAME); r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); r=db_env_create(&env, 0); assert(r==0); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test_log1_abort.cc b/storage/tokudb/ft-index/src/tests/test_log1_abort.cc index 4cc37daec28..f1f8269239e 100644 --- a/storage/tokudb/ft-index/src/tests/test_log1_abort.cc +++ b/storage/tokudb/ft-index/src/tests/test_log1_abort.cc @@ -129,15 +129,7 @@ test_main (int UU(argc), char UU(*const argv[])) { r=tid->abort(tid); assert(r==0); r=env->close(env, 0); -#ifdef USE_BDB -#if DB_VERSION_MAJOR >= 5 assert(r==0); -#else - assert(r==ENOENT); -#endif -#else - assert(r==0); -#endif { toku_struct_stat statbuf; char filename[TOKU_PATH_MAX+1]; diff --git a/storage/tokudb/ft-index/src/tests/test_log7.cc b/storage/tokudb/ft-index/src/tests/test_log7.cc index cc38ae92ae3..ca5eb168028 100644 --- a/storage/tokudb/ft-index/src/tests/test_log7.cc +++ b/storage/tokudb/ft-index/src/tests/test_log7.cc @@ -122,9 +122,6 @@ static void make_db (bool close_env) { toku_os_recursive_delete(TOKU_TEST_FILENAME); r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); r=db_env_create(&env, 0); assert(r==0); -#ifdef TOKUDB - -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); r=env->txn_begin(env, 0, &tid, 0); assert(r==0); @@ -147,13 +144,11 @@ static void make_db (bool close_env) { key.data = hello; key.size=strlen(hello)+1; data.data = there; data.size=strlen(there)+1; r=db->put(db, tid, &key, &data, 0); assert(r==0); -#ifndef TOKUDB // BDB cannot handle this huge transaction even with a lot of locks. if (i%1000==599) { r=tid->commit(tid, 0); assert(r==0); r=env->txn_begin(env, 0, &tid, 0); assert(r==0); } -#endif } r=tid->commit(tid, 0); assert(r==0); r=db->close(db, 0); assert(r==0); diff --git a/storage/tokudb/ft-index/src/tests/test_log8.cc b/storage/tokudb/ft-index/src/tests/test_log8.cc index a2c59400013..bf6cad4c66b 100644 --- a/storage/tokudb/ft-index/src/tests/test_log8.cc +++ b/storage/tokudb/ft-index/src/tests/test_log8.cc @@ -119,9 +119,7 @@ static void insert_some (int outeri, bool close_env) { DB *db; DB_TXN *tid; r=db_env_create(&env, 0); assert(r==0); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|create_flag, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); @@ -166,9 +164,7 @@ static void make_db (bool close_env) { toku_os_recursive_delete(TOKU_TEST_FILENAME); r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); r=db_env_create(&env, 0); assert(r==0); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test_log9.cc b/storage/tokudb/ft-index/src/tests/test_log9.cc index c61312f90d2..302eaefb976 100644 --- a/storage/tokudb/ft-index/src/tests/test_log9.cc +++ b/storage/tokudb/ft-index/src/tests/test_log9.cc @@ -119,9 +119,7 @@ static void insert_some (int outeri, bool close_env) { DB *db; DB_TXN *tid; r=db_env_create(&env, 0); assert(r==0); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|create_flag, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); @@ -165,9 +163,7 @@ static void make_db (bool close_env) { toku_os_recursive_delete(TOKU_TEST_FILENAME); r=toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); r=db_env_create(&env, 0); assert(r==0); -#if IS_TDB db_env_enable_engine_status(0); // disable engine status on crash because test is expected to fail -#endif r=env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r=db_create(&db, env, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test_logflush.cc b/storage/tokudb/ft-index/src/tests/test_logflush.cc index f7870bee5ce..0c813d4b131 100644 --- a/storage/tokudb/ft-index/src/tests/test_logflush.cc +++ b/storage/tokudb/ft-index/src/tests/test_logflush.cc @@ -96,11 +96,7 @@ PATENT RIGHTS GRANT: // Return the offset static int grep_for_in_logs (const char *str) { -#ifdef TOKUDB #define lfname "log000000000000.tokulog[0-9]*" -#else -#define lfname "log.0000000001" -#endif #define COMMAND "grep -F -q" char lname[TOKU_PATH_MAX+1]; toku_path_join(lname, 2, TOKU_TEST_FILENAME, lfname); diff --git a/storage/tokudb/ft-index/src/tests/test_logmax.cc b/storage/tokudb/ft-index/src/tests/test_logmax.cc index 2ff773a043a..6c8b5a43ee2 100644 --- a/storage/tokudb/ft-index/src/tests/test_logmax.cc +++ b/storage/tokudb/ft-index/src/tests/test_logmax.cc @@ -152,11 +152,7 @@ test_logmax (int logmax) { int effective_max; if (logmax>0) effective_max = logmax; else { -#ifdef TOKUDB effective_max = 100<<20; -#else - effective_max = 10<<20; -#endif } r=env->txn_begin(env, 0, &tid, 0); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test_reverse_compare_fun.cc b/storage/tokudb/ft-index/src/tests/test_reverse_compare_fun.cc index 7d569c5bf97..774a78d23b1 100644 --- a/storage/tokudb/ft-index/src/tests/test_reverse_compare_fun.cc +++ b/storage/tokudb/ft-index/src/tests/test_reverse_compare_fun.cc @@ -155,10 +155,8 @@ test_reverse_compare (int n) { /* create the dup database file */ DB_ENV *env; r = db_env_create(&env, 0); assert(r == 0); -#ifdef TOKUDB r = env->set_default_bt_compare(env, reverse_compare); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, DB_CREATE+DB_PRIVATE+DB_INIT_MPOOL, 0); assert(r == 0); DB *db; @@ -166,10 +164,6 @@ test_reverse_compare (int n) { CKERR(r); r = db->set_pagesize(db, 4096); CKERR(r); -#ifndef TOKUDB - r = db->set_bt_compare(db, reverse_compare); - CKERR(r); -#endif r = db->open(db, null_txn, fname, "main", DB_BTREE, DB_CREATE, 0666); CKERR(r); @@ -192,10 +186,6 @@ test_reverse_compare (int n) { CKERR(r); r = db->set_pagesize(db, 4096); CKERR(r); -#ifndef TOKUDB - r = db->set_bt_compare(db, reverse_compare); - CKERR(r); -#endif r = db->open(db, null_txn, fname, "main", DB_BTREE, 0, 0666); CKERR(r); diff --git a/storage/tokudb/ft-index/src/tests/test_set_func_malloc.cc b/storage/tokudb/ft-index/src/tests/test_set_func_malloc.cc index eea9a913c1c..8efa786b7fd 100644 --- a/storage/tokudb/ft-index/src/tests/test_set_func_malloc.cc +++ b/storage/tokudb/ft-index/src/tests/test_set_func_malloc.cc @@ -153,7 +153,6 @@ test1 (void) db_env_set_func_realloc(brealloc); db_env_set_func_free(bfree); -#ifdef USE_TDB // toku_malloc isn't affected by calling the BDB set_fun_malloc calls. malloc_counter = realloc_counter = free_counter = 0; @@ -166,8 +165,6 @@ test1 (void) db_env_set_func_malloc(NULL); db_env_set_func_realloc(NULL); db_env_set_func_free(NULL); - -#endif } int diff --git a/storage/tokudb/ft-index/src/tests/test_txn_abort7.cc b/storage/tokudb/ft-index/src/tests/test_txn_abort7.cc index 144591ca650..8832e950310 100644 --- a/storage/tokudb/ft-index/src/tests/test_txn_abort7.cc +++ b/storage/tokudb/ft-index/src/tests/test_txn_abort7.cc @@ -119,7 +119,6 @@ test_abort_create (void) { { char *filename; -#if USE_TDB { DBT dname; DBT iname; @@ -131,9 +130,6 @@ test_abort_create (void) { CAST_FROM_VOIDP(filename, iname.data); assert(filename); } -#else - filename = toku_xstrdup("test.db"); -#endif toku_struct_stat statbuf; char fullfile[TOKU_PATH_MAX+1]; r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, filename), &statbuf); @@ -145,7 +141,6 @@ test_abort_create (void) { r = txn->abort(txn); assert(r == 0); { -#if USE_TDB { DBT dname; DBT iname; @@ -155,7 +150,6 @@ test_abort_create (void) { r = env->get_iname(env, &dname, &iname); CKERR2(r, DB_NOTFOUND); } -#endif toku_struct_stat statbuf; char fullfile[TOKU_PATH_MAX+1]; r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, "test.db"), &statbuf); diff --git a/storage/tokudb/ft-index/src/tests/test_txn_abort9.cc b/storage/tokudb/ft-index/src/tests/test_txn_abort9.cc deleted file mode 100644 index 48c4ae120e8..00000000000 --- a/storage/tokudb/ft-index/src/tests/test_txn_abort9.cc +++ /dev/null @@ -1,162 +0,0 @@ -/* -*- 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. - This software is covered by US Patent No. 8,489,638. - -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." -#include "test.h" -#include <stdio.h> - -#include <stdlib.h> -#include <unistd.h> -#include <memory.h> -#include <sys/stat.h> -#include <db.h> - -// -static void -test_abort_close (void) { - -#ifndef USE_TDB -#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3 - if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR); - return; -#else - toku_os_recursive_delete(TOKU_TEST_FILENAME); - toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); - - int r; - DB_ENV *env; - r = db_env_create(&env, 0); assert(r == 0); - r = env->set_data_dir(env, TOKU_TEST_FILENAME); - r = env->set_lg_dir(env, TOKU_TEST_FILENAME); - env->set_errfile(env, stdout); - r = env->open(env, 0, DB_INIT_MPOOL + DB_INIT_LOG + DB_INIT_LOCK + DB_INIT_TXN + DB_PRIVATE + DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); - if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); - assert(r == 0); - - DB_TXN *txn = 0; - r = env->txn_begin(env, 0, &txn, 0); assert(r == 0); - - DB *db; - r = db_create(&db, env, 0); assert(r == 0); - r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); assert(r == 0); - - { - toku_struct_stat statbuf; - char fullfile[TOKU_PATH_MAX+1]; - r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, "test.db"), &statbuf); - assert(r==0); - } - - // Close before commit. - r = db->close(db, 0); - r = txn->commit(txn, 0); CKERR(r); - - // Now reopen it - r = env->txn_begin(env, 0, &txn, 0); CKERR(r); - r = db_create(&db, env, 0); assert(r == 0); - r = db->open(db, txn, "test.db", 0, DB_BTREE, 0, S_IRWXU+S_IRWXG+S_IRWXO); assert(r == 0); - - DBT k,v; - r = db->put(db, txn, dbt_init(&k, "hello", 6), dbt_init(&v, "there", 6), 0); - CKERR(r); - - r = db->close(db, 0); - - r = txn->abort(txn); assert(r == 0); - - r = env->close(env, 0); CKERR(r); - -#endif -#endif -} - -int -test_main(int UU(argc), char UU(*const argv[])) { - test_abort_close(); - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/test_txn_commit8.cc b/storage/tokudb/ft-index/src/tests/test_txn_commit8.cc deleted file mode 100644 index 4f4d732dc8b..00000000000 --- a/storage/tokudb/ft-index/src/tests/test_txn_commit8.cc +++ /dev/null @@ -1,156 +0,0 @@ -/* -*- 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. - This software is covered by US Patent No. 8,489,638. - -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." -#include "test.h" -#include <stdio.h> - -#include <stdlib.h> -#include <unistd.h> -#include <memory.h> -#include <sys/stat.h> -#include <db.h> - -// like test_txn_abort8.c except commit -static void -test_abort_close (void) { - -#ifndef USE_TDB -#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3 - if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR); - return; -#else - toku_os_recursive_delete(TOKU_TEST_FILENAME); - toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); - - int r; - DB_ENV *env; - r = db_env_create(&env, 0); assert(r == 0); - r = env->set_data_dir(env, TOKU_TEST_FILENAME); - r = env->set_lg_dir(env, TOKU_TEST_FILENAME); - env->set_errfile(env, stdout); - r = env->open(env, 0, DB_INIT_MPOOL + DB_INIT_LOG + DB_INIT_LOCK + DB_INIT_TXN + DB_PRIVATE + DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); - if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); - assert(r == 0); - - DB_TXN *txn = 0; - r = env->txn_begin(env, 0, &txn, 0); assert(r == 0); - - DB *db; - r = db_create(&db, env, 0); assert(r == 0); - r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); assert(r == 0); - - { - toku_struct_stat statbuf; - char fullfile[TOKU_PATH_MAX+1]; - r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, "test.db"), &statbuf); - assert(r==0); - } - - // Close before commit - r = db->close(db, 0); - - r = txn->commit(txn, 0); assert(r == 0); - - r = env->close(env, 0); assert(r == 0); - - { - toku_struct_stat statbuf; - char fullfile[TOKU_PATH_MAX+1]; - r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, "test.db"), &statbuf); - assert(r==0); - } -#endif -#endif -} - -int -test_main(int UU(argc), char UU(*const argv[])) { - test_abort_close(); - return 0; -} diff --git a/storage/tokudb/ft-index/src/tests/test_txn_cursor_last.cc b/storage/tokudb/ft-index/src/tests/test_txn_cursor_last.cc index 62813ab86c3..62cb3984b79 100644 --- a/storage/tokudb/ft-index/src/tests/test_txn_cursor_last.cc +++ b/storage/tokudb/ft-index/src/tests/test_txn_cursor_last.cc @@ -291,12 +291,10 @@ test_main(int argc, char *const argv[]) { parse_args(argc, argv); - if (IS_TDB) { - test_txn_cursor_last_1(0); - test_txn_cursor_last_1(1); - test_txn_cursor_last_2(0); - test_txn_cursor_last_2(1); - } + test_txn_cursor_last_1(0); + test_txn_cursor_last_1(1); + test_txn_cursor_last_2(0); + test_txn_cursor_last_2(1); return 0; } diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested1.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested1.cc index a5ba6afdfb1..d25e7c61ce2 100644 --- a/storage/tokudb/ft-index/src/tests/test_txn_nested1.cc +++ b/storage/tokudb/ft-index/src/tests/test_txn_nested1.cc @@ -125,9 +125,7 @@ setup_db (void) { toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); r = db_env_create(&env, 0); CKERR(r); -#ifdef TOKUDB r = env->set_default_bt_compare(env, int_dbt_cmp); CKERR(r); -#endif r = env->open(env, TOKU_TEST_FILENAME, DB_INIT_MPOOL | DB_INIT_LOG | DB_INIT_LOCK | DB_INIT_TXN | DB_PRIVATE | DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); @@ -136,9 +134,6 @@ setup_db (void) { r = env->txn_begin(env, 0, &txn, 0); CKERR(r); r = db_create(&db, env, 0); CKERR(r); -#ifndef TOKUDB - r = db->set_bt_compare(db, int_dbt_cmp); CKERR(r); -#endif r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = txn->commit(txn, 0); CKERR(r); } @@ -219,74 +214,6 @@ test_txn_nesting (int depth) { } } - -#if 0 -static void -test_txn_abort (int insert, int secondnum) { - if (verbose) { fprintf(stderr, "%s (%s):%d [%d,%d]\n", __FILE__, __FUNCTION__, __LINE__, insert, secondnum); fflush(stderr); } - setup_db(); - - DBT key, val; - int r; - - - DB_TXN *parent = NULL, *child = NULL; - - int i = 1; - r = env->txn_begin(env, 0, &parent, 0); CKERR(r); - - //Insert something as a child - r = env->txn_begin(env, parent, &child, 0); CKERR(r); - i = 1; - r = db->put(db, child, dbt_init(&key, &i, sizeof i), dbt_init(&val, &i, sizeof i), 0); - CKERR(r); - r = child->commit(child,DB_TXN_NOSYNC); - child = NULL; - - - //delete it as a child - r = env->txn_begin(env, parent, &child, 0); CKERR(r); - i = secondnum; - if (insert) { - r = db->put(db, child, dbt_init(&key, &i, sizeof i), dbt_init(&val, &i, sizeof i), 0); - CKERR(r); - } - else { // delete - r = db->del(db, child, dbt_init(&key, &i, sizeof i), DB_DELETE_ANY); - if (IS_TDB) { - CKERR(r); - } else { - CKERR2(r, (secondnum==1 ? 0 : DB_NOTFOUND)); - } - } - r = child->commit(child,DB_TXN_NOSYNC); - child = NULL; - - r = parent->abort(parent); - CKERR(r); - parent = NULL; - - - { - DB_TXN *txn = NULL; - /* walk the db, should be empty */ - r = env->txn_begin(env, 0, &txn, 0); CKERR(r); - DBC *cursor; - r = db->cursor(db, txn, &cursor, 0); CKERR(r); - memset(&key, 0, sizeof key); - memset(&val, 0, sizeof val); - r = cursor->c_get(cursor, &key, &val, DB_FIRST); - CKERR2(r, DB_NOTFOUND); - r = cursor->c_close(cursor); CKERR(r); - r = txn->commit(txn, 0); - } - r=db->close(db, 0); CKERR(r); - r=env->close(env, 0); CKERR(r); - -} - -#endif - int test_main(int argc, char *const argv[]) { parse_args(argc, argv); diff --git a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort4.cc b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort4.cc index 729c5ed44dd..164f1c26d11 100644 --- a/storage/tokudb/ft-index/src/tests/test_txn_nested_abort4.cc +++ b/storage/tokudb/ft-index/src/tests/test_txn_nested_abort4.cc @@ -160,11 +160,7 @@ test_txn_abort (int insert, int secondnum) { } else { // delete r = db->del(db, child, dbt_init(&key, &i, sizeof i), DB_DELETE_ANY); - if (IS_TDB) { CKERR(r); - } else { - CKERR2(r, (secondnum==1 ? 0 : DB_NOTFOUND)); - } } r = child->commit(child,DB_TXN_NOSYNC); child = NULL; diff --git a/storage/tokudb/ft-index/src/tests/test_weakxaction.cc b/storage/tokudb/ft-index/src/tests/test_weakxaction.cc index b1ca7e19ba3..3e9e1f25234 100644 --- a/storage/tokudb/ft-index/src/tests/test_weakxaction.cc +++ b/storage/tokudb/ft-index/src/tests/test_weakxaction.cc @@ -128,9 +128,6 @@ test_autotxn (uint32_t env_flags, uint32_t db_flags) { DB_TXN *x1, *x2 = NULL; r = env->txn_begin(env, 0, &x1, DB_TXN_NOWAIT); CKERR(r); - #ifdef USE_BDB - r = env->txn_begin(env, 0, &x2, DB_TXN_NOWAIT); CKERR(r); - #endif DBT k1,k2,v1,v2; dbt_init(&k1, "hello", sizeof "hello"); dbt_init(&k2, "hello", sizeof "hello"); @@ -141,9 +138,6 @@ test_autotxn (uint32_t env_flags, uint32_t db_flags) { r = db->put(db, x1, &k1, &v1, 0); CKERR(r); r = db->get(db, x2, &k2, &v2, 0); assert(r==DB_LOCK_DEADLOCK || r==DB_LOCK_NOTGRANTED); r = x1->commit(x1, 0); CKERR(r); - #ifdef USE_BDB - r = x2->commit(x2, 0); assert(r==0); - #endif r = db->close(db, 0); CKERR(r); r = env->close(env, 0); assert(r==0); } diff --git a/storage/tokudb/ft-index/src/tests/test_txn_close_open_commit.cc b/storage/tokudb/ft-index/src/tests/time_create_db.cc index 4f5060b3871..2cc2496f33a 100644 --- a/storage/tokudb/ft-index/src/tests/test_txn_close_open_commit.cc +++ b/storage/tokudb/ft-index/src/tests/time_create_db.cc @@ -1,6 +1,6 @@ /* -*- 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: @@ -86,83 +86,90 @@ PATENT RIGHTS GRANT: under this License. */ -#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." -#include "test.h" -#include <stdio.h> +#ident "Copyright (c) 2009-2013 Tokutek Inc. All rights reserved." +#ident "$Id$" -#include <stdlib.h> -#include <unistd.h> -#include <memory.h> -#include <sys/stat.h> +#include "test.h" +#include <vector> #include <db.h> +#include "toku_time.h" -// Recreate a mysqld crash by closing and opening a db within a transaction. -// The crash occurs when writing a dirty cachetable pair, so we insert one -// row. -static void -test_txn_close_open_commit (void) { - -#ifndef USE_TDB -#if DB_VERSION_MAJOR==4 && DB_VERSION_MINOR==3 - if (verbose) fprintf(stderr, "%s does not work for BDB %d.%d. Not running\n", __FILE__, DB_VERSION_MAJOR, DB_VERSION_MINOR); - return; -#else - toku_os_recursive_delete(TOKU_TEST_FILENAME); - toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); - - int r; - DB_ENV *env; - r = db_env_create(&env, 0); assert(r == 0); - r = env->set_data_dir(env, TOKU_TEST_FILENAME); - r = env->set_lg_dir(env, TOKU_TEST_FILENAME); - env->set_errfile(env, stdout); - r = env->open(env, 0, DB_INIT_MPOOL + DB_INIT_LOG + DB_INIT_LOCK + DB_INIT_TXN + DB_PRIVATE + DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); - if (r != 0) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r)); - assert(r == 0); - - DB_TXN *txn = 0; - r = env->txn_begin(env, 0, &txn, 0); assert(r == 0); - - DB *db; - r = db_create(&db, env, 0); assert(r == 0); - r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); assert(r == 0); +static void open_dbs(DB_ENV *env, int max_dbs) { + std::vector<DB *> dbs; + uint64_t t_start = toku_current_time_microsec(); + // open db's { - toku_struct_stat statbuf; - char fullfile[TOKU_PATH_MAX+1]; - r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, "test.db"), &statbuf); - assert(r==0); + uint64_t t0 = toku_current_time_microsec(); + for (int i = 1; i <= max_dbs; i++) { + int r; + DB *db = NULL; + r = db_create(&db, env, 0); + assert(r == 0); + char db_name[32]; + sprintf(db_name, "db%d", i); + r = db->open(db, NULL, db_name, NULL, DB_BTREE, DB_CREATE, 0666); + assert(r == 0); + dbs.push_back(db); + if ((i % 100) == 0) { + uint64_t t = toku_current_time_microsec(); + fprintf(stderr, "open %d %" PRIu64 "\n", i, t - t0); + t0 = t; + } + } } + uint64_t t_end = toku_current_time_microsec(); + fprintf(stderr, "%" PRIu64 "\n", t_end - t_start); - DBT key, val; - int k = 1, v = 1; - r = db->put(db, txn, dbt_init(&key, &k, sizeof k), dbt_init(&val, &v, sizeof v), 0); - assert(r == 0); - - // Close before commit - r = db->close(db, 0); assert(r == 0); + // close db's + { + uint64_t t0 = toku_current_time_microsec(); + int i = 1; + for (std::vector<DB *>::iterator dbi = dbs.begin(); dbi != dbs.end(); dbi++, i++) { + DB *db = *dbi; + int r = db->close(db, 0); + assert(r == 0); + if ((i % 100) == 0) { + uint64_t t = toku_current_time_microsec(); + printf("close %d %" PRIu64 "\n", i, t - t0); + t0 = t; + } + } + } +} - r = db_create(&db, env, 0); assert(r == 0); - r = db->open(db, txn, "test.db", 0, DB_UNKNOWN, 0, S_IRWXU+S_IRWXG+S_IRWXO); assert(r == 0); +int test_main (int argc, char * const argv[]) { + int r; + int max_dbs = 1; + + // parse_args(argc, argv); + for (int i = 1; i < argc; i++) { + if (strcmp(argv[i], "-v") == 0) { + verbose++; + continue; + } + if (strcmp(argv[i], "-q") == 0) { + if (verbose > 0) verbose--; + continue; + } + max_dbs = atoi(argv[i]); + continue; + } - r = txn->commit(txn, 0); assert(r == 0); + toku_os_recursive_delete(TOKU_TEST_FILENAME); + r = toku_os_mkdir(TOKU_TEST_FILENAME, S_IRWXU+S_IRWXG+S_IRWXO); - r = db->close(db, 0); assert(r == 0); + DB_ENV *env = NULL; + r = db_env_create(&env, 0); + assert(r == 0); + env->set_errfile(env, stderr); + r = env->open(env, TOKU_TEST_FILENAME, DB_INIT_LOCK+DB_INIT_MPOOL+DB_INIT_TXN+DB_INIT_LOG + DB_CREATE + DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); + assert(r == 0); - r = env->close(env, 0); assert(r == 0); + open_dbs(env, max_dbs); - { - toku_struct_stat statbuf; - char fullfile[TOKU_PATH_MAX+1]; - r = toku_stat(toku_path_join(fullfile, 2, TOKU_TEST_FILENAME, "test.db"), &statbuf); - assert(r==0); - } -#endif -#endif -} + r = env->close(env, 0); + assert(r == 0); -int -test_main(int UU(argc), char UU(*const argv[])) { - test_txn_close_open_commit(); return 0; } diff --git a/storage/tokudb/ft-index/src/tests/upgrade-test-1.cc b/storage/tokudb/ft-index/src/tests/upgrade-test-1.cc index 7897f9eb2e3..ef638e3fa8c 100644 --- a/storage/tokudb/ft-index/src/tests/upgrade-test-1.cc +++ b/storage/tokudb/ft-index/src/tests/upgrade-test-1.cc @@ -117,7 +117,7 @@ char *db_v4_dir = OLDDATADIR "env_preload.4.2.0.cleanshutdown"; char *db_v4_dir_node4k = OLDDATADIR "env_preload.4.2.0.node4k.cleanshutdown"; char *db_v4_dir_flat = OLDDATADIR "env_preload.4.2.0.flat.cleanshutdown"; -// HACK: Newer versions of the database/brt to use with this old +// HACK: Newer versions of the database/ft to use with this old // upgrade test code. char *db_v6_dir = OLDDATADIR "env_preload.5.0.8.cleanshutdown"; char *db_v6_dir_node4k = OLDDATADIR "env_preload.5.0.8.node4k.cleanshutdown"; diff --git a/storage/tokudb/ft-index/src/ydb-internal.h b/storage/tokudb/ft-index/src/ydb-internal.h index f8c10975d5a..085a4dd0334 100644 --- a/storage/tokudb/ft-index/src/ydb-internal.h +++ b/storage/tokudb/ft-index/src/ydb-internal.h @@ -97,8 +97,6 @@ PATENT RIGHTS GRANT: #include <ft/fttypes.h> #include <ft/ft-ops.h> #include <ft/minicron.h> -// TODO: remove vanilla omt in favor of templated one -#include <ft/omt.h> #include <util/growable_array.h> #include <util/omt.h> @@ -152,14 +150,13 @@ struct __toku_db_env_internal { unsigned long cachetable_size; CACHETABLE cachetable; TOKULOGGER logger; - toku::locktree::manager ltm; + toku::locktree_manager ltm; lock_timeout_callback lock_wait_timeout_callback; // Called when a lock request times out waiting for a lock. DB *directory; // Maps dnames to inames DB *persistent_environment; // Stores environment settings, can be used for upgrade - // TODO: toku::omt<DB *> - OMT open_dbs_by_dname; // Stores open db handles, sorted first by dname and then by numerical value of pointer to the db (arbitrarily assigned memory location) - OMT open_dbs_by_dict_id; // Stores open db handles, sorted by dictionary id and then by numerical value of pointer to the db (arbitrarily assigned memory location) + toku::omt<DB *> *open_dbs_by_dname; // Stores open db handles, sorted first by dname and then by numerical value of pointer to the db (arbitrarily assigned memory location) + toku::omt<DB *> *open_dbs_by_dict_id; // Stores open db handles, sorted by dictionary id and then by numerical value of pointer to the db (arbitrarily assigned memory location) toku_pthread_rwlock_t open_dbs_rwlock; // rwlock that protects the OMT of open dbs. char *real_data_dir; // data dir used when the env is opened (relative to cwd, or absolute with leading /) @@ -192,7 +189,7 @@ struct __toku_db_env_internal { // test-only environment function for running lock escalation static inline void toku_env_run_lock_escalation_for_test(DB_ENV *env) { - toku::locktree::manager *mgr = &env->i->ltm; + toku::locktree_manager *mgr = &env->i->ltm; mgr->run_escalation_for_test(); } diff --git a/storage/tokudb/ft-index/src/ydb.cc b/storage/tokudb/ft-index/src/ydb.cc index d1c09f8cc10..a2bb221a40b 100644 --- a/storage/tokudb/ft-index/src/ydb.cc +++ b/storage/tokudb/ft-index/src/ydb.cc @@ -233,6 +233,7 @@ static DB_ENV * volatile most_recent_env; // most recently opened env, used fo static int env_get_iname(DB_ENV* env, DBT* dname_dbt, DBT* iname_dbt); static int toku_maybe_get_engine_status_text (char* buff, int buffsize); // for use by toku_assert +static int toku_maybe_err_engine_status (void); static void toku_maybe_set_env_panic(int code, const char * msg); // for use by toku_assert int @@ -476,7 +477,7 @@ needs_recovery (DB_ENV *env) { static int toku_env_txn_checkpoint(DB_ENV * env, uint32_t kbyte, uint32_t min, uint32_t flags); // Instruct db to use the default (built-in) key comparison function -// by setting the flag bits in the db and brt structs +// by setting the flag bits in the db and ft structs static int db_use_builtin_key_cmp(DB *db) { HANDLE_PANICKED_DB(db); @@ -852,6 +853,12 @@ env_open(DB_ENV * env, const char *home, uint32_t flags, int mode) { goto cleanup; } + if (toku_os_huge_pages_enabled()) { + r = toku_ydb_do_error(env, TOKUDB_HUGE_PAGES_ENABLED, + "Huge pages are enabled, disable them before continuing\n"); + goto cleanup; + } + most_recent_env = NULL; assert(sizeof(time_t) == sizeof(uint64_t)); @@ -1108,7 +1115,7 @@ cleanup: most_recent_env = env; uint64_t num_rows; env_get_engine_status_num_rows(env, &num_rows); - toku_assert_set_fpointers(toku_maybe_get_engine_status_text, toku_maybe_set_env_panic, num_rows); + toku_assert_set_fpointers(toku_maybe_get_engine_status_text, toku_maybe_err_engine_status, toku_maybe_set_env_panic, num_rows); } return r; } @@ -1131,7 +1138,7 @@ env_close(DB_ENV * env, uint32_t flags) { goto panic_and_quit_early; } if (env->i->open_dbs_by_dname) { //Verify that there are no open dbs. - if (toku_omt_size(env->i->open_dbs_by_dname) > 0) { + if (env->i->open_dbs_by_dname->size() > 0) { err_msg = "Cannot close environment due to open DBs\n"; r = toku_ydb_do_error(env, EINVAL, "%s", err_msg); goto panic_and_quit_early; @@ -1207,10 +1214,14 @@ env_close(DB_ENV * env, uint32_t flags) { toku_free(env->i->real_log_dir); if (env->i->real_tmp_dir) toku_free(env->i->real_tmp_dir); - if (env->i->open_dbs_by_dname) - toku_omt_destroy(&env->i->open_dbs_by_dname); - if (env->i->open_dbs_by_dict_id) - toku_omt_destroy(&env->i->open_dbs_by_dict_id); + if (env->i->open_dbs_by_dname) { + env->i->open_dbs_by_dname->destroy(); + toku_free(env->i->open_dbs_by_dname); + } + if (env->i->open_dbs_by_dict_id) { + env->i->open_dbs_by_dict_id->destroy(); + toku_free(env->i->open_dbs_by_dict_id); + } if (env->i->dir) toku_free(env->i->dir); toku_pthread_rwlock_destroy(&env->i->open_dbs_rwlock); @@ -1834,13 +1845,15 @@ fs_get_status(DB_ENV * env, fs_redzone_state * redzone_state) { // Local status struct used to get information from memory.c typedef enum { MEMORY_MALLOC_COUNT = 0, - MEMORY_FREE_COUNT, + MEMORY_FREE_COUNT, MEMORY_REALLOC_COUNT, - MEMORY_MALLOC_FAIL, - MEMORY_REALLOC_FAIL, - MEMORY_REQUESTED, - MEMORY_USED, - MEMORY_FREED, + MEMORY_MALLOC_FAIL, + MEMORY_REALLOC_FAIL, + MEMORY_REQUESTED, + MEMORY_USED, + MEMORY_FREED, + MEMORY_MAX_REQUESTED_SIZE, + MEMORY_LAST_FAILED_SIZE, MEMORY_MAX_IN_USE, MEMORY_MALLOCATOR_VERSION, MEMORY_MMAP_THRESHOLD, @@ -1868,6 +1881,8 @@ memory_status_init(void) { STATUS_INIT(MEMORY_REQUESTED, nullptr, UINT64, "number of bytes requested", TOKU_ENGINE_STATUS); STATUS_INIT(MEMORY_USED, nullptr, UINT64, "number of bytes used (requested + overhead)", TOKU_ENGINE_STATUS); STATUS_INIT(MEMORY_FREED, nullptr, UINT64, "number of bytes freed", TOKU_ENGINE_STATUS); + STATUS_INIT(MEMORY_MAX_REQUESTED_SIZE, nullptr, UINT64, "largest attempted allocation size", TOKU_ENGINE_STATUS); + STATUS_INIT(MEMORY_LAST_FAILED_SIZE, nullptr, UINT64, "size of the last failed allocation attempt", TOKU_ENGINE_STATUS); STATUS_INIT(MEMORY_MAX_IN_USE, MEM_ESTIMATED_MAXIMUM_MEMORY_FOOTPRINT, UINT64, "estimated maximum memory footprint", TOKU_ENGINE_STATUS|TOKU_GLOBAL_STATUS); STATUS_INIT(MEMORY_MALLOCATOR_VERSION, nullptr, CHARSTR, "mallocator version", TOKU_ENGINE_STATUS); STATUS_INIT(MEMORY_MMAP_THRESHOLD, nullptr, UINT64, "mmap threshold", TOKU_ENGINE_STATUS); @@ -2225,6 +2240,83 @@ env_get_engine_status_text(DB_ENV * env, char * buff, int bufsiz) { return r; } +// prints engine status using toku_env_err line-by-line +static int +env_err_engine_status(DB_ENV * env) { + uint32_t stringsize = 1024; + uint64_t panic; + char panicstring[stringsize]; + uint64_t num_rows; + uint64_t max_rows; + fs_redzone_state redzone_state; + + toku_env_err(env, 0, "BUILD_ID = %d", BUILD_ID); + + (void) env_get_engine_status_num_rows (env, &max_rows); + TOKU_ENGINE_STATUS_ROW_S mystat[max_rows]; + int r = env->get_engine_status (env, mystat, max_rows, &num_rows, &redzone_state, &panic, panicstring, stringsize, TOKU_ENGINE_STATUS); + + if (r) { + toku_env_err(env, 0, "Engine status not available: "); + if (!env) { + toku_env_err(env, 0, "no environment"); + } + else if (!(env->i)) { + toku_env_err(env, 0, "environment internal struct is null"); + } + else if (!env_opened(env)) { + toku_env_err(env, 0, "environment is not open"); + } + } + else { + if (panic) { + toku_env_err(env, 0, "Env panic code: %" PRIu64, panic); + if (strlen(panicstring)) { + invariant(strlen(panicstring) <= stringsize); + toku_env_err(env, 0, "Env panic string: %s", panicstring); + } + } + + for (uint64_t row = 0; row < num_rows; row++) { + switch (mystat[row].type) { + case FS_STATE: + toku_env_err(env, 0, "%s: %" PRIu64, mystat[row].legend, mystat[row].value.num); + break; + case UINT64: + toku_env_err(env, 0, "%s: %" PRIu64, mystat[row].legend, mystat[row].value.num); + break; + case CHARSTR: + toku_env_err(env, 0, "%s: %s", mystat[row].legend, mystat[row].value.str); + break; + case UNIXTIME: + { + char tbuf[26]; + format_time((time_t*)&mystat[row].value.num, tbuf); + toku_env_err(env, 0, "%s: %s", mystat[row].legend, tbuf); + } + break; + case TOKUTIME: + { + double t = tokutime_to_seconds(mystat[row].value.num); + toku_env_err(env, 0, "%s: %.6f", mystat[row].legend, t); + } + break; + case PARCOUNT: + { + uint64_t v = read_partitioned_counter(mystat[row].value.parcount); + toku_env_err(env, 0, "%s: %" PRIu64, mystat[row].legend, v); + } + break; + default: + toku_env_err(env, 0, "%s: UNKNOWN STATUS TYPE: %d", mystat[row].legend, mystat[row].type); + break; + } + } + } + + return r; +} + // intended for use by toku_assert logic, when env is not known static int toku_maybe_get_engine_status_text (char * buff, int buffsize) { @@ -2240,6 +2332,19 @@ toku_maybe_get_engine_status_text (char * buff, int buffsize) { return r; } +static int +toku_maybe_err_engine_status (void) { + DB_ENV * env = most_recent_env; + int r; + if (engine_status_enable && env != NULL) { + r = env_err_engine_status(env); + } + else { + r = EOPNOTSUPP; + } + return r; +} + // Set panic code and panic string if not already panicked, // intended for use by toku_assert when about to abort(). static void @@ -2292,10 +2397,8 @@ struct ltm_iterate_requests_callback_extra { }; static int -find_db_by_dict_id(OMTVALUE v, void *dict_id_v) { - DB *db = (DB *) v; +find_db_by_dict_id(DB *const &db, const DICTIONARY_ID &dict_id_find) { DICTIONARY_ID dict_id = db->i->dict_id; - DICTIONARY_ID dict_id_find = *(DICTIONARY_ID *) dict_id_v; if (dict_id.dictid < dict_id_find.dictid) { return -1; } else if (dict_id.dictid > dict_id_find.dictid) { @@ -2307,10 +2410,9 @@ find_db_by_dict_id(OMTVALUE v, void *dict_id_v) { static DB * locked_get_db_by_dict_id(DB_ENV *env, DICTIONARY_ID dict_id) { - OMTVALUE dbv; - int r = toku_omt_find_zero(env->i->open_dbs_by_dict_id, find_db_by_dict_id, - (void *) &dict_id, &dbv, nullptr); - return r == 0 ? (DB *) dbv : nullptr; + DB *db; + int r = env->i->open_dbs_by_dict_id->find_zero<DICTIONARY_ID, find_db_by_dict_id>(dict_id, &db, nullptr); + return r == 0 ? db : nullptr; } static int ltm_iterate_requests_callback(DICTIONARY_ID dict_id, TXNID txnid, @@ -2341,7 +2443,7 @@ env_iterate_pending_lock_requests(DB_ENV *env, return EINVAL; } - toku::locktree::manager *mgr = &env->i->ltm; + toku::locktree_manager *mgr = &env->i->ltm; ltm_iterate_requests_callback_extra e(env, callback, extra); return mgr->iterate_pending_lock_requests(ltm_iterate_requests_callback, &e); } @@ -2460,6 +2562,17 @@ static void env_set_killed_callback(DB_ENV *env, uint64_t default_killed_time_ms env->i->killed_callback = killed_callback; } +static void env_do_backtrace(DB_ENV *env) { + if (env->i->errcall) { + db_env_do_backtrace_errfunc((toku_env_err_func) toku_env_err, (const void *) env); + } + if (env->i->errfile) { + db_env_do_backtrace((FILE *) env->i->errfile); + } else { + db_env_do_backtrace(stderr); + } +} + static int toku_env_create(DB_ENV ** envp, uint32_t flags) { int r = ENOSYS; @@ -2536,6 +2649,7 @@ toku_env_create(DB_ENV ** envp, uint32_t flags) { USENV(set_loader_memory_size); USENV(get_loader_memory_size); USENV(set_killed_callback); + USENV(do_backtrace); #undef USENV // unlocked methods @@ -2564,18 +2678,18 @@ toku_env_create(DB_ENV ** envp, uint32_t flags) { result->i->bt_compare = toku_builtin_compare_fun; r = toku_logger_create(&result->i->logger); - if (r!=0) goto cleanup; // In particular, logger_create can return the huge page error. - assert(result->i->logger); + invariant_zero(r); + invariant_notnull(result->i->logger); // Create the locktree manager, passing in the create/destroy/escalate callbacks. // The extra parameter for escalation is simply a pointer to this environment. // The escalate callback will need it to translate txnids to DB_TXNs result->i->ltm.create(toku_db_lt_on_create_callback, toku_db_lt_on_destroy_callback, toku_db_txn_escalate_callback, result); - r = toku_omt_create(&result->i->open_dbs_by_dname); - assert_zero(r); - r = toku_omt_create(&result->i->open_dbs_by_dict_id); - assert_zero(r); + XMALLOC(result->i->open_dbs_by_dname); + result->i->open_dbs_by_dname->create(); + XMALLOC(result->i->open_dbs_by_dict_id); + result->i->open_dbs_by_dict_id->create(); toku_pthread_rwlock_init(&result->i->open_dbs_rwlock, NULL); *envp = result; @@ -2601,9 +2715,7 @@ DB_ENV_CREATE_FUN (DB_ENV ** envp, uint32_t flags) { // return <0 if v is earlier in omt than dbv // return >0 if v is later in omt than dbv static int -find_db_by_db_dname(OMTVALUE v, void *dbv) { - DB *db = (DB *) v; // DB* that is stored in the omt - DB *dbfind = (DB *) dbv; // extra, to be compared to v +find_db_by_db_dname(DB *const &db, DB *const &dbfind) { int cmp; const char *dname = db->i->dname; const char *dnamefind = dbfind->i->dname; @@ -2615,9 +2727,7 @@ find_db_by_db_dname(OMTVALUE v, void *dbv) { } static int -find_db_by_db_dict_id(OMTVALUE v, void *dbv) { - DB *db = (DB *) v; - DB *dbfind = (DB *) dbv; +find_db_by_db_dict_id(DB *const &db, DB *const &dbfind) { DICTIONARY_ID dict_id = db->i->dict_id; DICTIONARY_ID dict_id_find = dbfind->i->dict_id; if (dict_id.dictid < dict_id_find.dictid) { @@ -2640,20 +2750,18 @@ env_note_db_opened(DB_ENV *env, DB *db) { assert(db->i->dname); // internal (non-user) dictionary has no dname int r; - OMTVALUE v; uint32_t idx; - r = toku_omt_find_zero(env->i->open_dbs_by_dname, find_db_by_db_dname, - db, &v, &idx); + + r = env->i->open_dbs_by_dname->find_zero<DB *, find_db_by_db_dname>(db, nullptr, &idx); assert(r == DB_NOTFOUND); - r = toku_omt_insert_at(env->i->open_dbs_by_dname, db, idx); + r = env->i->open_dbs_by_dname->insert_at(db, idx); assert_zero(r); - r = toku_omt_find_zero(env->i->open_dbs_by_dict_id, find_db_by_db_dict_id, - db, &v, &idx); + r = env->i->open_dbs_by_dict_id->find_zero<DB *, find_db_by_db_dict_id>(db, nullptr, &idx); assert(r == DB_NOTFOUND); - r = toku_omt_insert_at(env->i->open_dbs_by_dict_id, db, idx); + r = env->i->open_dbs_by_dict_id->insert_at(db, idx); assert_zero(r); - STATUS_VALUE(YDB_LAYER_NUM_OPEN_DBS) = toku_omt_size(env->i->open_dbs_by_dname); + STATUS_VALUE(YDB_LAYER_NUM_OPEN_DBS) = env->i->open_dbs_by_dname->size(); STATUS_VALUE(YDB_LAYER_NUM_DB_OPEN)++; if (STATUS_VALUE(YDB_LAYER_NUM_OPEN_DBS) > STATUS_VALUE(YDB_LAYER_MAX_OPEN_DBS)) { STATUS_VALUE(YDB_LAYER_MAX_OPEN_DBS) = STATUS_VALUE(YDB_LAYER_NUM_OPEN_DBS); @@ -2666,58 +2774,44 @@ void env_note_db_closed(DB_ENV *env, DB *db) { toku_pthread_rwlock_wrlock(&env->i->open_dbs_rwlock); assert(db->i->dname); // internal (non-user) dictionary has no dname - assert(toku_omt_size(env->i->open_dbs_by_dname) > 0); - assert(toku_omt_size(env->i->open_dbs_by_dict_id) > 0); + assert(env->i->open_dbs_by_dname->size() > 0); + assert(env->i->open_dbs_by_dict_id->size() > 0); int r; - OMTVALUE v; uint32_t idx; - r = toku_omt_find_zero(env->i->open_dbs_by_dname, find_db_by_db_dname, - db, &v, &idx); + + r = env->i->open_dbs_by_dname->find_zero<DB *, find_db_by_db_dname>(db, nullptr, &idx); assert_zero(r); - r = toku_omt_delete_at(env->i->open_dbs_by_dname, idx); + r = env->i->open_dbs_by_dname->delete_at(idx); assert_zero(r); - r = toku_omt_find_zero(env->i->open_dbs_by_dict_id, find_db_by_db_dict_id, - db, &v, &idx); + r = env->i->open_dbs_by_dict_id->find_zero<DB *, find_db_by_db_dict_id>(db, nullptr, &idx); assert_zero(r); - r = toku_omt_delete_at(env->i->open_dbs_by_dict_id, idx); + r = env->i->open_dbs_by_dict_id->delete_at(idx); assert_zero(r); STATUS_VALUE(YDB_LAYER_NUM_DB_CLOSE)++; - STATUS_VALUE(YDB_LAYER_NUM_OPEN_DBS) = toku_omt_size(env->i->open_dbs_by_dname); + STATUS_VALUE(YDB_LAYER_NUM_OPEN_DBS) = env->i->open_dbs_by_dname->size(); toku_pthread_rwlock_wrunlock(&env->i->open_dbs_rwlock); } static int -find_open_db_by_dname (OMTVALUE v, void *dnamev) { - DB *db = (DB *) v; // DB* that is stored in the omt - int cmp; - const char *dname = db->i->dname; - const char *dnamefind = (char *) dnamev; - cmp = strcmp(dname, dnamefind); - return cmp; +find_open_db_by_dname(DB *const &db, const char *const &dnamefind) { + return strcmp(db->i->dname, dnamefind); } // return true if there is any db open with the given dname static bool env_is_db_with_dname_open(DB_ENV *env, const char *dname) { - int r; - bool rval; - OMTVALUE dbv; - uint32_t idx; + DB *db; toku_pthread_rwlock_rdlock(&env->i->open_dbs_rwlock); - r = toku_omt_find_zero(env->i->open_dbs_by_dname, find_open_db_by_dname, (void*)dname, &dbv, &idx); - if (r==0) { - DB *db = (DB *) dbv; - assert(strcmp(dname, db->i->dname) == 0); - rval = true; - } - else { - assert(r==DB_NOTFOUND); - rval = false; + int r = env->i->open_dbs_by_dname->find_zero<const char *, find_open_db_by_dname>(dname, &db, nullptr); + if (r == 0) { + invariant(strcmp(dname, db->i->dname) == 0); + } else { + invariant(r == DB_NOTFOUND); } toku_pthread_rwlock_rdunlock(&env->i->open_dbs_rwlock); - return rval; + return r == 0 ? true : false; } //We do not (yet?) support deleting subdbs by deleting the enclosing 'fname' @@ -3029,7 +3123,7 @@ env_get_iname(DB_ENV* env, DBT* dname_dbt, DBT* iname_dbt) { // TODO 2216: Patch out this (dangerous) function when loader is working and // we don't need to test the low-level redirect anymore. -// for use by test programs only, just a wrapper around brt call: +// for use by test programs only, just a wrapper around ft call: int toku_test_db_redirect_dictionary(DB * db, const char * dname_of_new_file, DB_TXN *dbtxn) { int r; @@ -3037,7 +3131,7 @@ toku_test_db_redirect_dictionary(DB * db, const char * dname_of_new_file, DB_TXN DBT iname_dbt; char * new_iname_in_env; - FT_HANDLE brt = db->i->ft_handle; + FT_HANDLE ft_handle = db->i->ft_handle; TOKUTXN tokutxn = db_txn_struct_i(dbtxn)->tokutxn; toku_fill_dbt(&dname_dbt, dname_of_new_file, strlen(dname_of_new_file)+1); @@ -3047,7 +3141,7 @@ toku_test_db_redirect_dictionary(DB * db, const char * dname_of_new_file, DB_TXN new_iname_in_env = (char *) iname_dbt.data; toku_multi_operation_client_lock(); //Must hold MO lock for dictionary_redirect. - r = toku_dictionary_redirect(new_iname_in_env, brt, tokutxn); + r = toku_dictionary_redirect(new_iname_in_env, ft_handle, tokutxn); toku_multi_operation_client_unlock(); toku_free(new_iname_in_env); diff --git a/storage/tokudb/ft-index/src/ydb_cursor.cc b/storage/tokudb/ft-index/src/ydb_cursor.cc index ae3b6e08820..aa236ab0324 100644 --- a/storage/tokudb/ft-index/src/ydb_cursor.cc +++ b/storage/tokudb/ft-index/src/ydb_cursor.cc @@ -313,7 +313,7 @@ c_getf_first_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val, r = context->r_user_callback; } - //Give brt-layer an error (if any) to return from toku_ft_cursor_first + //Give ft-layer an error (if any) to return from toku_ft_cursor_first return r; } @@ -364,7 +364,7 @@ c_getf_last_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val, v r = context->r_user_callback; } - //Give brt-layer an error (if any) to return from toku_ft_cursor_last + //Give ft-layer an error (if any) to return from toku_ft_cursor_last return r; } @@ -423,7 +423,7 @@ c_getf_next_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val, v r = context->r_user_callback; } - //Give brt-layer an error (if any) to return from toku_ft_cursor_next + //Give ft-layer an error (if any) to return from toku_ft_cursor_next return r; } @@ -481,7 +481,7 @@ c_getf_prev_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val, v r = context->r_user_callback; } - //Give brt-layer an error (if any) to return from toku_ft_cursor_prev + //Give ft-layer an error (if any) to return from toku_ft_cursor_prev return r; } @@ -518,7 +518,7 @@ c_getf_current_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val r = 0; } - //Give brt-layer an error (if any) to return from toku_ft_cursor_current + //Give ft-layer an error (if any) to return from toku_ft_cursor_current return r; } @@ -571,7 +571,7 @@ c_getf_set_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val, vo r = context->r_user_callback; } - //Give brt-layer an error (if any) to return from toku_ft_cursor_set + //Give ft-layer an error (if any) to return from toku_ft_cursor_set return r; } @@ -587,7 +587,7 @@ c_getf_set_range(DBC *c, uint32_t flag, DBT *key, YDB_CALLBACK_FUNCTION f, void query_context_with_input_init(&context, c, flag, key, NULL, f, extra); while (r == 0) { //toku_ft_cursor_set_range will call c_getf_set_range_callback(..., context) (if query is successful) - r = toku_ft_cursor_set_range(dbc_struct_i(c)->c, key, c_getf_set_range_callback, &context); + r = toku_ft_cursor_set_range(dbc_struct_i(c)->c, key, nullptr, c_getf_set_range_callback, &context); if (r == DB_LOCK_NOTGRANTED) { r = toku_db_wait_range_lock(context.base.db, context.base.txn, &context.base.request); } else { @@ -627,7 +627,28 @@ c_getf_set_range_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec v r = context->r_user_callback; } - //Give brt-layer an error (if any) to return from toku_ft_cursor_set_range + //Give ft-layer an error (if any) to return from toku_ft_cursor_set_range + return r; +} + +static int +c_getf_set_range_with_bound(DBC *c, uint32_t flag, DBT *key, DBT *key_bound, YDB_CALLBACK_FUNCTION f, void *extra) { + HANDLE_PANICKED_DB(c->dbp); + HANDLE_CURSOR_ILLEGAL_WORKING_PARENT_TXN(c); + + int r = 0; + QUERY_CONTEXT_WITH_INPUT_S context; //Describes the context of this query. + query_context_with_input_init(&context, c, flag, key, NULL, f, extra); + while (r == 0) { + //toku_ft_cursor_set_range will call c_getf_set_range_callback(..., context) (if query is successful) + r = toku_ft_cursor_set_range(dbc_struct_i(c)->c, key, key_bound, c_getf_set_range_callback, &context); + if (r == DB_LOCK_NOTGRANTED) { + r = toku_db_wait_range_lock(context.base.db, context.base.txn, &context.base.request); + } else { + break; + } + } + query_context_base_destroy(&context.base); return r; } @@ -683,7 +704,7 @@ c_getf_set_range_reverse_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, b r = context->r_user_callback; } - //Give brt-layer an error (if any) to return from toku_ft_cursor_set_range_reverse + //Give ft-layer an error (if any) to return from toku_ft_cursor_set_range_reverse return r; } @@ -746,7 +767,6 @@ c_set_check_interrupt_callback(DBC* dbc, bool (*interrupt_callback)(void*), void int toku_c_get(DBC* c, DBT* key, DBT* val, uint32_t flag) { - //This function exists for legacy (test compatibility) purposes/parity with bdb. HANDLE_PANICKED_DB(c->dbp); HANDLE_CURSOR_ILLEGAL_WORKING_PARENT_TXN(c); @@ -835,6 +855,7 @@ toku_db_cursor_internal(DB * db, DB_TXN * txn, DBC ** c, uint32_t flags, int is_ SCRS(c_getf_current); SCRS(c_getf_set_range); SCRS(c_getf_set_range_reverse); + SCRS(c_getf_set_range_with_bound); SCRS(c_set_bounds); SCRS(c_remove_restriction); SCRS(c_set_check_interrupt_callback); @@ -876,7 +897,7 @@ toku_db_cursor_internal(DB * db, DB_TXN * txn, DBC ** c, uint32_t flags, int is_ ); assert(r == 0 || r == TOKUDB_MVCC_DICTIONARY_TOO_NEW); if (r == 0) { - // Set the is_temporary_cursor boolean inside the brt node so + // Set the is_temporary_cursor boolean inside the ftnode so // that a query only needing one cursor will not perform // unecessary malloc calls. if (is_temporary_cursor) { diff --git a/storage/tokudb/ft-index/src/ydb_db.cc b/storage/tokudb/ft-index/src/ydb_db.cc index c9fa99d54de..78e08705ac6 100644 --- a/storage/tokudb/ft-index/src/ydb_db.cc +++ b/storage/tokudb/ft-index/src/ydb_db.cc @@ -1048,7 +1048,7 @@ toku_db_verify_with_progress(DB *db, int (*progress_callback)(void *extra, float return r; } -int toku_setup_db_internal (DB **dbp, DB_ENV *env, uint32_t flags, FT_HANDLE brt, bool is_open) { +int toku_setup_db_internal (DB **dbp, DB_ENV *env, uint32_t flags, FT_HANDLE ft_handle, bool is_open) { if (flags || env == NULL) return EINVAL; @@ -1067,7 +1067,7 @@ int toku_setup_db_internal (DB **dbp, DB_ENV *env, uint32_t flags, FT_HANDLE brt return ENOMEM; } memset(result->i, 0, sizeof *result->i); - result->i->ft_handle = brt; + result->i->ft_handle = ft_handle; result->i->opened = is_open; *dbp = result; return 0; @@ -1082,10 +1082,10 @@ toku_db_create(DB ** db, DB_ENV * env, uint32_t flags) { return EINVAL; - FT_HANDLE brt; - toku_ft_handle_create(&brt); + FT_HANDLE ft_handle; + toku_ft_handle_create(&ft_handle); - int r = toku_setup_db_internal(db, env, flags, brt, false); + int r = toku_setup_db_internal(db, env, flags, ft_handle, false); if (r != 0) return r; DB *result=*db; @@ -1162,7 +1162,7 @@ toku_db_create(DB ** db, DB_ENV * env, uint32_t flags) { // The new inames are returned to the caller. // It is the caller's responsibility to free them. // If "mark_as_loader" is true, then include a mark in the iname -// to indicate that the file is created by the brt loader. +// to indicate that the file is created by the ft loader. // Return 0 on success (could fail if write lock not available). static int load_inames(DB_ENV * env, DB_TXN * txn, int N, DB * dbs[/*N*/], const char * new_inames_in_env[/*N*/], LSN *load_lsn, bool mark_as_loader) { @@ -1207,13 +1207,13 @@ load_inames(DB_ENV * env, DB_TXN * txn, int N, DB * dbs[/*N*/], const char * new int do_fsync = 0; LSN *get_lsn = NULL; for (i = 0; i < N; i++) { - FT_HANDLE brt = dbs[i]->i->ft_handle; + FT_HANDLE ft_handle = dbs[i]->i->ft_handle; //Fsync is necessary for the last one only. if (i==N-1) { do_fsync = 1; //We only need a single fsync of logs. get_lsn = load_lsn; //Set pointer to capture the last lsn. } - toku_ft_load(brt, ttxn, new_inames_in_env[i], do_fsync, get_lsn); + toku_ft_load(ft_handle, ttxn, new_inames_in_env[i], do_fsync, get_lsn); } } return rval; diff --git a/storage/tokudb/ft-index/src/ydb_db.h b/storage/tokudb/ft-index/src/ydb_db.h index 5f87fadc3e3..54f0d178731 100644 --- a/storage/tokudb/ft-index/src/ydb_db.h +++ b/storage/tokudb/ft-index/src/ydb_db.h @@ -139,7 +139,7 @@ int toku_db_pre_acquire_table_lock(DB *db, DB_TXN *txn); int toku_db_get (DB * db, DB_TXN * txn, DBT * key, DBT * data, uint32_t flags); int toku_db_create(DB ** db, DB_ENV * env, uint32_t flags); int toku_db_close(DB * db); -int toku_setup_db_internal (DB **dbp, DB_ENV *env, uint32_t flags, FT_HANDLE brt, bool is_open); +int toku_setup_db_internal (DB **dbp, DB_ENV *env, uint32_t flags, FT_HANDLE ft_handle, bool is_open); int db_getf_set(DB *db, DB_TXN *txn, uint32_t flags, DBT *key, YDB_CALLBACK_FUNCTION f, void *extra); int autotxn_db_get(DB* db, DB_TXN* txn, DBT* key, DBT* data, uint32_t flags); diff --git a/storage/tokudb/ft-index/src/ydb_lib.cc b/storage/tokudb/ft-index/src/ydb_lib.cc index 5c0e539909d..11847788661 100644 --- a/storage/tokudb/ft-index/src/ydb_lib.cc +++ b/storage/tokudb/ft-index/src/ydb_lib.cc @@ -109,37 +109,4 @@ static void __attribute__((destructor)) libtokudb_destroy(void) { toku_ydb_destroy(); } -#endif - -#if TOKU_WINDOWS -#include <windows.h> -#define UNUSED(x) x=x - -bool WINAPI DllMain(HINSTANCE h, DWORD reason, LPVOID reserved) { - UNUSED(h); UNUSED(reserved); - // printf("%s:%lu\n", __FUNCTION__, reason); - int r = 0; - switch(reason) { - case DLL_PROCESS_ATTACH: - r = toku_ydb_init(); - break; - case DLL_PROCESS_DETACH: - toku_ydb_destroy(); - break; - case DLL_THREAD_ATTACH: - //TODO: Any new thread code if necessary, i.e. allocate per-thread - // storage. - break; - case DLL_THREAD_DETACH: - //TODO: Any cleanup thread code if necessary, i.e. free per-thread - // storage. - break; - default: - break; - } - assert(r==0); - return true; -} - -#endif - +#endif // __GNUC__ diff --git a/storage/tokudb/ft-index/src/ydb_load.h b/storage/tokudb/ft-index/src/ydb_load.h index f5ffeab528e..6496a92eeec 100644 --- a/storage/tokudb/ft-index/src/ydb_load.h +++ b/storage/tokudb/ft-index/src/ydb_load.h @@ -104,7 +104,7 @@ PATENT RIGHTS GRANT: // The new inames are returned to the caller. // It is the caller's responsibility to free them. // If "mark_as_loader" is true, then include a mark in the iname -// to indicate that the file is created by the brt loader. +// to indicate that the file is created by the ft loader. // Return 0 on success (could fail if write lock not available). int locked_load_inames(DB_ENV * env, DB_TXN * txn, diff --git a/storage/tokudb/ft-index/src/ydb_row_lock.cc b/storage/tokudb/ft-index/src/ydb_row_lock.cc index f7cdcbb563c..db5548a00c3 100644 --- a/storage/tokudb/ft-index/src/ydb_row_lock.cc +++ b/storage/tokudb/ft-index/src/ydb_row_lock.cc @@ -137,7 +137,7 @@ static void db_txn_note_row_lock(DB *db, DB_TXN *txn, const DBT *left_key, const map->insert_at(ranges, idx); // let the manager know we're referencing this lt - toku::locktree::manager *ltm = &txn->mgrp->i->ltm; + toku::locktree_manager *ltm = &txn->mgrp->i->ltm; ltm->reference_lt(ranges.lt); } else { invariant_zero(r); @@ -148,7 +148,7 @@ static void db_txn_note_row_lock(DB *db, DB_TXN *txn, const DBT *left_key, const ranges.buffer->append(left_key, right_key); size_t new_num_bytes = ranges.buffer->get_num_bytes(); invariant(new_num_bytes > old_num_bytes); - lt->get_mem_tracker()->note_mem_used(new_num_bytes - old_num_bytes); + lt->get_manager()->note_mem_used(new_num_bytes - old_num_bytes); toku_mutex_unlock(&db_txn_struct_i(txn)->txn_mutex); } @@ -201,7 +201,7 @@ void toku_db_txn_escalate_callback(TXNID txnid, const toku::locktree *lt, const // // We could theoretically steal the memory from the caller instead of copying // it, but it's simpler to have a callback API that doesn't transfer memory ownership. - lt->get_mem_tracker()->note_mem_released(ranges.buffer->get_num_bytes()); + lt->get_manager()->note_mem_released(ranges.buffer->get_num_bytes()); ranges.buffer->destroy(); ranges.buffer->create(); toku::range_buffer::iterator iter; @@ -211,7 +211,7 @@ void toku_db_txn_escalate_callback(TXNID txnid, const toku::locktree *lt, const ranges.buffer->append(rec.get_left_key(), rec.get_right_key()); iter.next(); } - lt->get_mem_tracker()->note_mem_used(ranges.buffer->get_num_bytes()); + lt->get_manager()->note_mem_used(ranges.buffer->get_num_bytes()); } else { // In rare cases, we may not find the associated locktree, because we are // racing with the transaction trying to add this locktree to the lt map @@ -315,7 +315,7 @@ void toku_db_release_lt_key_ranges(DB_TXN *txn, txn_lt_key_ranges *ranges) { // release all of the locks this txn has ever successfully // acquired and stored in the range buffer for this locktree lt->release_locks(txnid, ranges->buffer); - lt->get_mem_tracker()->note_mem_released(ranges->buffer->get_num_bytes()); + lt->get_manager()->note_mem_released(ranges->buffer->get_num_bytes()); ranges->buffer->destroy(); toku_free(ranges->buffer); @@ -324,6 +324,6 @@ void toku_db_release_lt_key_ranges(DB_TXN *txn, txn_lt_key_ranges *ranges) { toku::lock_request::retry_all_lock_requests(lt); // Release our reference on this locktree - toku::locktree::manager *ltm = &txn->mgrp->i->ltm; + toku::locktree_manager *ltm = &txn->mgrp->i->ltm; ltm->release_lt(lt); } diff --git a/storage/tokudb/ft-index/src/ydb_write.cc b/storage/tokudb/ft-index/src/ydb_write.cc index 7968f3f9668..4826e418ab5 100644 --- a/storage/tokudb/ft-index/src/ydb_write.cc +++ b/storage/tokudb/ft-index/src/ydb_write.cc @@ -276,7 +276,7 @@ toku_db_put(DB *db, DB_TXN *txn, DBT *key, DBT *val, uint32_t flags, bool holds_ r = toku_db_get_point_write_lock(db, txn, key); } if (r == 0) { - //Insert into the brt. + //Insert into the ft. TOKUTXN ttxn = txn ? db_txn_struct_i(txn)->tokutxn : NULL; enum ft_msg_type type = FT_INSERT; if (flags==DB_NOOVERWRITE_NO_ERROR) { @@ -396,9 +396,9 @@ cleanup: } static void -log_del_single(DB_TXN *txn, FT_HANDLE brt, const DBT *key) { +log_del_single(DB_TXN *txn, FT_HANDLE ft_handle, const DBT *key) { TOKUTXN ttxn = db_txn_struct_i(txn)->tokutxn; - toku_ft_log_del(ttxn, brt, key); + toku_ft_log_del(ttxn, ft_handle, key); } static uint32_t @@ -413,7 +413,7 @@ sum_size(uint32_t num_arrays, DBT_ARRAY keys[], uint32_t overhead) { } static void -log_del_multiple(DB_TXN *txn, DB *src_db, const DBT *key, const DBT *val, uint32_t num_dbs, FT_HANDLE brts[], DBT_ARRAY keys[]) { +log_del_multiple(DB_TXN *txn, DB *src_db, const DBT *key, const DBT *val, uint32_t num_dbs, FT_HANDLE fts[], DBT_ARRAY keys[]) { if (num_dbs > 0) { TOKUTXN ttxn = db_txn_struct_i(txn)->tokutxn; FT_HANDLE src_ft = src_db ? src_db->i->ft_handle : NULL; @@ -422,11 +422,11 @@ log_del_multiple(DB_TXN *txn, DB *src_db, const DBT *key, const DBT *val, uint32 if (del_single_sizes < del_multiple_size) { for (uint32_t i = 0; i < num_dbs; i++) { for (uint32_t j = 0; j < keys[i].size; j++) { - log_del_single(txn, brts[i], &keys[i].dbts[j]); + log_del_single(txn, fts[i], &keys[i].dbts[j]); } } } else { - toku_ft_log_del_multiple(ttxn, src_ft, brts, num_dbs, key, val); + toku_ft_log_del_multiple(ttxn, src_ft, fts, num_dbs, key, val); } } } @@ -539,7 +539,7 @@ env_del_multiple( uint32_t lock_flags[num_dbs]; uint32_t remaining_flags[num_dbs]; - FT_HANDLE brts[num_dbs]; + FT_HANDLE fts[num_dbs]; bool indexer_lock_taken = false; bool src_same = false; bool indexer_shortcut = false; @@ -594,7 +594,7 @@ env_del_multiple( if (r != 0) goto cleanup; } } - brts[which_db] = db->i->ft_handle; + fts[which_db] = db->i->ft_handle; } if (indexer) { @@ -611,7 +611,7 @@ env_del_multiple( } } toku_multi_operation_client_lock(); - log_del_multiple(txn, src_db, src_key, src_val, num_dbs, brts, del_keys); + log_del_multiple(txn, src_db, src_key, src_val, num_dbs, fts, del_keys); r = do_del_multiple(txn, num_dbs, db_array, del_keys, src_db, src_key, indexer_shortcut); toku_multi_operation_client_unlock(); if (indexer_lock_taken) { @@ -627,11 +627,11 @@ cleanup: } static void -log_put_multiple(DB_TXN *txn, DB *src_db, const DBT *src_key, const DBT *src_val, uint32_t num_dbs, FT_HANDLE brts[]) { +log_put_multiple(DB_TXN *txn, DB *src_db, const DBT *src_key, const DBT *src_val, uint32_t num_dbs, FT_HANDLE fts[]) { if (num_dbs > 0) { TOKUTXN ttxn = db_txn_struct_i(txn)->tokutxn; FT_HANDLE src_ft = src_db ? src_db->i->ft_handle : NULL; - toku_ft_log_put_multiple(ttxn, src_ft, brts, num_dbs, src_key, src_val); + toku_ft_log_put_multiple(ttxn, src_ft, fts, num_dbs, src_key, src_val); } } @@ -701,7 +701,7 @@ env_put_multiple_internal( uint32_t lock_flags[num_dbs]; uint32_t remaining_flags[num_dbs]; - FT_HANDLE brts[num_dbs]; + FT_HANDLE fts[num_dbs]; bool indexer_shortcut = false; bool indexer_lock_taken = false; bool src_same = false; @@ -773,7 +773,7 @@ env_put_multiple_internal( if (r != 0) goto cleanup; } } - brts[which_db] = db->i->ft_handle; + fts[which_db] = db->i->ft_handle; } if (indexer) { @@ -790,7 +790,7 @@ env_put_multiple_internal( } } toku_multi_operation_client_lock(); - log_put_multiple(txn, src_db, src_key, src_val, num_dbs, brts); + log_put_multiple(txn, src_db, src_key, src_val, num_dbs, fts); r = do_put_multiple(txn, num_dbs, db_array, put_keys, put_vals, src_db, src_key, indexer_shortcut); toku_multi_operation_client_unlock(); if (indexer_lock_taken) { |