mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-22 07:31:57 +00:00
Bump rocksdb to v8.9.1
This commit is contained in:
parent
cebdc5ecf6
commit
d0bc728d52
2
contrib/rocksdb
vendored
2
contrib/rocksdb
vendored
@ -1 +1 @@
|
|||||||
Subproject commit fdf403f5918a2b4355cf75ebe5e21d0fc22db880
|
Subproject commit 49ce8a1064dd1ad89117899839bf136365e49e79
|
@ -1,6 +1,6 @@
|
|||||||
option (ENABLE_ROCKSDB "Enable RocksDB" ${ENABLE_LIBRARIES})
|
option (ENABLE_ROCKSDB "Enable RocksDB" ${ENABLE_LIBRARIES})
|
||||||
|
|
||||||
if (NOT ENABLE_ROCKSDB)
|
if (NOT ENABLE_ROCKSDB OR NO_SSE3_OR_HIGHER) # assumes SSE4.2 and PCLMUL
|
||||||
message (STATUS "Not using RocksDB")
|
message (STATUS "Not using RocksDB")
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
@ -39,13 +39,6 @@ if(WITH_ZSTD)
|
|||||||
list(APPEND THIRDPARTY_LIBS ch_contrib::zstd)
|
list(APPEND THIRDPARTY_LIBS ch_contrib::zstd)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_definitions(-DROCKSDB_PORTABLE)
|
|
||||||
|
|
||||||
if(ENABLE_SSE42 AND ENABLE_PCLMULQDQ)
|
|
||||||
add_definitions(-DHAVE_SSE42)
|
|
||||||
add_definitions(-DHAVE_PCLMUL)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
|
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
|
||||||
set (HAS_ARMV8_CRC 1)
|
set (HAS_ARMV8_CRC 1)
|
||||||
# the original build descriptions set specific flags for ARM. These flags are already subsumed by ClickHouse's general
|
# the original build descriptions set specific flags for ARM. These flags are already subsumed by ClickHouse's general
|
||||||
@ -91,7 +84,9 @@ set(SOURCES
|
|||||||
${ROCKSDB_SOURCE_DIR}/cache/compressed_secondary_cache.cc
|
${ROCKSDB_SOURCE_DIR}/cache/compressed_secondary_cache.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/cache/lru_cache.cc
|
${ROCKSDB_SOURCE_DIR}/cache/lru_cache.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/cache/secondary_cache.cc
|
${ROCKSDB_SOURCE_DIR}/cache/secondary_cache.cc
|
||||||
|
${ROCKSDB_SOURCE_DIR}/cache/secondary_cache_adapter.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/cache/sharded_cache.cc
|
${ROCKSDB_SOURCE_DIR}/cache/sharded_cache.cc
|
||||||
|
${ROCKSDB_SOURCE_DIR}/cache/tiered_secondary_cache.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/arena_wrapped_db_iter.cc
|
${ROCKSDB_SOURCE_DIR}/db/arena_wrapped_db_iter.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/blob/blob_contents.cc
|
${ROCKSDB_SOURCE_DIR}/db/blob/blob_contents.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/blob/blob_fetcher.cc
|
${ROCKSDB_SOURCE_DIR}/db/blob/blob_fetcher.cc
|
||||||
@ -174,9 +169,11 @@ set(SOURCES
|
|||||||
${ROCKSDB_SOURCE_DIR}/db/wal_manager.cc
|
${ROCKSDB_SOURCE_DIR}/db/wal_manager.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/wide/wide_column_serialization.cc
|
${ROCKSDB_SOURCE_DIR}/db/wide/wide_column_serialization.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/wide/wide_columns.cc
|
${ROCKSDB_SOURCE_DIR}/db/wide/wide_columns.cc
|
||||||
|
${ROCKSDB_SOURCE_DIR}/db/wide/wide_columns_helper.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/write_batch.cc
|
${ROCKSDB_SOURCE_DIR}/db/write_batch.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/write_batch_base.cc
|
${ROCKSDB_SOURCE_DIR}/db/write_batch_base.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/write_controller.cc
|
${ROCKSDB_SOURCE_DIR}/db/write_controller.cc
|
||||||
|
${ROCKSDB_SOURCE_DIR}/db/write_stall_stats.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/db/write_thread.cc
|
${ROCKSDB_SOURCE_DIR}/db/write_thread.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/env/composite_env.cc
|
${ROCKSDB_SOURCE_DIR}/env/composite_env.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/env/env.cc
|
${ROCKSDB_SOURCE_DIR}/env/env.cc
|
||||||
@ -229,6 +226,7 @@ set(SOURCES
|
|||||||
${ROCKSDB_SOURCE_DIR}/options/configurable.cc
|
${ROCKSDB_SOURCE_DIR}/options/configurable.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/options/customizable.cc
|
${ROCKSDB_SOURCE_DIR}/options/customizable.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/options/db_options.cc
|
${ROCKSDB_SOURCE_DIR}/options/db_options.cc
|
||||||
|
${ROCKSDB_SOURCE_DIR}/options/offpeak_time_info.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/options/options.cc
|
${ROCKSDB_SOURCE_DIR}/options/options.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/options/options_helper.cc
|
${ROCKSDB_SOURCE_DIR}/options/options_helper.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/options/options_parser.cc
|
${ROCKSDB_SOURCE_DIR}/options/options_parser.cc
|
||||||
@ -268,6 +266,7 @@ set(SOURCES
|
|||||||
${ROCKSDB_SOURCE_DIR}/table/get_context.cc
|
${ROCKSDB_SOURCE_DIR}/table/get_context.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/table/iterator.cc
|
${ROCKSDB_SOURCE_DIR}/table/iterator.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/table/merging_iterator.cc
|
${ROCKSDB_SOURCE_DIR}/table/merging_iterator.cc
|
||||||
|
${ROCKSDB_SOURCE_DIR}/table/compaction_merging_iterator.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/table/meta_blocks.cc
|
${ROCKSDB_SOURCE_DIR}/table/meta_blocks.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/table/persistent_cache_helper.cc
|
${ROCKSDB_SOURCE_DIR}/table/persistent_cache_helper.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_bloom.cc
|
${ROCKSDB_SOURCE_DIR}/table/plain/plain_table_bloom.cc
|
||||||
@ -323,6 +322,8 @@ set(SOURCES
|
|||||||
${ROCKSDB_SOURCE_DIR}/util/string_util.cc
|
${ROCKSDB_SOURCE_DIR}/util/string_util.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/util/thread_local.cc
|
${ROCKSDB_SOURCE_DIR}/util/thread_local.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/util/threadpool_imp.cc
|
${ROCKSDB_SOURCE_DIR}/util/threadpool_imp.cc
|
||||||
|
${ROCKSDB_SOURCE_DIR}/util/udt_util.cc
|
||||||
|
${ROCKSDB_SOURCE_DIR}/util/write_batch_util.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/util/xxhash.cc
|
${ROCKSDB_SOURCE_DIR}/util/xxhash.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/utilities/agg_merge/agg_merge.cc
|
${ROCKSDB_SOURCE_DIR}/utilities/agg_merge/agg_merge.cc
|
||||||
${ROCKSDB_SOURCE_DIR}/utilities/backup/backup_engine.cc
|
${ROCKSDB_SOURCE_DIR}/utilities/backup/backup_engine.cc
|
||||||
@ -405,12 +406,6 @@ set(SOURCES
|
|||||||
${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/range/range_tree/lib/util/memarena.cc
|
${ROCKSDB_SOURCE_DIR}/utilities/transactions/lock/range/range_tree/lib/util/memarena.cc
|
||||||
build_version.cc) # generated by hand
|
build_version.cc) # generated by hand
|
||||||
|
|
||||||
if(ENABLE_SSE42 AND ENABLE_PCLMULQDQ)
|
|
||||||
set_source_files_properties(
|
|
||||||
"${ROCKSDB_SOURCE_DIR}/util/crc32c.cc"
|
|
||||||
PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
|
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
|
||||||
list(APPEND SOURCES
|
list(APPEND SOURCES
|
||||||
"${ROCKSDB_SOURCE_DIR}/util/crc32c_ppc.c"
|
"${ROCKSDB_SOURCE_DIR}/util/crc32c_ppc.c"
|
||||||
|
@ -111,10 +111,13 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
using Implementation = testing::Types<TestParam<DB::KeeperMemoryStorage, true>,
|
using Implementation = testing::Types<TestParam<DB::KeeperMemoryStorage, true>
|
||||||
TestParam<DB::KeeperMemoryStorage, false>,
|
,TestParam<DB::KeeperMemoryStorage, false>
|
||||||
TestParam<DB::KeeperRocksStorage, true>,
|
#if USE_ROCKSDB
|
||||||
TestParam<DB::KeeperRocksStorage, false>>;
|
,TestParam<DB::KeeperRocksStorage, true>
|
||||||
|
,TestParam<DB::KeeperRocksStorage, false>
|
||||||
|
#endif
|
||||||
|
>;
|
||||||
TYPED_TEST_SUITE(CoordinationTest, Implementation);
|
TYPED_TEST_SUITE(CoordinationTest, Implementation);
|
||||||
|
|
||||||
TYPED_TEST(CoordinationTest, RaftServerConfigParse)
|
TYPED_TEST(CoordinationTest, RaftServerConfigParse)
|
||||||
|
Loading…
Reference in New Issue
Block a user