@nxtedition/rocksdb 10.0.13 → 10.0.15

package/.tap/test-results/test/batch-test.js.tap

@@ -0,0 +1,12 @@
+TAP version 13
+# setUp db
+# test batch iterate
+ok 1 should be deeply equivalent
+# tearDown
+
+1..1
+# tests 1
+# pass  1
+
+# ok
+

package/.tap/test-results/test/chained-batch-gc-test.js.tap

@@ -0,0 +1,11 @@
+TAP version 13
+# chained batch without ref does not get GCed before write
+ok 1 no open error
+ok 2 no error from write()
+
+1..2
+# tests 2
+# pass  2
+
+# ok
+

package/.tap/test-results/test/cleanup-hanging-iterators-test.js.tap

@@ -0,0 +1,58 @@
+TAP version 13
+# test closed iterator
+ok 1 no error from open()
+ok 2 no error from batch()
+ok 3 no error from next()
+ok 4 correct key
+ok 5 correct value
+ok 6 no error from close()
+ok 7 no error from done()
+ok 8 no error from close()
+# test likely-closed iterator
+ok 9 no error from open()
+ok 10 no error from batch()
+ok 11 no error from next()
+ok 12 correct key
+ok 13 correct value
+ok 14 no error from done()
+ok 15 no error from close()
+# test non-closed iterator
+ok 16 no error from open()
+ok 17 no error from batch()
+ok 18 no error from next()
+ok 19 correct key
+ok 20 correct value
+ok 21 no error from done()
+ok 22 no error from close()
+# test multiple likely-closed iterators
+ok 23 no error from open()
+ok 24 no error from batch()
+ok 25 no error from done()
+ok 26 no error from close()
+# test multiple non-closed iterators
+ok 27 no error from open()
+ok 28 no error from batch()
+ok 29 no error from done()
+ok 30 no error from close()
+# test closing iterators
+ok 31 no error from open()
+ok 32 no error from batch()
+ok 33 no error from done()
+ok 34 no error from close()
+# test recursive next
+ok 35 no error from open()
+ok 36 no error from batch()
+ok 37 no error from done()
+ok 38 no error from close()
+# test recursive next (random)
+ok 39 no error from open()
+ok 40 no error from batch()
+ok 41 no error from done()
+ok 42 no error from close()
+
+1..42
+# tests 42
+# pass  42
+
+# ok
+

package/.tap/test-results/test/clear-gc-test.js.tap

@@ -0,0 +1,13 @@
+TAP version 13
+# db without ref does not get GCed while clear() is in progress
+ok 1 no open error
+ok 2 no batch error
+ok 3 got callback
+ok 4 (unnamed assert)
+
+1..4
+# tests 4
+# pass  4
+
+# ok
+

package/.tap/test-results/test/column-test.js.tap

@@ -0,0 +1,55 @@
+TAP version 13
+# test chained-batch
+ok 1 should be truthy
+ok 2 should be strictly equal
+ok 3 should be strictly equal
+ok 4 should be strictly equal
+ok 5 should be strictly equal
+ok 6 should be deeply equivalent
+ok 7 should be deeply equivalent
+ok 8 should be deeply equivalent
+ok 9 should be deeply equivalent
+# test batch
+ok 10 should be truthy
+ok 11 should be strictly equal
+ok 12 should be strictly equal
+ok 13 should be strictly equal
+ok 14 should be strictly equal
+ok 15 should be deeply equivalent
+ok 16 should be deeply equivalent
+ok 17 should be deeply equivalent
+ok 18 should be deeply equivalent
+# test chained-batch 2
+ok 19 should be truthy
+ok 20 should be truthy
+ok 21 should be truthy
+ok 22 should be truthy
+ok 23 should be truthy
+ok 24 should be deeply equivalent
+ok 25 should be strictly equal
+ok 26 should be strictly equal
+ok 27 should be strictly equal
+ok 28 should be strictly equal
+ok 29 should be deeply equivalent
+ok 30 should be deeply equivalent
+ok 31 should be deeply equivalent
+ok 32 should be deeply equivalent
+ok 33 should be truthy
+ok 34 should be truthy
+# test batch 2
+ok 35 should be truthy
+ok 36 should be strictly equal
+ok 37 should be strictly equal
+ok 38 should be strictly equal
+ok 39 should be strictly equal
+ok 40 should be deeply equivalent
+ok 41 should be deeply equivalent
+ok 42 should be deeply equivalent
+ok 43 should be deeply equivalent
+
+1..43
+# tests 43
+# pass  43
+
+# ok
+

package/.tap/test-results/test/compression-test.js.tap

@@ -0,0 +1,30 @@
+TAP version 13
+# compression
+# test data is compressed by default (db.put())
+ok 1 undefined
+ok 2 undefined
+ok 3 undefined
+ok 4 undefined
+ok 5 null
+ok 6 on-disk size (17175) is less than data size (10240000)
+# test data is not compressed with compression=false on open() (db.put())
+ok 7 undefined
+ok 8 undefined
+ok 9 undefined
+ok 10 undefined
+ok 11 null
+ok 12 on-disk size (10256650) is greater than data size (10240000)
+# test data is compressed by default (db.batch())
+ok 13 undefined
+ok 14 undefined
+ok 15 undefined
+ok 16 undefined
+ok 17 null
+ok 18 on-disk size (17175) is less than data size (10240000)
+
+1..18
+# tests 18
+# pass  18
+
+# ok
+

package/.tap/test-results/test/db-identity.js.tap

@@ -0,0 +1,12 @@
+TAP version 13
+# setUp db
+# test identity()
+ok 1 should be truthy
+# tearDown
+
+1..1
+# tests 1
+# pass  1
+
+# ok
+

package/.tap/test-results/test/env-cleanup-hook-test.js.tap

@@ -0,0 +1,2 @@
+TAP version 13
+# cleanup on environment exit (create)

package/.tap/test-results/test/getproperty-test.js.tap

@@ -0,0 +1,29 @@
+TAP version 13
+# setUp db
+# test argument-less getProperty() throws
+ok 1 should throw
+# test non-string getProperty() throws
+ok 2 should throw
+# test invalid getProperty() returns empty string
+ok 3 invalid property
+ok 4 invalid rocksdb.* property
+# test invalid getProperty("rocksdb.num-files-at-levelN") returns numbers
+ok 5 "rocksdb.num-files-at-levelN" === "0"
+ok 6 "rocksdb.num-files-at-levelN" === "0"
+ok 7 "rocksdb.num-files-at-levelN" === "0"
+ok 8 "rocksdb.num-files-at-levelN" === "0"
+ok 9 "rocksdb.num-files-at-levelN" === "0"
+ok 10 "rocksdb.num-files-at-levelN" === "0"
+ok 11 "rocksdb.num-files-at-levelN" === "0"
+# test invalid getProperty("rocksdb.stats")
+ok 12 rocksdb.stats has > 3 newlines
+# tearDown
+# getProperty() throws if db is closed
+ok 13 should throw
+
+1..13
+# tests 13
+# pass  13
+
+# ok
+

package/.tap/test-results/test/iterator-gc-test.js.tap

@@ -0,0 +1,4 @@
+TAP version 13
+# db without ref does not get GCed while iterating
+ok 1 no open error
+ok 2 no batch error

package/.tap/test-results/test/iterator-hwm-test.js.tap

@@ -0,0 +1,24 @@
+TAP version 13
+# highWaterMarkBytes setup
+# highWaterMarkBytes limits byte length of nextv() entries
+ok 1 accepts 0
+ok 2 Infinity is interpreted as 0 (by Node-API)
+ok 3 is limited
+ok 4 highWaterMarkBytes must be exceeded, not met
+# highWaterMarkBytes limits byte length of internal next() cache
+ok 5 accepts 0
+ok 6 Infinity is interpreted as 0 (by Node-API)
+ok 7 is limited
+ok 8 highWaterMarkBytes must be exceeded, not met
+ok 9 double-check that previous test did apply a limit
+# highWaterMarkBytes does not affect byte length of all() entries
+ok 10 should be deeply equivalent
+ok 11 should be deeply equivalent
+# highWaterMarkBytes teardown
+
+1..11
+# tests 11
+# pass  11
+
+# ok
+

package/.tap/test-results/test/iterator-recursion-test.js.tap

@@ -0,0 +1,12 @@
+TAP version 13
+# setUp db
+ok 1 undefined
+# iterate over a large iterator with a large watermark
+# tearDown
+
+1..1
+# tests 1
+# pass  1
+
+# ok
+

package/.tap/test-results/test/iterator-starvation-test.js.tap

@@ -0,0 +1,2 @@
+TAP version 13
+# iterator does not starve event loop

package/.tap/test-results/test/max-rev-merge.js.tap

@@ -1,12 +0,0 @@
-TAP version 13
-# setUp db
-# max rev
-ok 1 should be deeply equivalent
-# tearDown
-
-1..1
-# tests 1
-# pass  1
-
-# ok
-

package/binding.cc

@@ -966,7 +966,7 @@ NAPI_METHOD(db_get_many) {
   Database* database;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
 
-  std::vector<std::string> keys;
+  std::vector<rocksdb::Slice> keys;
   {
     uint32_t length;
     NAPI_STATUS_THROWS(napi_get_array_length(env, argv[1], &length));
@@ -975,15 +975,17 @@ NAPI_METHOD(db_get_many) {
     for (uint32_t n = 0; n < length; n++) {
       napi_value element;
       NAPI_STATUS_THROWS(napi_get_element(env, argv[1], n, &element));
-      NAPI_STATUS_THROWS(GetValue(env, element, keys[n]));
+
+      char* buf = nullptr;
+      size_t length = 0;
+      NAPI_STATUS_THROWS(napi_get_buffer_info(env, element, reinterpret_cast<void**>(&buf), &length));
+
+			keys[n] = { buf, length };
     }
   }
 
   const auto options = argv[2];
 
-  Encoding valueEncoding = Encoding::String;
-  NAPI_STATUS_THROWS(GetProperty(env, options, "valueEncoding", valueEncoding));
-
   bool fillCache = true;
   NAPI_STATUS_THROWS(GetProperty(env, options, "fillCache", fillCache));
 
@@ -1010,17 +1012,12 @@ NAPI_METHOD(db_get_many) {
 
         const auto size = keys.size();
 
-        std::vector<rocksdb::Slice> keys2;
-        keys2.reserve(size);
-        for (const auto& key : keys) {
-          keys2.emplace_back(key);
-        }
         std::vector<rocksdb::Status> statuses;
 
         statuses.resize(size);
         values.resize(size);
 
-        database->db->MultiGet(readOptions, column, size, keys2.data(), values.data(), statuses.data());
+        database->db->MultiGet(readOptions, column, size, keys.data(), values.data(), statuses.data());
 
         for (size_t idx = 0; idx < size; idx++) {
           if (statuses[idx].IsNotFound()) {
@@ -1040,7 +1037,8 @@ NAPI_METHOD(db_get_many) {
         for (size_t idx = 0; idx < values.size(); idx++) {
           napi_value element;
           if (values[idx].GetSelf()) {
-            NAPI_STATUS_RETURN(Convert(env, &values[idx], valueEncoding, element));
+						auto ptr = new rocksdb::PinnableSlice(std::move(values[idx]));
+						NAPI_STATUS_RETURN(napi_create_external_buffer(env, ptr->size(), const_cast<char*>(ptr->data()), Finalize<rocksdb::PinnableSlice>, ptr, &element));
           } else {
             NAPI_STATUS_RETURN(napi_get_undefined(env, &element));
           }
@@ -1551,6 +1549,8 @@ NAPI_METHOD(batch_clear) {
 NAPI_METHOD(batch_write) {
   NAPI_ARGV(4);
 
+	napi_value result = 0;
+
   Database* database;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
 
@@ -1566,29 +1566,37 @@ NAPI_METHOD(batch_write) {
   bool lowPriority = false;
   NAPI_STATUS_THROWS(GetProperty(env, options, "lowPriority", lowPriority));
 
-  napi_ref batchRef;
-  NAPI_STATUS_THROWS(napi_create_reference(env, argv[1], 1, &batchRef));
-
-  runAsync<int64_t>(
-      "leveldown.batch.write", env, callback,
-      [=](int64_t& seq) {
-        rocksdb::WriteOptions writeOptions;
-        writeOptions.sync = sync;
-        writeOptions.low_pri = lowPriority;
-
-        // TODO (fix): Better way to get batch sequence?
-        seq = database->db->GetLatestSequenceNumber() + 1;
-
-        return database->db->Write(writeOptions, batch);
-      },
-      [=](int64_t& seq, auto env, auto& argv) {
-        argv.resize(2);
-        NAPI_STATUS_RETURN(napi_delete_reference(env, batchRef));
-        NAPI_STATUS_RETURN(napi_create_int64(env, seq, &argv[1]));
-        return napi_ok;
-      });
+	rocksdb::WriteOptions writeOptions;
+	writeOptions.sync = sync;
+	writeOptions.low_pri = lowPriority;
+	writeOptions.no_slowdown = true;
+
+	const auto status = database->db->Write(writeOptions, batch);
+
+	if (status == rocksdb::Status::Incomplete()) {
+		napi_ref batchRef;
+		NAPI_STATUS_THROWS(napi_create_reference(env, argv[1], 1, &batchRef));
+
+		runAsync<int64_t>(
+				"leveldown.batch.write", env, callback,
+				[=](int64_t& seq) {
+					rocksdb::WriteOptions writeOptions;
+					writeOptions.sync = sync;
+					writeOptions.low_pri = lowPriority;
+					return database->db->Write(writeOptions, batch);
+				},
+				[=](int64_t& seq, auto env, auto& argv) {
+					NAPI_STATUS_RETURN(napi_delete_reference(env, batchRef));
+					return napi_ok;
+				});
+
+		NAPI_STATUS_THROWS(napi_get_boolean(env, false, &result));
+	} else {
+		ROCKS_STATUS_THROWS_NAPI(status);
+		NAPI_STATUS_THROWS(napi_get_boolean(env, true, &result));
+	}
 
-  return 0;
+  return result;
 }
 
 NAPI_METHOD(batch_put_log_data) {

package/deps/rocksdb/rocksdb/CMakeLists.txt

@@ -44,6 +44,29 @@ project(rocksdb
   HOMEPAGE_URL https://rocksdb.org/
   LANGUAGES CXX C ASM)
 
+if(APPLE)
+  # On macOS Cmake, when cross-compiling, sometimes CMAKE_SYSTEM_PROCESSOR wrongfully stays
+  # the same as CMAKE_HOST_SYSTEM_PROCESSOR regardless the target CPU.
+  # The manual call to  set(CMAKE_SYSTEM_PROCESSOR) has to be set after the project() call.
+  # because project() might reset CMAKE_SYSTEM_PROCESSOR back to the value of CMAKE_HOST_SYSTEM_PROCESSOR.
+  # Check if CMAKE_SYSTEM_PROCESSOR is not equal to CMAKE_OSX_ARCHITECTURES
+  if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "")
+    if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_OSX_ARCHITECTURES)
+      # Split CMAKE_OSX_ARCHITECTURES into a list
+      string(REPLACE ";" " " ARCH_LIST ${CMAKE_OSX_ARCHITECTURES})
+      separate_arguments(ARCH_LIST UNIX_COMMAND ${ARCH_LIST})
+      # Count the number of architectures
+      list(LENGTH ARCH_LIST ARCH_COUNT)
+      # Ensure that exactly one architecture is specified
+      if(NOT ARCH_COUNT EQUAL 1)
+          message(FATAL_ERROR "CMAKE_OSX_ARCHITECTURES must have exactly one value. Current value: ${CMAKE_OSX_ARCHITECTURES}")
+      endif()
+      set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_OSX_ARCHITECTURES})
+      message(STATUS "CMAKE_SYSTEM_PROCESSOR is manually set to ${CMAKE_SYSTEM_PROCESSOR}")
+    endif()
+  endif()
+endif()
+
 if(POLICY CMP0042)
   cmake_policy(SET CMP0042 NEW)
 endif()
@@ -76,11 +99,6 @@ if (WITH_WINDOWS_UTF8_FILENAMES)
 endif()
 option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
 
-if ($ENV{CIRCLECI})
-  message(STATUS "Build for CircieCI env, a few tests may be disabled")
-  add_definitions(-DCIRCLECI)
-endif()
-
 if( NOT DEFINED CMAKE_CXX_STANDARD )
   set(CMAKE_CXX_STANDARD 17)
 endif()
@@ -171,7 +189,7 @@ else()
   if(WITH_ZSTD)
     find_package(zstd REQUIRED)
     add_definitions(-DZSTD)
-    include_directories(${ZSTD_INCLUDE_DIR})
+    include_directories(${ZSTD_INCLUDE_DIRS})
     list(APPEND THIRDPARTY_LIBS zstd::zstd)
   endif()
 endif()
@@ -187,7 +205,7 @@ endif()
 
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4800 /wd4996 /wd4351 /wd4100 /wd4204 /wd4324")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4996 /wd4100 /wd4324")
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wextra -Wall -pthread")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare -Wshadow -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-invalid-offsetof")
@@ -196,6 +214,7 @@ else()
   endif()
   if(MINGW)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
     add_definitions(-D_POSIX_C_SOURCE=1)
   endif()
   if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -376,7 +395,7 @@ option(WITH_NUMA "build with NUMA policy support" OFF)
 if(WITH_NUMA)
   find_package(NUMA REQUIRED)
   add_definitions(-DNUMA)
-  include_directories(${NUMA_INCLUDE_DIR})
+  include_directories(${NUMA_INCLUDE_DIRS})
   list(APPEND THIRDPARTY_LIBS NUMA::NUMA)
 endif()
 
@@ -634,6 +653,7 @@ set(SOURCES
         cache/sharded_cache.cc
         cache/tiered_secondary_cache.cc
         db/arena_wrapped_db_iter.cc
+        db/attribute_group_iterator_impl.cc
         db/blob/blob_contents.cc
         db/blob/blob_fetcher.cc
         db/blob/blob_file_addition.cc
@@ -650,6 +670,7 @@ set(SOURCES
         db/blob/prefetch_buffer_collection.cc
         db/builder.cc
         db/c.cc
+        db/coalescing_iterator.cc
         db/column_family.cc
         db/compaction/compaction.cc
         db/compaction/compaction_iterator.cc
@@ -772,6 +793,7 @@ set(SOURCES
         options/configurable.cc
         options/customizable.cc
         options/db_options.cc
+        options/offpeak_time_info.cc
         options/options.cc
         options/options_helper.cc
         options/options_parser.cc
@@ -933,6 +955,7 @@ set(SOURCES
         utilities/transactions/write_prepared_txn_db.cc
         utilities/transactions/write_unprepared_txn.cc
         utilities/transactions/write_unprepared_txn_db.cc
+        utilities/types_util.cc
         utilities/ttl/db_ttl_impl.cc
         utilities/wal_filter.cc
         utilities/write_batch_with_index/write_batch_with_index.cc
@@ -1014,8 +1037,10 @@ endif()
 
 else()
   list(APPEND SOURCES
+    db/db_impl/db_impl_follower.cc
     port/port_posix.cc
     env/env_posix.cc
+    env/fs_on_demand.cc
     env/fs_posix.cc
     env/io_posix.cc)
 endif()
@@ -1105,11 +1130,15 @@ set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc)
 configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)
 
 add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
+target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
 target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
   ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
 
 if(ROCKSDB_BUILD_SHARED)
   add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC})
+  target_include_directories(${ROCKSDB_SHARED_LIB} PUBLIC
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
   target_link_libraries(${ROCKSDB_SHARED_LIB} PRIVATE
     ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
 
@@ -1336,6 +1365,7 @@ if(WITH_TESTS)
         db/file_indexer_test.cc
         db/filename_test.cc
         db/flush_job_test.cc
+        db/db_follower_test.cc
         db/import_column_family_test.cc
         db/listener_test.cc
         db/log_test.cc
@@ -1343,6 +1373,7 @@ if(WITH_TESTS)
         db/memtable_list_test.cc
         db/merge_helper_test.cc
         db/merge_test.cc
+        db/multi_cf_iterator_test.cc
         db/options_file_test.cc
         db/perf_context_test.cc
         db/periodic_task_scheduler_test.cc
@@ -1423,6 +1454,7 @@ if(WITH_TESTS)
         util/ribbon_test.cc
         util/slice_test.cc
         util/slice_transform_test.cc
+        util/string_util_test.cc
         util/timer_queue_test.cc
         util/timer_test.cc
         util/thread_list_test.cc
@@ -1457,6 +1489,7 @@ if(WITH_TESTS)
         utilities/transactions/lock/range/range_locking_test.cc
         utilities/transactions/timestamped_snapshot_test.cc
         utilities/ttl/ttl_test.cc
+        utilities/types_util_test.cc
         utilities/util_merge_operators_test.cc
         utilities/write_batch_with_index/write_batch_with_index_test.cc
 	${PLUGIN_TESTS}
@@ -1472,7 +1505,7 @@ if(WITH_TESTS)
       utilities/cassandra/test_utils.cc
   )
   enable_testing()
-  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
+  add_custom_target(rocksdb_check COMMAND ${CMAKE_CTEST_COMMAND})
   set(TESTUTILLIB testutillib${ARTIFACT_SUFFIX})
   add_library(${TESTUTILLIB} STATIC ${TESTUTIL_SOURCE})
   target_link_libraries(${TESTUTILLIB} ${ROCKSDB_LIB} ${FOLLY_LIBS})
@@ -1497,7 +1530,7 @@ if(WITH_TESTS)
       target_link_libraries(${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} testharness gtest ${THIRDPARTY_LIBS} ${ROCKSDB_LIB})
       if(NOT "${exename}" MATCHES "db_sanity_test")
         gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120)
-        add_dependencies(check ${exename}${ARTIFACT_SUFFIX})
+        add_dependencies(rocksdb_check ${exename}${ARTIFACT_SUFFIX})
       endif()
   endforeach(sourcefile ${TESTS})
 
@@ -1517,7 +1550,7 @@ if(WITH_TESTS)
     add_executable(c_test db/c_test.c)
     target_link_libraries(c_test ${ROCKSDB_LIB_FOR_C} testharness)
     add_test(NAME c_test COMMAND c_test${ARTIFACT_SUFFIX})
-    add_dependencies(check c_test)
+    add_dependencies(rocksdb_check c_test)
   endif()
 endif()
 
@@ -1596,6 +1629,3 @@ option(WITH_BENCHMARK "build benchmark tests" OFF)
 if(WITH_BENCHMARK)
   add_subdirectory(${PROJECT_SOURCE_DIR}/microbench/)
 endif()
-
-target_include_directories(${PROJECT_NAME} PUBLIC
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)