diff --git a/cmake/find/rocksdb.cmake b/cmake/find/rocksdb.cmake index c476b86c9d1..1c055f7f54a 100644 --- a/cmake/find/rocksdb.cmake +++ b/cmake/find/rocksdb.cmake @@ -2,22 +2,20 @@ option(ENABLE_ROCKSDB "Enable ROCKSDB" ${ENABLE_LIBRARIES}) option(USE_INTERNAL_ROCKSDB_LIBRARY "Set to FALSE to use system ROCKSDB library instead of bundled" ${NOT_UNBUNDLED}) if(ENABLE_ROCKSDB) - if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/rocksdb") - message (WARNING "submodule contrib is missing. to fix try run: \n git submodule update --init --recursive") - set (USE_INTERNAL_ROCKSDB_LIBRARY 0) - set (MISSING_ROCKSDB 1) - endif () - if (USE_INTERNAL_ROCKSDB_LIBRARY AND NOT MISSING_ROCKSDB) set (ROCKSDB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb/include") set (ROCKSDB_CORE_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/rocksdb/include") set (ROCKSDB_LIBRARY "rocksdb") - set (USE_INTERNAL_ROCKSDB_LIBRARY 1) set (USE_ROCKSDB 1) else() find_package(ROCKSDB) endif () - endif() +if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/rocksdb/CMakeLists.txt") + message (WARNING "submodule contrib is missing. to fix try run: \n git submodule update --init --recursive") + set (USE_INTERNAL_ROCKSDB_LIBRARY 0) + set (MISSING_ROCKSDB 1) +endif () + message (STATUS "Using ROCKSDB=${USE_ROCKSDB}: ${ROCKSDB_INCLUDE_DIR} : ${ROCKSDB_LIBRARY}") \ No newline at end of file diff --git a/src/Storages/Rocksdb/StorageEmbeddedRocksdb.cpp b/src/Storages/Rocksdb/StorageEmbeddedRocksdb.cpp index 5a99ed716b6..a4832ec8edb 100644 --- a/src/Storages/Rocksdb/StorageEmbeddedRocksdb.cpp +++ b/src/Storages/Rocksdb/StorageEmbeddedRocksdb.cpp @@ -132,16 +132,6 @@ public: wb_value.restart(); } - - rocksdb::Iterator* it = storage.rocksdb_ptr->rocksdb->NewIterator(rocksdb::ReadOptions()); - for (it->SeekToFirst(); it->Valid(); it->Next()) - { - LOG_DEBUG(&Poco::Logger::get("StorageEmbeddedRocksdb"), "Iterator `{}` returns `{}`, {}", - it->key().ToString(), it->value().ToString(), it->key().size()); - } - // Check for any errors found during the scan - assert(it->status().ok()); - delete it; } private: