Merge branch 'sideplugin-6.28.0-677d2b4a' into sideplugin-7.01.0-a5e5…

…1305

.github/workflows/sanity_check.yml

@@ -34,8 +34,8 @@ jobs:
       with:
         args: https://raw.githubusercontent.com/llvm/llvm-project/release/12.x/clang/tools/clang-format/clang-format-diff.py
 
-    - name: Check format
-      run: VERBOSE_CHECK=1 make check-format
+        #- name: Check format
+        #run: VERBOSE_CHECK=1 make check-format
 
     - name: Compare buckify output
       run: make check-buck-targets

.gitignore

@@ -7,6 +7,7 @@ rocksdb.pc
 *.dylib*
 *.gcda
 *.gcno
+*.log
 *.o
 *.o.tmp
 *.so
@@ -25,6 +26,7 @@ rocksdb.pc
 *.vcxproj
 *.vcxproj.filters
 *.sln
+*.sst
 *.cmake
 .watchmanconfig
 CMakeCache.txt
@@ -95,3 +97,4 @@ fuzz/proto/gen/
 fuzz/crash-*
 
 cmake-build-*
+*_dbg

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "sideplugin/rockside"]
+	path = sideplugin/rockside
+	url = https://github.com/topling/rockside.git

CMakeLists.txt

@@ -185,6 +185,8 @@ endif()
 string(TIMESTAMP TS "%Y-%m-%d %H:%M:%S" UTC)
 set(BUILD_DATE "${TS}" CACHE STRING "the time we first built rocksdb")
 
+include_directories(sideplugin/rockside/src)
+
 find_package(Git)
 
 if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
@@ -215,6 +217,11 @@ set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc)
 configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)
 
 if(MSVC)
+  if(MSVC_VERSION LESS 1926)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /experimental:preprocessor")
+  else()
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:preprocessor")
+  endif()
   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")
 else()
@@ -621,8 +628,24 @@ endif()
 find_package(Threads REQUIRED)
 
 # Main library source code
+if (EXISTS ${PROJECT_SOURCE_DIR}/sideplugin/topling-rocks/CMakeFileList.txt)
+  message(STATUS "found ${PROJECT_SOURCE_DIR}/sideplugin/topling-rocks/CMakeLists.txt")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  include(${PROJECT_SOURCE_DIR}/sideplugin/topling-rocks/CMakeFileList.txt)
+else()
+  message(STATUS "not found ${PROJECT_SOURCE_DIR}/sideplugin/topling-rocks/CMakeLists.txt")
+endif()
+
+if (EXISTS ${PROJECT_SOURCE_DIR}/sideplugin/rockside/CMakeFileList.txt)
+  message(STATUS "found ${PROJECT_SOURCE_DIR}/sideplugin/rockside/CMakeFileList.txt")
+  include(${PROJECT_SOURCE_DIR}/sideplugin/rockside/CMakeFileList.txt)
+else()
+  message(STATUS "not found ${PROJECT_SOURCE_DIR}/sideplugin/rockside/CMakeFileList.txt")
+endif()
 
 set(SOURCES
+        ${rockside_src}
+        ${topling_rocks_src}
         cache/cache.cc
         cache/cache_entry_roles.cc
         cache/cache_key.cc
@@ -647,6 +670,7 @@ set(SOURCES
         db/builder.cc
         db/c.cc
         db/column_family.cc
+        db/compaction/compaction_executor.cc
         db/compaction/compaction.cc
         db/compaction/compaction_iterator.cc
         db/compaction/compaction_picker.cc

COPYING

@@ -1,3 +1,8 @@
+Copyright (c) 2021 The ToplingDB Authors. All rights reserved.
+
+We disallow bytedance using this software, other terms are identical with
+GPLv2 License, see below:
+---------------------------------------------------------------------------
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

LICENSE.Apache

@@ -1,3 +1,8 @@
+Copyright (c) 2021 The ToplingDB Authors. All rights reserved.
+
+We disallow bytedance using this software, other terms are identical with
+Apache License, see below:
+---------------------------------------------------------------------------
 
                                  Apache License
                            Version 2.0, January 2004

LICENSE.leveldb

@@ -1,3 +1,9 @@
+Copyright (c) 2021 The ToplingDB Authors. All rights reserved.
+
+We disallow bytedance using this software, other terms are identical with
+original license, see below:
+---------------------------------------------------------------------------
+
 This contains code that is from LevelDB, and that code is under the following license:
 
 Copyright (c) 2011 The LevelDB Authors. All rights reserved.