From c074f88157f7d757efbc62802dd3b79dd609f198 Mon Sep 17 00:00:00 2001
From: cheniujh <1271435567@qq.com>
Date: Tue, 3 Dec 2024 14:14:05 +0800
Subject: [PATCH] disable rpoplpush when cache&list is enabled

---
 include/pika_conf.h | 2 +-
 src/pika_list.cc    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/pika_conf.h b/include/pika_conf.h
index 5aa0c790c2..6c9aea828e 100644
--- a/include/pika_conf.h
+++ b/include/pika_conf.h
@@ -1102,7 +1102,7 @@ class PikaConf : public pstd::BaseConf {
   int64_t min_blob_size_ = 4096;                // 4K
   int64_t blob_cache_ = 0;
   int64_t blob_num_shard_bits_ = 0;
-  int64_t blob_file_size_ = 256 * 1024 * 1024;  // 256M
+  int64_t blob_file_size_ = 256 << 20;  // 256M
   std::string blob_compression_type_ = "none";
 
   std::shared_mutex rwlock_;
diff --git a/src/pika_list.cc b/src/pika_list.cc
index 9cec350baa..e1ec2da909 100644
--- a/src/pika_list.cc
+++ b/src/pika_list.cc
@@ -7,14 +7,12 @@
 #include <utility>
 #include "include/pika_cache.h"
 #include "include/pika_data_distribution.h"
-#include "include/pika_rm.h"
 #include "include/pika_server.h"
 #include "include/pika_slot_command.h"
 #include "pstd/include/pstd_string.h"
 #include "scope_record_lock.h"
 
 extern PikaServer* g_pika_server;
-extern std::unique_ptr<PikaReplicaManager> g_pika_rm;
 
 void LIndexCmd::DoInitial() {
   if (!CheckArg(argv_.size())) {
@@ -786,6 +784,10 @@ void RPopCmd::DoUpdateCache() {
 }
 
 void RPopLPushCmd::DoInitial() {
+  if (PIKA_CACHE_NONE != g_pika_conf->cache_mode() && g_pika_conf->GetCacheList()) {
+    res_.SetRes(CmdRes::kErrOther, "the command is not supported when cache&list is enabled");
+    return;
+  }
   if (!CheckArg(argv_.size())) {
     res_.SetRes(CmdRes::kWrongNum, kCmdNameRPopLPush);
     return;