lint

apache · Apr 5, 2024 · 6984cbc · 6984cbc
1 parent a7c4c38
commit 6984cbc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/commands/cmd_key.cc b/src/commands/cmd_key.cc
@@ -55,7 +55,7 @@ class CommandMove : public Commander {
     } else if (args.size() == 4) {
       move_type_ = MoveType::kNormal;
     } else {
-      return Status(Status::RedisParseErr, errWrongNumOfArguments);
+      return {Status::RedisParseErr, errWrongNumOfArguments};
     }
     return Status::OK();
   }

diff --git a/src/storage/redis_db.cc b/src/storage/redis_db.cc
@@ -721,7 +721,7 @@ rocksdb::Status Database::Rename(const std::string &key, const std::string &new_
 
   if (key == new_key) return rocksdb::Status::OK();
 
-  return MoveInternal(ns_key, new_ns_key, type);
+  return moveInternal(ns_key, new_ns_key, type);
 }
 
 rocksdb::Status Database::Move(const std::string &key, const std::string &new_ns, bool *ret) {
@@ -762,10 +762,10 @@ rocksdb::Status Database::Move(const std::string &key, const std::string &new_ns
     }
   }
 
-  return MoveInternal(ns_key, new_ns_key, type);
+  return moveInternal(ns_key, new_ns_key, type);
 }
 
-rocksdb::Status Database::MoveInternal(const std::string &ns_key, const std::string &new_ns_key, RedisType type) {
+rocksdb::Status Database::moveInternal(const std::string &ns_key, const std::string &new_ns_key, RedisType type) {
   auto batch = storage_->GetWriteBatchBase();
   WriteBatchLogData log_data(type);
   batch->PutLogData(log_data.Encode());

diff --git a/src/storage/redis_db.h b/src/storage/redis_db.h
@@ -105,7 +105,7 @@ class Database {
   [[nodiscard]] rocksdb::Status Move(const std::string &key, const std::string &new_ns, bool *ret);
 
  protected:
-  [[nodiscard]] rocksdb::Status MoveInternal(const std::string &ns_key, const std::string &new_ns_key, RedisType type);
+  [[nodiscard]] rocksdb::Status moveInternal(const std::string &ns_key, const std::string &new_ns_key, RedisType type);
 
   engine::Storage *storage_;
   rocksdb::ColumnFamilyHandle *metadata_cf_handle_;

diff --git a/tests/gocase/unit/move/move_test.go b/tests/gocase/unit/move/move_test.go
@@ -110,7 +110,7 @@ func TestMove(t *testing.T) {
 		require.NoError(t, rdb.Do(ctx, "AUTH", "token1").Err())
 		require.EqualValues(t, "value1", rdb.Get(ctx, "key1").Val())
 		require.NoError(t, rdb.Do(ctx, "AUTH", password).Err())
-		
+
 		// move key2 to ns2, with wrong token first
 		r = rdb.Do(ctx, "MOVE", "key2", "ns2", "token1")
 		require.EqualError(t, r.Err(), "ERR Incorrect namespace or token")