Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename internal macro ENABLE_NEW_ENCODING to METADATA_ENCODING_VERSION #1408

Merged
merged 2 commits into from
Apr 29, 2023
Merged

Rename internal macro ENABLE_NEW_ENCODING to METADATA_ENCODING_VERSION #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28ff62
Rename internal macro ENABLE_NEW_ENCODING to KVROCKS_ENCODING_VERSION
PragmaTwice Apr 29, 2023
f27dceb
change to METADATA_ENCODING_VERSION
PragmaTwice Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 METADATA_ENCODING_VERSION=1)
else()
target_compile_definitions(kvrocks_objs PUBLIC METADATA_ENCODING_VERSION=0)
endif()

# disable LTO on GCC <= 9 due to an ICE
Expand Down
8 changes: 1 addition & 7 deletions src/storage/redis_metadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = METADATA_ENCODING_VERSION != 0;

enum RedisType {
kRedisNone,
Expand Down
0 tests/cppunit/types/encoding_test.cc → tests/cppunit/encoding_test.cc
View file
Open in desktop
File renamed without changes.
0 tests/cppunit/types/metadata_test.cc → tests/cppunit/metadata_test.cc
View file
Open in desktop
File renamed without changes.