summaryrefslogtreecommitdiff
path: root/storage/rocksdb/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2018-09-061-1/+7
|\
| * Rocksdb, Windows - better fix for broken WIN32_LEAN_AND_MEANVladislav Vaintroub2018-09-051-9/+0
| | | | | | | | | | | | (https://github.com/facebook/rocksdb/issues/4344) Also, disable /permissive- flag if set, it breaks rocksdb compilation in 10.3 on older versions of Windows 8.1 SDK.
| * MyRocks: post-merge fixes: Make it compile on Windows.Sergei Petrunia2018-08-311-0/+9
| |
| * Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into ↵Sergei Petrunia2018-08-281-1/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb-10.2-mariarocks-merge Move up-to this revision in the upstream: commit de1e8c7bfe7c875ea284b55040e8f3cd3a56fcc2 Author: Abhinav Sharma <abhinavsharma@fb.com> Date: Thu Aug 23 14:34:39 2018 -0700 Log updates to semi-sync whitelist in the error log Summary: Plugin variable changes are not logged in the error log even when log_global_var_changes is enabled. Logging updates to whitelist will help in debugging. Reviewed By: guokeno0 Differential Revision: D9483807 fbshipit-source-id: e111cda773d
| | * Copy ofSergei Petrunia2018-08-281-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit de1e8c7bfe7c875ea284b55040e8f3cd3a56fcc2 Author: Abhinav Sharma <abhinavsharma@fb.com> Date: Thu Aug 23 14:34:39 2018 -0700 Log updates to semi-sync whitelist in the error log Summary: Plugin variable changes are not logged in the error log even when log_global_var_changes is enabled. Logging updates to whitelist will help in debugging. Reviewed By: guokeno0 Differential Revision: D9483807 fbshipit-source-id: e111cda773d
* | | cmake .git warningSergei Golubchik2018-08-121-1/+1
| | | | | | | | | | | | only run git if .git exists, don't do it for source tarballs
* | | MDEV-15578: MyRocks: support zstandard compression where the distro allows itVicențiu Ciorbaru2018-05-241-0/+7
| | | | | | | | | | | | | | | | | | Add libzstd-dev as a build dependency to the server and libzstd1 as a runtime dependency for rocksdb. libzstd is practially a mandatory compression library to ensure adequate performance for RocksDB.
* | | Merge 10.2 into 10.3Marko Mäkelä2018-05-241-0/+3
|\ \ \ | |/ /
| * | MDEV-12439: MariaRocks produces numerous (spurious?) valgrind failuresSergei Petrunia2018-05-221-0/+3
| | | | | | | | | | | | | | | | | | Step#1: RocksDB files require a special #define when they are compiled with valgrind. Without that, valgrind fails with an 'unimplemented syscall' error for fcntl call.
* | | Merge branch 'github/10.2' into 10.3Sergei Golubchik2018-05-221-1/+1
|\ \ \ | |/ /
| * | MDEV-16200: -DPLUGIN_ROCKSDB=YES leads to errors during buildSergei Petrunia2018-05-181-1/+1
| | | | | | | | | | | | Mark the plugin as dynamic-only.
* | | Merge pull request #753 from shinnok/10.3-macfixesSergei Petrunia2018-05-151-1/+1
|\ \ \ | | | | | | | | MDEV-15778: 10.3 macOS build fixes
| * | | MDEV-15778: Rocksdb missing linkage to dbug libraryTeodor Mircea Ionita2018-05-101-1/+1
| | | | | | | | | | | | | | | | Was failing with Debug build on macOS 10.13.4
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-05-121-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2Sergei Petrunia2018-05-071-4/+4
| |\ \ | | | | | | | | | | | | Manually resolved the conflicts
| | * | MyRocks: Fix link error on WindowsSergei Petrunia2018-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rocksdb_aux_lib.lib(rdb_sst_info.obj) : error LNK2001: unresolved external symbol PSI_server [D:\winx64-packages\build\storage\rocksdb\rocksdb.vcxproj] rocksdb_aux_lib is an utility library used by standalone tools. These won't have PSI_server. FIxed by moving rdb_sst_info.* out of the library (as they do not seem to be used by these standalone tools)
| | * | Merge from merge-myrocks:Sergei Petrunia2018-01-271-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 445e518bc7aa5f4bb48d98e798905c9c0b0ce673 Author: Sergei Petrunia <psergey@askmonty.org> Date: Sat Jan 27 10:18:20 2018 +0000 Copy of commit f8f364b47f2784f16b401f27658f1c16eaf348ec Author: Jay Edgar <jkedgar@fb.com> Date: Tue Oct 17 15:19:31 2017 -0700 Add a hashed, hierarchical, wheel timer implementation Summary: In order to implement idle timeouts on detached sessions we need something inside MySQL that is lightweight and can handle calling events in the future wi By default the timers are grouped into 10ms buckets (the 'hashed' part), though the size of the buckets is configurable at the creation of the timer. Eac Reviewed By: djwatson Differential Revision: D6199806 fbshipit-source-id: 5e1590f
| | | * Copy ofSergei Petrunia2018-01-271-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f8f364b47f2784f16b401f27658f1c16eaf348ec Author: Jay Edgar <jkedgar@fb.com> Date: Tue Oct 17 15:19:31 2017 -0700 Add a hashed, hierarchical, wheel timer implementation Summary: In order to implement idle timeouts on detached sessions we need something inside MySQL that is lightweight and can handle calling events in the future with very little cost for cancelling or resetting the event. A hashed, hi By default the timers are grouped into 10ms buckets (the 'hashed' part), though the size of the buckets is configurable at the creation of the timer. Each wheel (the 'wheel' part) maintains 256 buckets and cascades to the whe Reviewed By: djwatson Differential Revision: D6199806 fbshipit-source-id: 5e1590f
* | | | Make possible to use clang on Windows (clang-cl)Vladislav Vaintroub2018-02-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | -DWITH_ASAN can be used as well now, on x64 Fix many clang-cl warnings.
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-0/+2
|\ \ \ \ | |/ / /
| * | | Add myrocks_hotbackup part of rocksdb plugin in cmakeVicentiu Ciorbaru2018-02-071-0/+2
| |/ /
* | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ↵Vladislav Vaintroub2018-02-061-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | 'size_t' to 'type', possible loss of data) Handle string length as size_t, consistently (almost always:)) Change function prototypes to accept size_t, where in the past ulong or uint were used. change local/member variables to size_t when appropriate. This fix excludes rocksdb, spider,spider, sphinx and connect for now.
* | MDEV-12458: Variable and log records to indicate RocksDB version are missingVarun Gupta2017-12-311-0/+15
| | | | | | | | Added a system variabe rocsdb_git_hash to MyRocks which tell us the version of RocksDB being used
* | Fix the build on OpenBSD (#488)David Carlier2017-11-221-0/+5
| | | | | | | | * rocksdb fails without timer_delete() - only use it when it exists
* | don't `git submodule update` from rocksdb/CMakeLists.txt (#492)Sergei Golubchik2017-11-211-7/+0
| | | | | | | | we now have cmake/submodules.cmake that updates all submodules
* | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-mergeSergei Petrunia2017-10-131-1/+1
|\ \
| * | MDEV-13928: Missing symbols building RocksDB on macOS 10.12.6Varun Gupta2017-10-111-1/+1
| | | | | | | | | | | | rdb_sst_info.cc must be compiled with RTTI
* | | Post-merge fixes part #1.Sergei Petrunia2017-09-191-0/+2
| | |
* | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-mergeSergei Petrunia2017-09-191-19/+15
|\ \ \ | |/ /
| * | MDEV-13585: RocksDB plugin fails to build on macOS because of unknown type ↵Varun Gupta2017-09-051-2/+7
| | | | | | | | | | | | | | | | | | `timer_t` etc. Rdb_io_watchdog can not be built on OS X. Disable it.
| * | Post-merge fix: Rdb_io_watchdog doesn't support windowsSergei Petrunia2017-08-011-11/+1
| | | | | | | | | | | | Part #2.
| * | Post-merge fix: Rdb_io_watchdog doesn't support windowsSergei Petrunia2017-07-311-1/+11
| | | | | | | | | | | | So disable it there for now.
| * | Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished.Sergei Petrunia2017-07-291-1/+24
| |\ \ | | | | | | | | | | | | It compiles on Linux but fails a lot of tests still
| * | | MDEV-12469: rocksdb having large numberic storage errors on ppc64 (BE)Daniel Black2017-05-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (from: http://buildbot.askmonty.org/buildbot/builders/p8-rhel6-bintar/builds/820/steps/test/logs/stdio) Errors like the following indicate a potential endian storage issue: rocksdb.rocksdb_range w1 [ fail ] Test ended at 2017-04-27 18:56:11 CURRENT_TEST: rocksdb.rocksdb_range --- /home/buildbot/maria-slave/p8-rhel6-bintar/build/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_range.result 2017-04-27 17:41:27.740050347 -0400 +++ /home/buildbot/maria-slave/p8-rhel6-bintar/build/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_range.reject 2017-04-27 18:56:11.230050346 -0400 @@ -25,15 +25,15 @@ select * from t2 force index (a) where a=0; pk a b 0 0 0 -1 0 1 -2 0 2 -3 0 3 -4 0 4 -5 0 5 -6 0 6 -7 0 7 -8 0 8 -9 0 9 +16777216 0 1 +33554432 0 2 +50331648 0 3 +67108864 0 4 +83886080 0 5 +100663296 0 6 +117440512 0 7 +134217728 0 8 +150994944 0 9 # The rest are for code coverage: explain select * from t2 force index (a) where a=2; @@ -41,23 +41,23 @@ 1 SIMPLE t2 ref a a 4 const # select * from t2 force index (a) where a=2; pk a b -20 2 20 -21 2 21 -22 2 22 -23 2 23 -24 2 24 -25 2 25 -26 2 26 -27 2 27 -28 2 28 -29 2 29 +335544320 2 20 +352321536 2 21 +369098752 2 22 +385875968 2 23 +402653184 2 24 +419430400 2 25 +436207616 2 26 +452984832 2 27 +469762048 2 28 +486539264 2 29 explain select * from t2 force index (a) where a=3 and pk=33; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 const a a 8 const,const # select * from t2 force index (a) where a=3 and pk=33; pk a b -33 3 33 +553648128 3 33 select * from t2 force index (a) where a=99 and pk=99; pk a b select * from t2 force index (a) where a=0 and pk=0; ... Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
* | | | Post-merge fix for compilation on WindowsSergei Petrunia2017-09-191-2/+4
| | | |
* | | | Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-mergeSergei Petrunia2017-09-181-4/+48
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream cset we are merging from: commit 184a4a2d82f4f6f3cbcb1015bcdb32bebe73315c Author: Abhinav Sharma <abhinavsharma@fb.com> Date: Thu Sep 14 11:40:08 2017 -0700 Bump rocksdb submodule Summary: Bump rocksdb to include the fix for rocksdb.trx_info_rpl Lots of conflicts, got the code to compile but tests are likely to be broken
| * | Copy ofSergei Petrunia2017-09-151-0/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 184a4a2d82f4f6f3cbcb1015bcdb32bebe73315c Author: Abhinav Sharma <abhinavsharma@fb.com> Date: Thu Sep 14 11:40:08 2017 -0700 Bump rocksdb submodule Summary: Bump rocksdb to include the fix for rocksdb.trx_info_rpl The bug was introduced in: https://github.com/facebook/rocksdb/pull/2850 Fixed in: https://github.com/facebook/rocksdb/pull/2881 update-submodule: rocksdb Reviewed By: lth Differential Revision: D5834658 fbshipit-source-id: d1551bf
| * Copy ofSergei Petrunia2017-07-281-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 394d0712d3d46a87a8063e14e998e9c22336e3a6 Author: Anca Agape <anca@fb.com> Date: Thu Jul 27 15:43:07 2017 -0700 Fix rpl.rpl_4threads_deadlock test broken by D5005670 Summary: In D5005670 in fill_fields_processlist() function we introduced a point where we were trying to take the LOCK_thd_data before the synchronization point used by test processlist_after_LOCK_thd_count_before_LOCK_thd_data. This was happening in get_attached_srv_session() function called. Replaced this with get_attached_srv_session_safe() and moved it after lock is aquired. Reviewed By: tianx Differential Revision: D5505992 fbshipit-source-id: bc53924
* | MDEV-12452 MDEV-12453 : Fix building rocksdb and aws_key_management on macOSVladislav Vaintroub2017-04-061-1/+3
| | | | | | | | | | | | use CMAKE_CXX_STANDARD to set C++11 flags with CMake 3.1+ (apples flags are somehow different from standard clang) port htonbe16/32/64 macros for rocksdb use reinterpret_cast<size_t> to cast macOS's pthread_t (pointer type) to size_t , for rocksdb
* | MariaRocks: temporarily disable 32-bit Windows buildsSergei Petrunia2017-04-041-0/+7
| |
* | Disable compilation of storage/rocksdb/unittest/test_properties_collectorSergei Petrunia2017-04-031-3/+6
| | | | | | | | Met additional issues while trying to enable it.
* | Rename plugin rocksdb_se to rocksdbVladislav Vaintroub2017-04-021-3/+3
| |
* | Make mysql_ldb and sst_dump part of the rocksdb-engine componentVicențiu Ciorbaru2017-03-261-2/+2
| |
* | Do not build ldb binary as mysql_ldb does the same thingVicențiu Ciorbaru2017-03-251-4/+1
| |
* | Skip rocksdb plugin if sources can not be fetchedVicențiu Ciorbaru2017-03-251-6/+7
| | | | | | | | | | | | Either we are building from a source package, in which case all sources should be present, or we are building from a repository. The repository needs to fetch the rocksdb submodule before building rocksdb.
* | Revert "Revert "Make rocksdb build as a deb package too""Vicențiu Ciorbaru2017-03-171-1/+3
| | | | | | | | This reverts commit 49de95679da3040f6e653640476208d6fbf2c24e.
* | Revert "Make rocksdb build as a deb package too"Vicențiu Ciorbaru2017-03-161-3/+1
| | | | | | | | | | | | | | This reverts commit 38919f68a1eb1dca14a41885828499a9c0cb8157. Temporary revert to be able to see other failures until builders are updated.
* | Make rocksdb build as a deb package tooVicențiu Ciorbaru2017-03-151-1/+3
| |
* | Make rocksdb not be compiled on x86 architecturesVicențiu Ciorbaru2017-03-141-0/+5
| |
* | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into ↵Sergei Petrunia2017-03-111-1/+10
|\ \ | |/ | | | | | | | | bb-10.2-mariarocks Manually resolved a few conflicts