Commit a57387df authored by John Esmet's avatar John Esmet

FT-512 Remove the majority of the remaining BDB artifacts

parent feb5b70c
...@@ -33,7 +33,6 @@ list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE ...@@ -33,7 +33,6 @@ list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE
ydb/preload-db-nested.tdb ydb/preload-db-nested.tdb
ydb/stress-gc.tdb ydb/stress-gc.tdb
ydb/stress-gc2.tdb ydb/stress-gc2.tdb
ydb/stress-test.bdb
ydb/stress-test.tdb ydb/stress-test.tdb
ydb/test-5138.tdb ydb/test-5138.tdb
ydb/test-prepare.tdb ydb/test-prepare.tdb
...@@ -45,7 +44,6 @@ list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE ...@@ -45,7 +44,6 @@ list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE
ydb/test-xa-prepare.tdb ydb/test-xa-prepare.tdb
ydb/test4573-logtrim.tdb ydb/test4573-logtrim.tdb
ydb/test_3645.tdb ydb/test_3645.tdb
ydb/test_groupcommit_perf.bdb
ydb/test_groupcommit_perf.tdb ydb/test_groupcommit_perf.tdb
ydb/test_large_update_broadcast_small_cachetable.tdb ydb/test_large_update_broadcast_small_cachetable.tdb
ydb/test_update_broadcast_stress.tdb ydb/test_update_broadcast_stress.tdb
......
...@@ -35,7 +35,6 @@ mkdir build ...@@ -35,7 +35,6 @@ mkdir build
cd build cd build
CC=gcc47 CXX=g++47 cmake \ CC=gcc47 CXX=g++47 cmake \
-D CMAKE_BUILD_TYPE=Debug \ -D CMAKE_BUILD_TYPE=Debug \
-D USE_BDB=OFF \
-D BUILD_TESTING=OFF \ -D BUILD_TESTING=OFF \
-D USE_VALGRIND=OFF \ -D USE_VALGRIND=OFF \
-D CMAKE_INSTALL_PREFIX=../prefix/ \ -D CMAKE_INSTALL_PREFIX=../prefix/ \
...@@ -84,15 +83,10 @@ There are some large data files not stored in the git repository, that ...@@ -84,15 +83,10 @@ There are some large data files not stored in the git repository, that
will be made available soon. For now, the tests that use these files will will be made available soon. For now, the tests that use these files will
not run. not run.
Many of the tests are linked with both TokuFT and Berkeley DB, as a sanity
check on the tests themselves. To build these tests, you will need
Berkeley DB and its header files installed. If you do not have Berkeley
DB installed, just don't pass `USE_BDB=ON`.
In the build directory from above: In the build directory from above:
```sh ```sh
cmake -D BUILD_TESTING=ON [-D USE_BDB=ON] .. cmake -D BUILD_TESTING=ON ..
ctest -D ExperimentalStart \ ctest -D ExperimentalStart \
-D ExperimentalConfigure \ -D ExperimentalConfigure \
-D ExperimentalBuild \ -D ExperimentalBuild \
......
# - Try to find BDB
# Once done this will define
# BDB_FOUND - System has BDB
# BDB_INCLUDE_DIRS - The BDB include directories
# BDB_LIBRARIES - The libraries needed to use BDB
# BDB_DEFINITIONS - Compiler switches required for using BDB
find_path(BDB_INCLUDE_DIR db.h)
find_library(BDB_LIBRARY NAMES db libdb)
include(CheckSymbolExists)
## check if the found bdb has DB_TXN_SNAPSHOT
set(CMAKE_REQUIRED_INCLUDES ${BDB_INCLUDE_DIR})
check_symbol_exists(DB_TXN_SNAPSHOT "db.h" HAVE_DB_TXN_SNAPSHOT)
if(HAVE_DB_TXN_SNAPSHOT)
set(BDB_INCLUDE_DIRS ${BDB_INCLUDE_DIR})
set(BDB_LIBRARIES ${BDB_LIBRARY})
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set BDB_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args(BDB DEFAULT_MSG
BDB_LIBRARY BDB_INCLUDE_DIR)
mark_as_advanced(BDB_INCLUDE_DIR BDB_LIBRARY)
endif()
...@@ -2,11 +2,6 @@ ...@@ -2,11 +2,6 @@
find_package(Threads) find_package(Threads)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
option(USE_BDB "Build some tools and tests with bdb (requires a proper BerkeleyDB include directory and library)." ON)
if(USE_BDB)
find_package(BDB REQUIRED)
endif()
option(USE_VALGRIND "Build to run safely under valgrind (often slower)." ON) option(USE_VALGRIND "Build to run safely under valgrind (often slower)." ON)
if(USE_VALGRIND) if(USE_VALGRIND)
find_package(Valgrind REQUIRED) find_package(Valgrind REQUIRED)
......
...@@ -20,7 +20,6 @@ if [ ! -d build ] ; then ...@@ -20,7 +20,6 @@ if [ ! -d build ] ; then
-D USE_GTAGS=OFF \ -D USE_GTAGS=OFF \
-D USE_CSCOPE=OFF \ -D USE_CSCOPE=OFF \
-D USE_ETAGS=OFF \ -D USE_ETAGS=OFF \
-D USE_BDB=OFF \
-D USE_GCOV=ON \ -D USE_GCOV=ON \
-D CMAKE_LINK_DEPENDS_NO_SHARED=ON \ -D CMAKE_LINK_DEPENDS_NO_SHARED=ON \
-G Ninja \ -G Ninja \
......
...@@ -20,7 +20,6 @@ if [ ! -d build ] ; then ...@@ -20,7 +20,6 @@ if [ ! -d build ] ; then
-D USE_GTAGS=OFF \ -D USE_GTAGS=OFF \
-D USE_CSCOPE=OFF \ -D USE_CSCOPE=OFF \
-D USE_ETAGS=OFF \ -D USE_ETAGS=OFF \
-D USE_BDB=OFF \
-D CMAKE_LINK_DEPENDS_NO_SHARED=ON \ -D CMAKE_LINK_DEPENDS_NO_SHARED=ON \
-G Ninja \ -G Ninja \
-D RUN_LONG_TESTS=ON \ -D RUN_LONG_TESTS=ON \
......
...@@ -20,7 +20,6 @@ if [ ! -d build ] ; then ...@@ -20,7 +20,6 @@ if [ ! -d build ] ; then
-D USE_GTAGS=OFF \ -D USE_GTAGS=OFF \
-D USE_CSCOPE=OFF \ -D USE_CSCOPE=OFF \
-D USE_ETAGS=OFF \ -D USE_ETAGS=OFF \
-D USE_BDB=ON \
-D CMAKE_LINK_DEPENDS_NO_SHARED=ON \ -D CMAKE_LINK_DEPENDS_NO_SHARED=ON \
-G Ninja \ -G Ninja \
-D RUN_LONG_TESTS=ON \ -D RUN_LONG_TESTS=ON \
...@@ -41,6 +40,6 @@ ctest -j16 \ ...@@ -41,6 +40,6 @@ ctest -j16 \
-E '/drd|/helgrind' -E '/drd|/helgrind'
ctest -j16 \ ctest -j16 \
-D NightlyMemCheck \ -D NightlyMemCheck \
-E '^ydb/.*\.bdb|test1426\.tdb|/drd|/helgrind' -E 'test1426\.tdb|/drd|/helgrind'
set -e set -e
ctest -D NightlySubmit ctest -D NightlySubmit
...@@ -78,19 +78,16 @@ list(APPEND CTEST_NOTES_FILES ...@@ -78,19 +78,16 @@ list(APPEND CTEST_NOTES_FILES
) )
set(all_opts set(all_opts
-DBDBDIR=/usr/local/BerkeleyDB.5.3
-DBUILD_TESTING=ON -DBUILD_TESTING=ON
-DUSE_CILK=OFF -DUSE_CILK=OFF
) )
set(rel_opts set(rel_opts
${all_opts} ${all_opts}
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DUSE_BDB=ON
) )
set(dbg_opts set(dbg_opts
${all_opts} ${all_opts}
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug
-DUSE_BDB=ON
) )
set(cov_opts set(cov_opts
${all_opts} ${all_opts}
......
...@@ -552,7 +552,6 @@ def rebuild(tokudb, builddir, tokudb_data, cc, cxx, tests): ...@@ -552,7 +552,6 @@ def rebuild(tokudb, builddir, tokudb_data, cc, cxx, tests):
newenv['CXX'] = cxx newenv['CXX'] = cxx
r = call(['cmake', r = call(['cmake',
'-DCMAKE_BUILD_TYPE=Debug', '-DCMAKE_BUILD_TYPE=Debug',
'-DUSE_BDB=OFF',
'-DUSE_GTAGS=OFF', '-DUSE_GTAGS=OFF',
'-DUSE_CTAGS=OFF', '-DUSE_CTAGS=OFF',
'-DUSE_ETAGS=OFF', '-DUSE_ETAGS=OFF',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment