add scan_false_limit in all scan

.gitignore

@@ -40,11 +40,13 @@ version.h
 .idea
 .vscode
 .cache
+.gitignore
 
 compactdb
+test
 testdb
 
 build
 cmake-build-*
 debug-build
-test
+test

src/commands/cmd_hash.cc

@@ -18,6 +18,8 @@
  *
  */
 
+#include <string>
+
 #include "commander.h"
 #include "commands/command_parser.h"
 #include "error_constants.h"
@@ -367,12 +369,13 @@ class CommandHScan : public CommandSubkeyScanBase {
     std::vector<std::string> fields;
     std::vector<std::string> values;
     auto key_name = srv->GetKeyNameFromCursor(cursor_, CursorType::kTypeHash);
-    auto s = hash_db.Scan(key_, key_name, limit_, prefix_, &fields, &values, pm_);
+    ScanConfig scan_config(limit_,srv->GetConfig()->max_scan_num,prefix_);
+    auto s = hash_db.Scan(key_, key_name, &fields, scan_config, *match_mode_, &values);
     if (!s.ok() && !s.IsNotFound()) {
       return {Status::RedisExecErr, s.ToString()};
     }
-
-    auto cursor = GetNextCursor(srv, fields, CursorType::kTypeHash);
+    auto &end_cursor = hash_db.end_cursor;
+    const auto &cursor = srv->GenerateCursorFromKeyName(end_cursor, CursorType::kTypeHash);
     std::vector<std::string> entries;
     entries.reserve(2 * fields.size());
     for (size_t i = 0; i < fields.size(); i++) {

src/commands/cmd_server.cc

@@ -840,7 +840,8 @@ class CommandScan : public CommandScanBase {
 
     std::vector<std::string> keys;
     std::string end_key;
-    auto s = redis_db.Scan(key_name, limit_, prefix_, &keys, &end_key, type_, pm_);
+    ScanConfig scan_config(limit_, srv->GetConfig()->max_scan_num, prefix_);
+    auto s = redis_db.Scan(key_name, &keys, scan_config, *match_mode_,&end_key, type_);
     if (!s.ok()) {
       return {Status::RedisExecErr, s.ToString()};
     }

src/commands/cmd_set.cc

@@ -427,12 +427,12 @@ class CommandSScan : public CommandSubkeyScanBase {
     redis::Set set_db(srv->storage, conn->GetNamespace());
     std::vector<std::string> members;
     auto key_name = srv->GetKeyNameFromCursor(cursor_, CursorType::kTypeSet);
-    auto s = set_db.Scan(key_, key_name, limit_, prefix_, &members);
+    ScanConfig scan_config(limit_, srv->GetConfig()->max_scan_num, prefix_);
+    auto s = set_db.Scan(key_, key_name, &members, scan_config, *match_mode_);
     if (!s.ok() && !s.IsNotFound()) {
       return {Status::RedisExecErr, s.ToString()};
     }
-
-    *output = CommandScanBase::GenerateOutput(srv, conn, members, CursorType::kTypeSet);
+    *output = CommandScanBase::GenerateOutput(srv, conn, members, set_db.end_cursor);
     return Status::OK();
   }
 };

src/commands/cmd_zset.cc

@@ -1350,12 +1350,12 @@ class CommandZScan : public CommandSubkeyScanBase {
     std::vector<std::string> members;
     std::vector<double> scores;
     auto key_name = srv->GetKeyNameFromCursor(cursor_, CursorType::kTypeZSet);
-    auto s = zset_db.Scan(key_, key_name, limit_, prefix_, &members, &scores, pm_);
+    ScanConfig scan_config(limit_, srv->GetConfig()->max_scan_num, prefix_);
+    auto s = zset_db.Scan(key_, key_name, &members, scan_config, *match_mode_, &scores);
     if (!s.ok() && !s.IsNotFound()) {
       return {Status::RedisExecErr, s.ToString()};
     }
-
-    auto cursor = GetNextCursor(srv, members, CursorType::kTypeZSet);
+    auto cursor = srv->GenerateCursorFromKeyName(zset_db.end_cursor, CursorType::kTypeZSet);
     std::vector<std::string> entries;
     entries.reserve(2 * members.size());
     for (size_t i = 0; i < members.size(); i++) {

src/commands/scan_base.h

@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <vector>
+
 #include "commander.h"
 #include "commands/command_parser.h"
 #include "error_constants.h"
@@ -44,17 +46,16 @@ class CommandScanBase : public Commander {
     while (parser.Good()) {
       if (parser.EatEqICase("match")) {
         prefix_ = GET_OR_RET(parser.TakeStr());
-        if(prefix_.size()>=2&&prefix_.front() == '*'&&prefix_.back() =='*'){
-          prefix_ = prefix_.substr(1,prefix_.size()-2);
-          pm_ = 2;
-        }else if (!prefix_.empty() && prefix_.back() == '*') {
+        if (prefix_.size() >= 2 && prefix_.front() == '*' && prefix_.back() == '*') {
+          prefix_ = prefix_.substr(1, prefix_.size() - 2);
+          match_mode_ = std::make_unique<SubStringMatchType>();
+        } else if (!prefix_.empty() && prefix_.back() == '*') {
           prefix_ = prefix_.substr(0, prefix_.size() - 1);
-          pm_ = 0;
-        } else if(!prefix_.empty()&& prefix_.front()=='*'){
+          match_mode_ = std::make_unique<PerfixMatchType>();
+        } else if (!prefix_.empty() && prefix_.front() == '*') {
           prefix_ = prefix_.substr(1, prefix_.size() - 1);
-          pm_ = 1;
-        }
-        else {
+          match_mode_ = std::make_unique<SubStringMatchType>();
+        } else {
           return {Status::RedisParseErr, "currently only key prefix matching is supported"};
         }
       } else if (parser.EatEqICase("count")) {
@@ -87,16 +88,10 @@ class CommandScanBase : public Commander {
     }
   }
 
-  std::string GenerateOutput(Server *srv, const Connection *conn, const std::vector<std::string> &keys,
-                             CursorType cursor_type) const {
+  static std::string GenerateOutput(Server *srv, const Connection *conn, const std::vector<std::string> &keys,
+                                    const std::string &end_cursor) {
     std::vector<std::string> list;
-    if (keys.size() == static_cast<size_t>(limit_)) {
-      auto end_cursor = srv->GenerateCursorFromKeyName(keys.back(), cursor_type);
-      list.emplace_back(redis::BulkString(end_cursor));
-    } else {
-      list.emplace_back(redis::BulkString("0"));
-    }
-
+    list.emplace_back(end_cursor);
     list.emplace_back(ArrayOfBulkStrings(keys));
 
     return redis::Array(list);
@@ -107,7 +102,7 @@ class CommandScanBase : public Commander {
   std::string prefix_;
   int limit_ = 20;
   RedisType type_ = kRedisNone;
-  int pm_ = 0;
+  std::unique_ptr<BaseMatchType> match_mode_;
 };
 
 class CommandSubkeyScanBase : public CommandScanBase {

src/config/config.cc

@@ -25,6 +25,7 @@
 #include <strings.h>
 
 #include <algorithm>
+#include <climits>
 #include <cstring>
 #include <fstream>
 #include <iostream>
@@ -152,6 +153,7 @@ Config::Config() {
       {"pidfile", true, new StringField(&pidfile, kDefaultPidfile)},
       {"max-io-mb", false, new IntField(&max_io_mb, 0, 0, INT_MAX)},
       {"max-bitmap-to-string-mb", false, new IntField(&max_bitmap_to_string_mb, 16, 0, INT_MAX)},
+      {"max-scan-num", false, new IntField(&max_scan_num, 2, 0, INT_MAX)},
       {"max-db-size", false, new IntField(&max_db_size, 0, 0, INT_MAX)},
       {"max-replication-mb", false, new IntField(&max_replication_mb, 0, 0, INT_MAX)},
       {"supervised", true, new EnumField<SupervisedMode>(&supervised_mode, supervised_modes, kSupervisedNone)},

src/config/config.h

@@ -27,6 +27,7 @@
 #include <memory>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "config_type.h"
@@ -114,6 +115,7 @@ struct Config {
   int max_replication_mb = 0;
   int max_io_mb = 0;
   int max_bitmap_to_string_mb = 16;
+  int max_scan_num = 2;
   bool master_use_repl_port = false;
   bool purge_backup_on_fullsync = false;
   bool auto_resize_block_and_sst = true;
@@ -260,3 +262,15 @@ struct Config {
   bool checkFieldValueIsDefault(const std::string &key, const std::string &value) const;
   Status finish();
 };
+
+struct ScanConfig{
+   public:
+    ScanConfig(uint64_t scan_matched_limt_value, uint64_t scan_mismatched_limt_value,const std::string& match_str_value)
+        : scan_matched_limt(scan_matched_limt_value),
+          scan_mismatched_limt(scan_mismatched_limt_value),
+          match_str(match_str_value) {}
+
+    uint64_t scan_matched_limt;
+    uint64_t scan_mismatched_limt;
+    const std::string& match_str;
+};