revision-id: b211e08c0b717a7a12b239c941d2be891a03c52a (fb-prod202002-127-gb211e08c0b7) parent(s): 6618bee92d82872739fac5c115e70077da238fb4 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2020-08-24 16:59:31 +0300 message: More Post-rebase fixes, update RocksDB to RangeLocking+LockTracker --- mysql-test/suite/rocksdb/t/range_locking.test | 3 ++- rocksdb | 2 +- storage/rocksdb/CMakeLists.txt | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/rocksdb/t/range_locking.test b/mysql-test/suite/rocksdb/t/range_locking.test index 9ce2ac34fd8..5c599238a0a 100644 --- a/mysql-test/suite/rocksdb/t/range_locking.test +++ b/mysql-test/suite/rocksdb/t/range_locking.test @@ -2,4 +2,5 @@ --let pk_cf=default --let sk_cf=default ---source range_locking.inc \ No newline at end of file +--source range_locking.inc + diff --git a/rocksdb b/rocksdb index 515a27941a4..402758a0f68 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 515a27941a42018531354414eca661113da92957 +Subproject commit 402758a0f6899ec200860f13b5b606654cada766 diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index fb36bebe9cc..3cffa064130 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -40,8 +40,9 @@ ELSE() # Statically include all RocksDB source SET(ROCKSDB_SOURCES - ${CMAKE_SOURCE_DIR}/rocksdb/utilities/transactions/range_locking - ${CMAKE_SOURCE_DIR}/rocksdb/utilities/transactions/range_locking/portability + ${ROCKSDB_LIB_SOURCES} + ${CMAKE_SOURCE_DIR}/rocksdb/utilities/transactions/range_locking + ${CMAKE_SOURCE_DIR}/rocksdb/utilities/transactions/range_locking/portability ) ENDIF() @@ -49,6 +50,8 @@ INCLUDE_DIRECTORIES( ${ROCKSDB_ROOT} ${ROCKSDB_ROOT}/include ${ROCKSDB_ROOT}/third-party/gtest-1.8.1/fused-src + ${CMAKE_SOURCE_DIR}/rocksdb/utilities/transactions/range_locking + ${CMAKE_SOURCE_DIR}/rocksdb/utilities/transactions/range_locking/portability ) IF(UNIX) @@ -81,8 +84,6 @@ else() "MyRocks requires that feature.") endif() - - SET(ROCKSDB_SOURCES ${ROCKSDB_SOURCES} ha_rocksdb.cc ha_rocksdb.h ha_rocksdb_proto.h