Commit 1338d907 authored by John Esmet's avatar John Esmet

Revert "TMX-1 Rename TokuKV to TokuFT"

We will wait until after TokuMX 1.5.0 for these changes

This reverts commit b1f4a0aa.
parent 17c6b165
...@@ -83,7 +83,7 @@ add_subdirectory(examples) ...@@ -83,7 +83,7 @@ add_subdirectory(examples)
install( install(
FILES README.md README-TOKUDB FILES README.md README-TOKUDB
DESTINATION . DESTINATION .
COMPONENT tokuft_misc COMPONENT tokukv_misc
) )
## build tags ## build tags
......
TokuFT TokuKV
====== ======
TokuFT is a high-performance, transactional key-value store, used in the TokuKV is a high-performance, transactional key-value store, used in the
TokuDB storage engine for MySQL and MariaDB and in TokuMX, the TokuDB storage engine for MySQL and MariaDB and in TokuMX, the
high-performance MongoDB distribution. high-performance MongoDB distribution.
TokuFT is provided as a shared library with an interface similar to TokuKV is provided as a shared library with an interface similar to
Berkeley DB. Berkeley DB.
To build the full MySQL product, see the instructions for To build the full MySQL product, see the instructions for
[Tokutek/ft-engine][ft-engine]. To build TokuMX, see the instructions [Tokutek/ft-engine][ft-engine]. To build TokuMX, see the instructions
for [Tokutek/mongo][mongo]. This document covers TokuFT only. for [Tokutek/mongo][mongo]. This document covers TokuKV only.
[ft-engine]: https://github.com/Tokutek/ft-engine [ft-engine]: https://github.com/Tokutek/ft-engine
[mongo]: https://github.com/Tokutek/mongo [mongo]: https://github.com/Tokutek/mongo
...@@ -19,7 +19,7 @@ for [Tokutek/mongo][mongo]. This document covers TokuFT only. ...@@ -19,7 +19,7 @@ for [Tokutek/mongo][mongo]. This document covers TokuFT only.
Building Building
-------- --------
TokuFT is built using CMake >= 2.8.9. Out-of-source builds are TokuKV is built using CMake >= 2.8.9. Out-of-source builds are
recommended. You need a C++11 compiler, though only GCC >= 4.7 and recommended. You need a C++11 compiler, though only GCC >= 4.7 and
Apple's Clang are tested. You also need zlib development packages Apple's Clang are tested. You also need zlib development packages
(`yum install zlib-devel` or `apt-get install zlib1g-dev`). (`yum install zlib-devel` or `apt-get install zlib1g-dev`).
...@@ -50,14 +50,14 @@ to that if you are planning to run benchmarks or in production. ...@@ -50,14 +50,14 @@ to that if you are planning to run benchmarks or in production.
### Platforms ### Platforms
TokuFT is supported on 64-bit Centos, should work on other 64-bit linux TokuKV is supported on 64-bit Centos, should work on other 64-bit linux
distributions, and may work on OSX 10.8 and FreeBSD. TokuFT is not distributions, and may work on OSX 10.8 and FreeBSD. TokuKV is not
supported on 32-bit systems. supported on 32-bit systems.
[Transparent hugepages][transparent-hugepages] is a feature in newer linux [Transparent hugepages][transparent-hugepages] is a feature in newer linux
kernel versions that causes problems for the memory usage tracking kernel versions that causes problems for the memory usage tracking
calculations in TokuFT and can lead to memory overcommit. If you have calculations in TokuKV and can lead to memory overcommit. If you have
this feature enabled, TokuFT will not start, and you should turn it off. this feature enabled, TokuKV will not start, and you should turn it off.
If you want to run with transparent hugepages on, you can set an If you want to run with transparent hugepages on, you can set an
environment variable `TOKU_HUGE_PAGES_OK=1`, but only do this for testing, environment variable `TOKU_HUGE_PAGES_OK=1`, but only do this for testing,
and only with a small cache size. and only with a small cache size.
...@@ -68,23 +68,23 @@ and only with a small cache size. ...@@ -68,23 +68,23 @@ and only with a small cache size.
Examples Examples
-------- --------
There are some sample programs that can use either TokuFT or Berkeley DB There are some sample programs that can use either TokuKV or Berkeley DB
in the `examples/` directory. Follow the above instructions to build and in the `examples/` directory. Follow the above instructions to build and
install TokuFT, and then look in the installed `examples/` directory for install TokuKV, and then look in the installed `examples/` directory for
instructions on building and running them. instructions on building and running them.
Testing Testing
------- -------
TokuFT uses CTest for testing. The CDash testing dashboard is not TokuKV uses CTest for testing. The CDash testing dashboard is not
currently public, but you can run the tests without submitting them. currently public, but you can run the tests without submitting them.
There are some large data files not stored in the git repository, that 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 Many of the tests are linked with both TokuKV and Berkeley DB, as a sanity
check on the tests themselves. To build these tests, you will need 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 Berkeley DB and its header files installed. If you do not have Berkeley
DB installed, just don't pass `USE_BDB=ON`. DB installed, just don't pass `USE_BDB=ON`.
...@@ -103,7 +103,7 @@ ctest -D ExperimentalStart \ ...@@ -103,7 +103,7 @@ ctest -D ExperimentalStart \
Contributing Contributing
------------ ------------
Please report bugs in TokuFT here on github. Please report bugs in TokuKV here on github.
We have two publicly accessible mailing lists for TokuDB: We have two publicly accessible mailing lists for TokuDB:
...@@ -125,7 +125,7 @@ We are also available on IRC on freenode.net, in the #tokutek channel. ...@@ -125,7 +125,7 @@ We are also available on IRC on freenode.net, in the #tokutek channel.
License License
------- -------
TokuFT is available under the GPL version 2, with slight modifications. TokuKV is available under the GPL version 2, with slight modifications.
See [README-TOKUDB][license]. See [README-TOKUDB][license].
[license]: http://github.com/Tokutek/ft-index/blob/master/README-TOKUDB [license]: http://github.com/Tokutek/ft-index/blob/master/README-TOKUDB
...@@ -19,11 +19,11 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING) ...@@ -19,11 +19,11 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING)
FILES "${CMAKE_CURRENT_BINARY_DIR}/db.h" FILES "${CMAKE_CURRENT_BINARY_DIR}/db.h"
DESTINATION include DESTINATION include
RENAME tokudb.h RENAME tokudb.h
COMPONENT tokuft_headers COMPONENT tokukv_headers
) )
install( install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/db.h" FILES "${CMAKE_CURRENT_BINARY_DIR}/db.h"
DESTINATION include DESTINATION include
COMPONENT tokuft_headers COMPONENT tokukv_headers
) )
endif () endif ()
\ No newline at end of file
...@@ -29,7 +29,7 @@ if (NOT DEFINED LIBJEMALLOC) ...@@ -29,7 +29,7 @@ if (NOT DEFINED LIBJEMALLOC)
# detect when we are being built as a subproject # detect when we are being built as a subproject
if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING) if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/jemalloc/lib" DESTINATION . install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/jemalloc/lib" DESTINATION .
COMPONENT tokuft_libs_extra) COMPONENT tokukv_libs_extra)
endif () endif ()
endif () endif ()
endif () endif ()
......
...@@ -11,6 +11,6 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING) ...@@ -11,6 +11,6 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING)
DESTINATION DESTINATION
examples examples
COMPONENT COMPONENT
tokuft_examples tokukv_examples
) )
endif () endif ()
\ No newline at end of file
...@@ -102,7 +102,7 @@ target_link_libraries(ftverify m) ...@@ -102,7 +102,7 @@ target_link_libraries(ftverify m)
install( install(
TARGETS tokuftdump TARGETS tokuftdump
DESTINATION bin DESTINATION bin
COMPONENT tokuft_tools COMPONENT tokukv_tools
) )
add_subdirectory(tests) add_subdirectory(tests)
...@@ -38,22 +38,22 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING) ...@@ -38,22 +38,22 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING)
install( install(
FILES toku_os_types.h toku_time.h toku_list.h toku_os.h FILES toku_os_types.h toku_time.h toku_list.h toku_os.h
DESTINATION include DESTINATION include
COMPONENT tokuft_headers COMPONENT tokukv_headers
) )
install( install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/toku_config.h" FILES "${CMAKE_CURRENT_BINARY_DIR}/toku_config.h"
DESTINATION include DESTINATION include
COMPONENT tokuft_headers COMPONENT tokukv_headers
) )
install( install(
TARGETS ${LIBTOKUPORTABILITY}_static TARGETS ${LIBTOKUPORTABILITY}_static
DESTINATION ${INSTALL_LIBDIR} DESTINATION ${INSTALL_LIBDIR}
COMPONENT tokuft_libs_static COMPONENT tokukv_libs_static
) )
install( install(
TARGETS ${LIBTOKUPORTABILITY} TARGETS ${LIBTOKUPORTABILITY}
DESTINATION ${INSTALL_LIBDIR} DESTINATION ${INSTALL_LIBDIR}
COMPONENT tokuft_libs_shared COMPONENT tokukv_libs_shared
) )
endif () endif ()
......
...@@ -44,12 +44,12 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING) ...@@ -44,12 +44,12 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING)
install( install(
TARGETS ${LIBTOKUDB} TARGETS ${LIBTOKUDB}
DESTINATION ${INSTALL_LIBDIR} DESTINATION ${INSTALL_LIBDIR}
COMPONENT tokuft_libs_shared COMPONENT tokukv_libs_shared
) )
install( install(
TARGETS ${LIBTOKUDB}_static TARGETS ${LIBTOKUDB}_static
DESTINATION ${INSTALL_LIBDIR} DESTINATION ${INSTALL_LIBDIR}
COMPONENT tokuft_libs_static COMPONENT tokukv_libs_static
) )
endif () endif ()
......
...@@ -24,7 +24,7 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING) ...@@ -24,7 +24,7 @@ if (NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING)
install( install(
FILES partitioned_counter.h FILES partitioned_counter.h
DESTINATION include DESTINATION include
COMPONENT tokuft_headers COMPONENT tokukv_headers
) )
endif () endif ()
......
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