Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e96940a6
Commit
e96940a6
authored
Aug 18, 2014
by
John Esmet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FT-512 Remove the majority of the remaining BDB artifacts
parent
f1720c82
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
2 additions
and
49 deletions
+2
-49
CTestCustom.cmake
CTestCustom.cmake
+0
-2
README.md
README.md
+1
-7
cmake_modules/FindBDB.cmake
cmake_modules/FindBDB.cmake
+0
-27
cmake_modules/TokuFeatureDetection.cmake
cmake_modules/TokuFeatureDetection.cmake
+0
-5
scripts/run-nightly-coverage-tests.bash
scripts/run-nightly-coverage-tests.bash
+0
-1
scripts/run-nightly-drd-tests.bash
scripts/run-nightly-drd-tests.bash
+0
-1
scripts/run-nightly-release-tests.bash
scripts/run-nightly-release-tests.bash
+1
-2
scripts/run.fractal.tree.tests.cmake
scripts/run.fractal.tree.tests.cmake
+0
-3
scripts/run.stress-tests.py
scripts/run.stress-tests.py
+0
-1
No files found.
CTestCustom.cmake
View file @
e96940a6
...
@@ -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
...
...
README.md
View file @
e96940a6
...
@@ -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
\
...
...
cmake_modules/FindBDB.cmake
deleted
100644 → 0
View file @
f1720c82
# - 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
()
cmake_modules/TokuFeatureDetection.cmake
View file @
e96940a6
...
@@ -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
)
...
...
scripts/run-nightly-coverage-tests.bash
View file @
e96940a6
...
@@ -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
\
...
...
scripts/run-nightly-drd-tests.bash
View file @
e96940a6
...
@@ -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
\
...
...
scripts/run-nightly-release-tests.bash
View file @
e96940a6
...
@@ -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
scripts/run.fractal.tree.tests.cmake
View file @
e96940a6
...
@@ -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
}
...
...
scripts/run.stress-tests.py
View file @
e96940a6
...
@@ -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'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment