update rocksdb cmake

OpenAtomFoundation · Aug 6, 2024 · 8eea991 · 8eea991
1 parent d3873b2
commit 8eea991
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/.github/workflows/import_braft.yml b/.github/workflows/import_braft.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        run: bash etc/script/ci/build.sh
+        run: bash ./etc/script/ci/build.sh
 
       - name: Check Format
         working-directory: ${{ github.workspace }}/build
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build --verbose
-        env: 
+        env:
           CPLUS_INCLUDE_PATH: /opt/homebrew/include
         run: |
           brew install autoconf

diff --git a/.github/workflows/pikiwidb.yml b/.github/workflows/pikiwidb.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        run: bash etc/script/ci/build.sh
+        run: bash ./etc/script/ci/build.sh
 
       - name: Check Format
         working-directory: ${{ github.workspace }}/build
@@ -67,4 +67,4 @@ jobs:
         run: |
           cd ../tests
           go mod tidy
-          go test -timeout 15m
+          go test -timeout 15m
diff --git a/cmake/rocksdb.cmake b/cmake/rocksdb.cmake
@@ -11,7 +11,10 @@ ExternalProject_Add(
         extern_rocksdb
         ${EXTERNAL_PROJECT_LOG_ARGS}
         GIT_REPOSITORY https://github.com/facebook/rocksdb.git
-        GIT_TAG v8.3.3
+        GIT_TAG v9.4.0
+          URL https://github.com/facebook/rocksdb/archive/refs/tags/v9.4.0.tar.gz
+          URL_HASH MD5=ce19cb3e2b6db927ef88cbf25c42097e
+        DOWNLOAD_NO_PROGRESS 1
         DEPENDS
         gflags
         snappy

diff --git a/etc/script/build.sh b/etc/script/build.sh
@@ -48,23 +48,25 @@ function build() {
   cmake --build ${PREFIX} -- ${MAKE_FLAGS} -j ${CPU_CORE}
 
   if [ $? -eq 0 ]; then
-    echo -e "pikiwidb compile complete, output file ${C_GREEN} ${BUILD_DIR}/pikiwidb ${C_END}"
+    # echo -e "pikiwidb compile complete, output file ${C_GREEN} ${PREFIX}/bin/pikiwidb ${C_END}"
+    echo -e "pikiwidb compile complete, output file ${C_GREEN} ./bin/pikiwidb ${C_END}"
   else
     echo -e "${C_RED} pikiwidb compile fail ${C_END}"
     exit 1
   fi
 }
 
+# ":?" makes sure the bash var is not empty.
 function clear() {
-  rm -rf ${PROJECT_HOME}/deps-debug
-  rm -rf ${PROJECT_HOME}/deps-release
-  rm -rf ${PROJECT_HOME}/cmake-build-debug
-  rm -rf ${PROJECT_HOME}/cmake-build-release
-  rm -rf ${PROJECT_HOME}/cmake-build-release-release
-  rm -rf ${PROJECT_HOME}/build
-  rm -rf ${PROJECT_HOME}/build-release
-  rm -rf ${PROJECT_HOME}/build-debug
-  rm -rf ${PROJECT_HOME}/bin
+  rm -rf ${PROJECT_HOME:?}/deps-debug
+  rm -rf ${PROJECT_HOME:?}/deps-release
+  rm -rf ${PROJECT_HOME:?}/cmake-build-debug
+  rm -rf ${PROJECT_HOME:?}/cmake-build-release
+  rm -rf ${PROJECT_HOME:?}/cmake-build-release-release
+  rm -rf ${PROJECT_HOME:?}/build
+  rm -rf ${PROJECT_HOME:?}/build-release
+  rm -rf ${PROJECT_HOME:?}/build-debug
+  rm -rf ${PROJECT_HOME:?}/bin
   exit 0
 }
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,7 +18,8 @@ IF (CMAKE_BUILD_TYPE STREQUAL "Release")
     TARGET_COMPILE_DEFINITIONS(pikiwidb PRIVATE KPIKIWIDB_BUILD_DATE="${BUILD_TIMESTAMP}" KPIKIWIDB_GIT_COMMIT_ID="${GIT_COMMIT_ID}")
 ENDIF ()
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+# SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin/)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin/)
 
 TARGET_INCLUDE_DIRECTORIES(pikiwidb
         PRIVATE ${PROJECT_SOURCE_DIR}/src

diff --git a/tests/util/pikiwidb.go b/tests/util/pikiwidb.go
@@ -50,11 +50,11 @@ func GetConfPath(copy bool, t int64) string {
 		nPath string
 	)
 	if len(rPath) != 0 && copy {
-		nPath = path.Join(rPath, fmt.Sprintf("pikiwidb_%d.conf", t))
+		nPath = path.Join(rPath, fmt.Sprintf("etc/conf/pikiwidb_%d.conf", t))
 		return nPath
 	}
 	if len(rPath) != 0 {
-		cPath = path.Join(rPath, "pikiwidb.conf")
+		cPath = path.Join(rPath, "etc/conf/pikiwidb.conf")
 		return cPath
 	}
 	return rPath