This is an automated email from the ASF dual-hosted git repository.
maplefu pushed a commit to branch unstable
in repository https://gitbox.apache.org/repos/asf/kvrocks.git
The following commit(s) were added to refs/heads/unstable by this push:
new 928f957d Move sha1 and redis rand sources to vendor directory (#1689)
928f957d is described below
commit 928f957d936c619b28d157a84a536bbea2441e00
Author: Twice <[email protected]>
AuthorDate: Tue Aug 22 13:01:41 2023 +0800
Move sha1 and redis rand sources to vendor directory (#1689)
Co-authored-by: Binbin <[email protected]>
---
.github/config/licenserc.yml | 5 +----
.github/config/typos.toml | 2 +-
CMakeLists.txt | 2 +-
NOTICE | 4 ++--
src/{common => vendor}/rand.cc | 0
src/{common => vendor}/rand.h | 0
src/{common => vendor}/sha1.cc | 0
src/{common => vendor}/sha1.h | 0
8 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/.github/config/licenserc.yml b/.github/config/licenserc.yml
index 63a8222d..9e1a6e4a 100644
--- a/.github/config/licenserc.yml
+++ b/.github/config/licenserc.yml
@@ -32,11 +32,8 @@ header:
- '**/*.yml'
- '**/*.yaml'
paths-ignore:
- - 'src/common/rand.h'
- - 'src/common/rand.cc'
+ - 'src/vendor/*'
- 'src/common/rocksdb_crc32c.h'
- - 'src/common/sha1.h'
- - 'src/common/sha1.cc'
- 'src/storage/batch_debugger.h'
- 'src/types/geohash.h'
- 'src/types/geohash.cc'
diff --git a/.github/config/typos.toml b/.github/config/typos.toml
index f71dae4f..c02f4f6e 100644
--- a/.github/config/typos.toml
+++ b/.github/config/typos.toml
@@ -18,7 +18,7 @@
[files]
extend-exclude = [
".git/",
- "src/common/sha1.cc",
+ "src/vendor/",
"tests/gocase/util/slot.go",
]
ignore-hidden = false
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8297e88..07d3c14b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,7 @@ list(FILTER KVROCKS_SRCS EXCLUDE REGEX src/main.cc)
add_library(kvrocks_objs OBJECT ${KVROCKS_SRCS})
-target_include_directories(kvrocks_objs PUBLIC src src/common
${PROJECT_BINARY_DIR} ${Backtrace_INCLUDE_DIR})
+target_include_directories(kvrocks_objs PUBLIC src src/common src/vendor
${PROJECT_BINARY_DIR} ${Backtrace_INCLUDE_DIR})
target_compile_features(kvrocks_objs PUBLIC cxx_std_17)
target_compile_options(kvrocks_objs PUBLIC -Wall -Wpedantic -Wsign-compare
-Wreturn-type -fno-omit-frame-pointer -Werror=unused-result)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
diff --git a/NOTICE b/NOTICE
index 368b74f7..07652e35 100644
--- a/NOTICE
+++ b/NOTICE
@@ -49,7 +49,7 @@ The text of each license is also included in
licenses/LICENSE-[project].txt.
* libevent(https://github.com/libevent/libevent)
* snappy(https://github.com/google/snappy)
-Files src/types/geohash.*, src/common/rand.*, src/storage/scripting.*
+Files src/types/geohash.*, src/vendor/rand.*, src/storage/scripting.*
and some utility functions in src/common are modified from Redis.
The text of the license is included in licenses/LICENSE-redis.txt.
@@ -82,4 +82,4 @@ The text of each license is also included in
licenses/LICENSE-[project].txt
================================================================
Public Domain
================================================================
-Files src/common/sha1.* are provided in Public Domain by Steve Reid
<[email protected]>.
+Files src/vendor/sha1.* are provided in Public Domain by Steve Reid
<[email protected]>.
diff --git a/src/common/rand.cc b/src/vendor/rand.cc
similarity index 100%
rename from src/common/rand.cc
rename to src/vendor/rand.cc
diff --git a/src/common/rand.h b/src/vendor/rand.h
similarity index 100%
rename from src/common/rand.h
rename to src/vendor/rand.h
diff --git a/src/common/sha1.cc b/src/vendor/sha1.cc
similarity index 100%
rename from src/common/sha1.cc
rename to src/vendor/sha1.cc
diff --git a/src/common/sha1.h b/src/vendor/sha1.h
similarity index 100%
rename from src/common/sha1.h
rename to src/vendor/sha1.h
