From f28ff621380221b4d020ce3e814a302b98e3975c Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Sat, 29 Apr 2023 15:08:12 +0800 Subject: [PATCH 1/2] Rename internal macro ENABLE_NEW_ENCODING to KVROCKS_ENCODING_VERSION --- CMakeLists.txt | 4 +++- src/storage/redis_metadata.h | 8 +------- tests/cppunit/{types => }/encoding_test.cc | 0 tests/cppunit/{types => }/metadata_test.cc | 0 4 files changed, 4 insertions(+), 8 deletions(-) rename tests/cppunit/{types => }/encoding_test.cc (100%) rename tests/cppunit/{types => }/metadata_test.cc (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 451e4b62c71..6da125aa937 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,7 +199,9 @@ if(ENABLE_OPENSSL) target_compile_definitions(kvrocks_objs PUBLIC ENABLE_OPENSSL) endif() if(ENABLE_NEW_ENCODING) - target_compile_definitions(kvrocks_objs PUBLIC ENABLE_NEW_ENCODING) + target_compile_definitions(kvrocks_objs PUBLIC KVROCKS_ENCODING_VERSION=1) +else() + target_compile_definitions(kvrocks_objs PUBLIC KVROCKS_ENCODING_VERSION=0) endif() # disable LTO on GCC <= 9 due to an ICE diff --git a/src/storage/redis_metadata.h b/src/storage/redis_metadata.h index d2365b418a7..18410756516 100644 --- a/src/storage/redis_metadata.h +++ b/src/storage/redis_metadata.h @@ -29,13 +29,7 @@ #include "encoding.h" #include "types/redis_stream_base.h" -constexpr bool USE_64BIT_COMMON_FIELD_DEFAULT = -#ifdef ENABLE_NEW_ENCODING - true -#else - false -#endif - ; +constexpr bool USE_64BIT_COMMON_FIELD_DEFAULT = KVROCKS_ENCODING_VERSION != 0; enum RedisType { kRedisNone, diff --git a/tests/cppunit/types/encoding_test.cc b/tests/cppunit/encoding_test.cc similarity index 100% rename from tests/cppunit/types/encoding_test.cc rename to tests/cppunit/encoding_test.cc diff --git a/tests/cppunit/types/metadata_test.cc b/tests/cppunit/metadata_test.cc similarity index 100% rename from tests/cppunit/types/metadata_test.cc rename to tests/cppunit/metadata_test.cc From f27dcebdb780bcfa80b3991f694f2728b9948554 Mon Sep 17 00:00:00 2001 From: PragmaTwice Date: Sat, 29 Apr 2023 17:42:01 +0800 Subject: [PATCH 2/2] change to METADATA_ENCODING_VERSION --- CMakeLists.txt | 4 ++-- src/storage/redis_metadata.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6da125aa937..ff8d19447d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,9 +199,9 @@ if(ENABLE_OPENSSL) target_compile_definitions(kvrocks_objs PUBLIC ENABLE_OPENSSL) endif() if(ENABLE_NEW_ENCODING) - target_compile_definitions(kvrocks_objs PUBLIC KVROCKS_ENCODING_VERSION=1) + target_compile_definitions(kvrocks_objs PUBLIC METADATA_ENCODING_VERSION=1) else() - target_compile_definitions(kvrocks_objs PUBLIC KVROCKS_ENCODING_VERSION=0) + target_compile_definitions(kvrocks_objs PUBLIC METADATA_ENCODING_VERSION=0) endif() # disable LTO on GCC <= 9 due to an ICE diff --git a/src/storage/redis_metadata.h b/src/storage/redis_metadata.h index 18410756516..5407ff80712 100644 --- a/src/storage/redis_metadata.h +++ b/src/storage/redis_metadata.h @@ -29,7 +29,7 @@ #include "encoding.h" #include "types/redis_stream_base.h" -constexpr bool USE_64BIT_COMMON_FIELD_DEFAULT = KVROCKS_ENCODING_VERSION != 0; +constexpr bool USE_64BIT_COMMON_FIELD_DEFAULT = METADATA_ENCODING_VERSION != 0; enum RedisType { kRedisNone,