gvsafronov/futriix-json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #7 - Make SERVER_VERSION open to all versions (#22)

Browse Source 
Signed-off-by: Joe Hu <jowhuw@amazon.com>
Co-authored-by: Joe Hu <jowhuw@amazon.com>
This commit is contained in:
Joe Hu 2024-12-09 18:14:48 -05:00 committed by GitHub
parent 1e33774dd2
commit 00c740742a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -10,12 +10,10 @@ EXECUTE_PROCESS(
OUTPUT_VARIABLE ARCHITECTURE OUTPUT_VARIABLE ARCHITECTURE
) )
if("${ARCHITECTURE}" STREQUAL "x86_64") if("${ARCHITECTURE}" STREQUAL "x86_64" OR "${ARCHITECTURE}" STREQUAL "aarch64")
message("Building JSON for x86_64") message("Building valkeyJSON for ${ARCHITECTURE}")
elseif("${ARCHITECTURE}" STREQUAL "aarch64")
message("Building JSON for aarch64")
else() else()
message(FATAL_ERROR "Unsupported architecture: ${ARCHITECTURE}. JSON is only supported on x86_64 and aarch64.") message(FATAL_ERROR "Unsupported architecture: ${ARCHITECTURE}. valkeyJSON is only supported on x86_64 and aarch64.")
endif() endif()
# Project definition # Project definition
@ -28,6 +26,12 @@ set(JSON_MODULE_LIB json)
set(VALKEY_DOWNLOAD_DIR "${CMAKE_BINARY_DIR}/_deps/valkey-src") set(VALKEY_DOWNLOAD_DIR "${CMAKE_BINARY_DIR}/_deps/valkey-src")
set(VALKEY_BIN_DIR "${CMAKE_BINARY_DIR}/_deps/valkey-src/src/valkey/src") set(VALKEY_BIN_DIR "${CMAKE_BINARY_DIR}/_deps/valkey-src/src/valkey/src")
# Valkey version
if(NOT VALKEY_VERSION)
set(VALKEY_VERSION unstable)
endif()
message("Valkey version: ${VALKEY_VERSION}")
# Download and build Valkey # Download and build Valkey
ExternalProject_Add( ExternalProject_Add(
valkey valkey

21
README.md
View File

@ -8,20 +8,29 @@ ValkeyJSON leverages [RapidJSON](https://rapidjson.org/), a high-performance JSO
#### To build the module and run tests #### To build the module and run tests
```text ```text
# Builds the valkey-server (unstable) for integration testing. # Build valkey-server (unstable) and run integration tests
export SERVER_VERSION=unstable
./build.sh ./build.sh
```
# Builds the valkey-server (8.0.0) for integration testing. The default valkey version is "unstable". To override it, do:
export SERVER_VERSION=8.0.0 ```text
./build.sh # Build valkey-server (8.0.0) and run integration tests
SERVER_VERSION=8.0.0 ./build.sh
``` ```
#### To build just the module #### To build just the module
```text ```text
mdkir build mdkir build
cd build cd build
cmake .. -DVALKEY_VERSION=unstable cmake ..
make
```
The default valkey version is "unstable". To override it, do:
```text
mdkir build
cd build
cmake .. -DVALKEY_VERSION=8.0.0
make make
``` ```

11
build.sh
View File

@ -8,22 +8,17 @@ set -e
SCRIPT_DIR=$(pwd) SCRIPT_DIR=$(pwd)
echo "Script Directory: $SCRIPT_DIR" echo "Script Directory: $SCRIPT_DIR"
# Ensure SERVER_VERSION environment variable is set # If environment variable SERVER_VERSION is not set, default to "unstable"
if [ -z "$SERVER_VERSION" ]; then if [ -z "$SERVER_VERSION" ]; then
echo "WARNING: SERVER_VERSION environment variable is not set. Defaulting to unstable." echo "SERVER_VERSION environment variable is not set. Defaulting to \"unstable\"."
export SERVER_VERSION="unstable" export SERVER_VERSION="unstable"
fi fi
if [ "$SERVER_VERSION" != "unstable" ] && [ "$SERVER_VERSION" != "8.0.0" ] ; then
echo "ERROR: Unsupported version - $SERVER_VERSION"
exit 1
fi
# Variables # Variables
BUILD_DIR="$SCRIPT_DIR/build" BUILD_DIR="$SCRIPT_DIR/build"
# Build the Valkey JSON module using CMake # Build the Valkey JSON module using CMake
echo "Building ValkeyJSON module..." echo "Building valkeyJSON..."
if [ ! -d "$BUILD_DIR" ]; then if [ ! -d "$BUILD_DIR" ]; then
mkdir $BUILD_DIR mkdir $BUILD_DIR
fi fi

2
src/CMakeLists.txt
View File

@ -1,4 +1,4 @@
message("src/CMakeLists.txt: Build JSON") message("src/CMakeLists.txt: Build valkeyJSON")
set(OBJECT_TARGET json-objects CACHE INTERNAL "Object target for json module") set(OBJECT_TARGET json-objects CACHE INTERNAL "Object target for json module")
add_library(${OBJECT_TARGET} OBJECT "") add_library(${OBJECT_TARGET} OBJECT "")

2
tst/integration/run.sh
View File

@ -10,7 +10,7 @@ pkill -9 -f "valkey-benchmark" || true
# If environment variable SERVER_VERSION is not set, default to "unstable" # If environment variable SERVER_VERSION is not set, default to "unstable"
if [ -z "$SERVER_VERSION" ]; then if [ -z "$SERVER_VERSION" ]; then
echo "WARNING: SERVER_VERSION environment variable is not set. Defaulting to \"unstable\"." echo "SERVER_VERSION environment variable is not set. Defaulting to \"unstable\"."
export SERVER_VERSION="unstable" export SERVER_VERSION="unstable"
fi fi