@nxtedition/rocksdb 8.2.0-alpha.2 → 8.2.1

package/binding.cc

@@ -18,9 +18,6 @@
 #include <rocksdb/table.h>
 #include <rocksdb/write_batch.h>
 
-#include <liburing.h>
-#include <sys/uio.h>
-
 #include <iostream>
 #include <memory>
 #include <optional>
@@ -471,33 +468,7 @@ static void FinalizeDatabase(napi_env env, void* data, void* hint) {
   }
 }
 
-inline void DeleteIOUring(void* p) {
-  struct io_uring* iu = static_cast<struct io_uring*>(p);
-  delete iu;
-}
-
-const unsigned int kIoUringDepth = 256;
-inline struct io_uring* CreateIOUring() {
-  struct io_uring* new_io_uring = new struct io_uring;
-  int ret = io_uring_queue_init(kIoUringDepth, new_io_uring, 0);
-  if (ret) {
-    delete new_io_uring;
-    new_io_uring = nullptr;
-  }
-  return new_io_uring;
-}
-
 NAPI_METHOD(db_init) {
-	// Ensure io_uring works.
-	{
-		io_uring new_io_uring = {};
-		auto ret = io_uring_queue_init(256, &new_io_uring, 0);
-		if (ret) {
-			ROCKS_STATUS_THROWS_NAPI(rocksdb::Status::NotSupported("ioring not supported"));
-		}
-		io_uring_queue_exit(&new_io_uring);
-	}
-
   auto database = new Database();
   napi_add_env_cleanup_hook(env, env_cleanup_hook, database);
 
@@ -671,8 +642,8 @@ NAPI_METHOD(db_get_merge_operands) {
   Database* database;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
 
-	std::string key;
-	NAPI_STATUS_THROWS(GetValue(env, argv[1], key));
+  std::string key;
+  NAPI_STATUS_THROWS(GetValue(env, argv[1], key));
 
   const auto options = argv[2];
 
@@ -689,22 +660,16 @@ NAPI_METHOD(db_get_merge_operands) {
       [=, key = std::move(key)](auto& values) {
         rocksdb::ReadOptions readOptions;
 
-				values.resize(16); // TODO (fix): Make option
+        values.resize(16);  // TODO (fix): Make option
 
-				rocksdb::GetMergeOperandsOptions mergeOperandsOptions;
-				mergeOperandsOptions.expected_max_number_of_operands = values.size();
+        rocksdb::GetMergeOperandsOptions mergeOperandsOptions;
+        mergeOperandsOptions.expected_max_number_of_operands = values.size();
 
-  			int size = 0;
-				const auto status = database->db->GetMergeOperands(
-					readOptions,
-					column,
-					key,
-					values.data(),
-					&mergeOperandsOptions,
-					&size
-				);
+        int size = 0;
+        const auto status =
+            database->db->GetMergeOperands(readOptions, column, key, values.data(), &mergeOperandsOptions, &size);
 
-				values.resize(size);
+        values.resize(size);
 
         return status;
       },
@@ -1594,55 +1559,6 @@ NAPI_METHOD(batch_iterate) {
   return result;
 }
 
-NAPI_METHOD(db_get_sorted_wal_files) {
-  NAPI_ARGV(3);
-
-  Database* database;
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
-
-  auto callback = argv[1];
-
-  runAsync<rocksdb::VectorLogPtr>(
-      "leveldown.open", env, callback, [=](auto& files) { return database->db->GetSortedWalFiles(files); },
-      [=](auto& files, auto env, auto& argv) {
-        argv.resize(2);
-
-        const auto size = files.size();
-        NAPI_STATUS_RETURN(napi_create_array_with_length(env, size, &argv[1]));
-
-        for (size_t n = 0; n < size; ++n) {
-          napi_value element;
-          NAPI_STATUS_RETURN(napi_create_object(env, &element));
-
-          napi_value pathName;
-          NAPI_STATUS_RETURN(napi_create_string_utf8(env, files[n]->PathName().data(), NAPI_AUTO_LENGTH, &pathName))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "pathName", pathName));
-
-          napi_value logNumber;
-          NAPI_STATUS_RETURN(napi_create_int32(env, files[n]->LogNumber(), &logNumber))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "logNumber", logNumber));
-
-          napi_value type;
-          NAPI_STATUS_RETURN(napi_create_int32(env, files[n]->Type(), &type))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "type", type));
-
-          napi_value startSequence;
-          NAPI_STATUS_RETURN(napi_create_int64(env, files[n]->StartSequence(), &startSequence))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "startSequence", startSequence));
-
-          napi_value sizeFileBytes;
-          NAPI_STATUS_RETURN(napi_create_int64(env, files[n]->SizeFileBytes(), &sizeFileBytes))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "sizeFileBytes", sizeFileBytes));
-
-          NAPI_STATUS_RETURN(napi_set_element(env, argv[1], n, element));
-        }
-
-        return napi_ok;
-      });
-
-  return 0;
-}
-
 NAPI_METHOD(db_flush_wal) {
   NAPI_ARGV(3);
 
@@ -1672,7 +1588,6 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(db_clear);
   NAPI_EXPORT_FUNCTION(db_get_property);
   NAPI_EXPORT_FUNCTION(db_get_latest_sequence);
-  NAPI_EXPORT_FUNCTION(db_get_sorted_wal_files);
   NAPI_EXPORT_FUNCTION(db_flush_wal);
   NAPI_EXPORT_FUNCTION(db_get_merge_operands);
 

package/binding.gyp

@@ -15,9 +15,6 @@
                             "-mbmi",
                             "-mlzcnt"
                         ],
-						"dependencies": [
-							"./deps/liburing/liburing.gyp:liburing"
-						],
 						"include_dirs": [
 							"/usr/lib/x86_64-linux-gnu/include",
 							"/usr/lib/include",

package/deps/rocksdb/rocksdb/CMakeLists.txt

@@ -253,33 +253,10 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64")
   endif(HAS_LOONGARCH64)
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64")
 
-option(PORTABLE "build a portable binary" OFF)
-option(FORCE_SSE42 "force building with SSE4.2, even when PORTABLE=ON" OFF)
-option(FORCE_AVX "force building with AVX, even when PORTABLE=ON" OFF)
-option(FORCE_AVX2 "force building with AVX2, even when PORTABLE=ON" OFF)
-if(PORTABLE)
-  add_definitions(-DROCKSDB_PORTABLE)
-
-  # MSVC does not need a separate compiler flag to enable SSE4.2; if nmmintrin.h
-  # is available, it is available by default.
-  if(FORCE_SSE42 AND NOT MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mpclmul")
-  endif()
-  if(MSVC)
-    if(FORCE_AVX)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX")
-    endif()
-    # MSVC automatically enables BMI / lzcnt with AVX2.
-    if(FORCE_AVX2)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
-    endif()
-  else()
-    if(FORCE_AVX)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
-    endif()
-    if(FORCE_AVX2)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2 -mbmi -mlzcnt")
-    endif()
+set(PORTABLE 0 CACHE STRING "Minimum CPU arch to support, or 0 = current CPU, 1 = baseline CPU")
+if(PORTABLE STREQUAL 1)
+  # Usually nothing to do; compiler default is typically the most general
+  if(NOT MSVC)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390x")
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=z196")
     endif()
@@ -287,10 +264,21 @@ if(PORTABLE)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=loongarch64")
     endif()
   endif()
+elseif(PORTABLE MATCHES [^0]+)
+  # Name of a CPU arch spec or feature set to require
+  if(MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:${PORTABLE}")
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${PORTABLE}")
+  endif()
 else()
   if(MSVC)
+    # NOTE: No auto-detection of current CPU, but instead assume some useful
+    # level of optimization is supported
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
   else()
+    # Require instruction set from current CPU (with some legacy or opt-out
+    # exceptions)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390x" AND NOT HAS_S390X_MARCH_NATIVE)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=z196")
     elseif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64" AND NOT HAS_ARMV8_CRC)
@@ -305,25 +293,6 @@ if(NOT MSVC)
   set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
 endif()
 
-CHECK_CXX_SOURCE_COMPILES("
-#include <cstdint>
-#include <nmmintrin.h>
-#include <wmmintrin.h>
-int main() {
-  volatile uint32_t x = _mm_crc32_u32(0, 0);
-  const auto a = _mm_set_epi64x(0, 0);
-  const auto b = _mm_set_epi64x(0, 0);
-  const auto c = _mm_clmulepi64_si128(a, b, 0x00);
-  auto d = _mm_cvtsi128_si64(c);
-}
-" HAVE_SSE42)
-if(HAVE_SSE42)
-  add_definitions(-DHAVE_SSE42)
-  add_definitions(-DHAVE_PCLMUL)
-elseif(FORCE_SSE42)
-  message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
-endif()
-
 # Check if -latomic is required or not
 if (NOT MSVC)
   set(CMAKE_REQUIRED_FLAGS "--std=c++17")
@@ -1010,12 +979,6 @@ if ( ROCKSDB_PLUGINS )
   endforeach()
 endif()
 
-if(HAVE_SSE42 AND NOT MSVC)
-  set_source_files_properties(
-    util/crc32c.cc
-    PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul")
-endif()
-
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
   list(APPEND SOURCES
     util/crc32c_ppc.c
@@ -1327,6 +1290,7 @@ if(WITH_TESTS)
         db/db_bloom_filter_test.cc
         db/db_compaction_filter_test.cc
         db/db_compaction_test.cc
+        db/db_clip_test.cc
         db/db_dynamic_level_test.cc
         db/db_encryption_test.cc
         db/db_flush_test.cc

package/deps/rocksdb/rocksdb/Makefile

@@ -337,8 +337,8 @@ ifneq ($(MACHINE), arm64)
 # linking with jemalloc (as it won't be arm64-compatible) and remove some other options
 # set during platform detection
 DISABLE_JEMALLOC=1
-PLATFORM_CFLAGS := $(filter-out -march=native -DHAVE_SSE42 -DHAVE_AVX2, $(PLATFORM_CFLAGS))
-PLATFORM_CXXFLAGS := $(filter-out -march=native -DHAVE_SSE42 -DHAVE_AVX2, $(PLATFORM_CXXFLAGS))
+PLATFORM_CCFLAGS := $(filter-out -march=native, $(PLATFORM_CCFLAGS))
+PLATFORM_CXXFLAGS := $(filter-out -march=native, $(PLATFORM_CXXFLAGS))
 endif
 endif
 endif
@@ -539,7 +539,7 @@ endif
 
 ifdef USE_CLANG
 	# Used by some teams in Facebook
-	WARNING_FLAGS += -Wshift-sign-overflow
+	WARNING_FLAGS += -Wshift-sign-overflow -Wambiguous-reversed-operator
 endif
 
 ifeq ($(PLATFORM), OS_OPENBSD)
@@ -1480,6 +1480,9 @@ db_compaction_filter_test: $(OBJ_DIR)/db/db_compaction_filter_test.o $(TEST_LIBR
 db_compaction_test: $(OBJ_DIR)/db/db_compaction_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
+db_clip_test: $(OBJ_DIR)/db/db_clip_test.o $(TEST_LIBRARY) $(LIBRARY)
+	$(AM_LINK)
+
 db_dynamic_level_test: $(OBJ_DIR)/db/db_dynamic_level_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
@@ -2435,6 +2438,8 @@ checkout_folly:
 	@# NOTE: this hack is required for gcc in some cases
 	perl -pi -e 's/(__has_include.<experimental.memory_resource>.)/__cpp_rtti && $$1/' third-party/folly/folly/memory/MemoryResource.h
 
+CXX_M_FLAGS = $(filter -m%, $(CXXFLAGS))
+
 build_folly:
 	FOLLY_INST_PATH=`cd third-party/folly; $(PYTHON) build/fbcode_builder/getdeps.py show-inst-dir`; \
 	if [ "$$FOLLY_INST_PATH" ]; then \
@@ -2445,8 +2450,8 @@ build_folly:
 	fi
 	# Restore the original version of Invoke.h with boost dependency
 	cd third-party/folly && ${GIT_COMMAND} checkout folly/functional/Invoke.h
-	cd third-party/folly && MAYBE_AVX2=`echo $(CXXFLAGS) | grep -o -- -DHAVE_AVX2 | sed 's/-DHAVE_AVX2/-mavx2/g' || true` && \
-		CXXFLAGS=" $$MAYBE_AVX2 -DHAVE_CXX11_ATOMIC " $(PYTHON) build/fbcode_builder/getdeps.py build --no-tests
+	cd third-party/folly && \
+		CXXFLAGS=" $(CXX_M_FLAGS) -DHAVE_CXX11_ATOMIC " $(PYTHON) build/fbcode_builder/getdeps.py build --no-tests
 
 # ---------------------------------------------------------------------------
 #   Build size testing