revert it to build with C++11, and replace the possible keyword: module

Author: sewenew

CMakeLists.txt

@@ -12,7 +12,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 message(STATUS "redis-protobuf build type: ${CMAKE_BUILD_TYPE}")
 
-set(CMAKE_CXX_FLAGS "-std=c++17 -Wall -Wextra -Werror -fPIC -Wno-unused-parameter")
+set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Werror -fPIC -Wno-unused-parameter")
 
 set(PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src/sw/redis-protobuf)
 

src/sw/redis-protobuf/append_command.cpp

@@ -37,16 +37,16 @@ int AppendCommand::run(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
         auto key = api::open_key(ctx, args.key_name, api::KeyMode::WRITEONLY);
         assert(key);
 
-        auto &module = RedisProtobuf::instance();
+        auto &m = RedisProtobuf::instance();
 
         long long len = 0;
-        if (!api::key_exists(key.get(), module.type())) {
-            auto msg = module.proto_factory()->create(path.type());
+        if (!api::key_exists(key.get(), m.type())) {
+            auto msg = m.proto_factory()->create(path.type());
             MutableFieldRef field(msg.get(), path);
             len = _append(field, args.elements);
 
             if (RedisModule_ModuleTypeSetValue(key.get(),
-                        module.type(),
+                        m.type(),
                         msg.get()) != REDISMODULE_OK) {
                 throw Error("failed to set message");
             }

src/sw/redis-protobuf/import_command.cpp

@@ -32,8 +32,8 @@ int ImportCommand::run(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
 
         auto args = _parse_args(argv, argc);
 
-        auto &module = RedisProtobuf::instance();
-        module.proto_factory()->load(args.filename, args.content);
+        auto &m= RedisProtobuf::instance();
+        m.proto_factory()->load(args.filename, args.content);
 
         RedisModule_ReplicateVerbatim(ctx);
 

src/sw/redis-protobuf/last_import_command.cpp

@@ -30,8 +30,8 @@ int LastImportCommand::run(RedisModuleCtx *ctx, RedisModuleString ** /*argv*/, i
     try {
         assert(ctx != nullptr);
 
-        auto &module = RedisProtobuf::instance();
-        auto last_loaded_files = module.proto_factory()->last_loaded();
+        auto &m = RedisProtobuf::instance();
+        auto last_loaded_files = m.proto_factory()->last_loaded();
 
         RedisModule_ReplyWithArray(ctx, last_loaded_files.size() * 2);
 

src/sw/redis-protobuf/module_entry.cpp

@@ -26,9 +26,9 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
     using namespace sw::redis::pb;
 
     try {
-        auto &module = RedisProtobuf::instance();
+        auto &m = RedisProtobuf::instance();
 
-        module.load(ctx, argv, argc);
+        m.load(ctx, argv, argc);
     } catch (const Error &e) {
         api::warning(ctx, "%s", e.what());
         return REDISMODULE_ERR;

src/sw/redis-protobuf/redis_protobuf.cpp

@@ -97,9 +97,9 @@ void* RedisProtobuf::_rdb_load(RedisModuleIO *rdb, int encver) {
     try {
         assert(rdb != nullptr);
 
-        auto &module = RedisProtobuf::instance();
+        auto &m = RedisProtobuf::instance();
 
-        if (encver != module.encoding_version()) {
+        if (encver != m.encoding_version()) {
             throw Error("cannot load data of version: " + std::to_string(encver));
         }
 
@@ -109,7 +109,7 @@ void* RedisProtobuf::_rdb_load(RedisModuleIO *rdb, int encver) {
 
         auto type = std::string(type_str.str.get(), type_str.len);
 
-        auto *factory = module.proto_factory();
+        auto *factory = m.proto_factory();
 
         assert(factory != nullptr);
 

src/sw/redis-protobuf/set_command.cpp

@@ -169,16 +169,16 @@ void SetCommand::_create_msg(RedisModuleKey &key,
         const Path &path,
         const StringView &val) const {
     MsgUPtr msg;
-    auto &module = RedisProtobuf::instance();
+    auto &m = RedisProtobuf::instance();
     if (path.empty()) {
-        msg = module.proto_factory()->create(path.type(), val);
+        msg = m.proto_factory()->create(path.type(), val);
     } else {
-        msg = module.proto_factory()->create(path.type());
+        msg = m.proto_factory()->create(path.type());
         MutableFieldRef field(msg.get(), path);
         _set_field(field, val);
     }
 
-    if (RedisModule_ModuleTypeSetValue(&key, module.type(), msg.get()) != REDISMODULE_OK) {
+    if (RedisModule_ModuleTypeSetValue(&key, m.type(), msg.get()) != REDISMODULE_OK) {
         throw Error("failed to set message");
     }
 
@@ -197,9 +197,9 @@ void SetCommand::_set_msg(RedisModuleKey &key,
             throw Error("type mismatch");
         }
 
-        auto &module = RedisProtobuf::instance();
-        auto msg = module.proto_factory()->create(path.type(), val);
-        if (RedisModule_ModuleTypeSetValue(&key, module.type(), msg.get()) != REDISMODULE_OK) {
+        auto &m = RedisProtobuf::instance();
+        auto msg = m.proto_factory()->create(path.type(), val);
+        if (RedisModule_ModuleTypeSetValue(&key, m.type(), msg.get()) != REDISMODULE_OK) {
             throw Error("failed to set message");
         }