fix: migrate

Author: nagisa-kunhah

src/cluster/slot_migrate.cc

@@ -718,11 +718,6 @@ StatusOr<KeyMigrationResult> SlotMigrator::migrateOneKey(const rocksdb::Slice &k
       }
       break;
     }
-    case kRedisCuckooFilter: {
-      return {Status::NotOK,
-              "unsupported migration type: MBbloomCF command migration is not supported; "
-              "use raw key-value migration"};
-    }
     case kRedisHyperLogLog: {
       // HyperLogLog migration by cmd is not supported,
       // since it's hard to restore the same key structure for HyperLogLog

src/storage/batch_extractor.cc

@@ -60,9 +60,6 @@ rocksdb::Status WriteBatchExtractor::PutCF(uint32_t column_family_id, const Slic
     Metadata metadata(kRedisNone);
     auto s = metadata.Decode(value);
     if (!s.ok()) return s;
-    if (metadata.Type() == kRedisCuckooFilter) {
-      return rocksdb::Status::NotSupported("MBbloomCF command migration is not supported; use raw key-value migration");
-    }
 
     if (metadata.Type() == kRedisString) {
       command_args = {"SET", user_key, value.ToString().substr(Metadata::GetOffsetAfterExpire(value[0]))};
@@ -264,9 +261,6 @@ rocksdb::Status WriteBatchExtractor::PutCF(uint32_t column_family_id, const Slic
         }
         break;
       }
-      case kRedisCuckooFilter:
-        return rocksdb::Status::NotSupported(
-            "MBbloomCF command migration is not supported; use raw key-value migration");
       // TODO: to implement the case of kRedisBloomFilter
       default:
         break;

tests/cppunit/types/cuckoo_filter_test.cc

@@ -26,7 +26,6 @@
 #include <vector>
 
 #include "common/encoding.h"
-#include "storage/batch_extractor.h"
 #include "storage/redis_db.h"
 #include "storage/redis_metadata.h"
 #include "test_base.h"
@@ -395,47 +394,6 @@ TEST_F(RedisCuckooFilterTest, MetadataEncodeDecodeRoundTrip) {
   EXPECT_EQ(decoded.page_size, metadata.page_size);
 }
 
-TEST(CuckooFilterMigrationTest, CommandBatchExtractorRejectsCuckooFilterMetadata) {
-  CuckooChainMetadata metadata(false);
-  metadata.version = 1;
-  metadata.size = 1;
-  metadata.n_filters = 1;
-  metadata.expansion = 1;
-  metadata.base_capacity = 1000;
-  metadata.bucket_size = 2;
-  metadata.max_iterations = 20;
-  metadata.page_size = kCuckooFilterDefaultPageSize;
-
-  std::string encoded;
-  metadata.Encode(&encoded);
-  std::string ns_key;
-  PutFixed8(&ns_key, 0);
-  ns_key += "key";
-
-  WriteBatchExtractor extractor(false);
-  auto s = extractor.PutCF(static_cast<uint32_t>(ColumnFamilyID::Metadata), ns_key, encoded);
-  ASSERT_TRUE(s.IsNotSupported()) << s.ToString();
-  EXPECT_NE(s.ToString().find("MBbloomCF command migration is not supported"), std::string::npos);
-}
-
-TEST(CuckooFilterMigrationTest, CommandBatchExtractorRejectsCuckooFilterPages) {
-  WriteBatchExtractor extractor(false);
-  redis::WriteBatchLogData log_data(kRedisCuckooFilter, {"add", "key"});
-  extractor.LogData(log_data.Encode());
-
-  std::string sub_key;
-  PutFixed16(&sub_key, 0);
-  PutFixed32(&sub_key, 0);
-  std::string ns_key;
-  PutFixed8(&ns_key, 0);
-  ns_key += "key";
-  auto page_key = InternalKey(ns_key, sub_key, 1, false).Encode();
-
-  auto s = extractor.PutCF(static_cast<uint32_t>(ColumnFamilyID::PrimarySubkey), page_key, std::string(4, '\1'));
-  ASSERT_TRUE(s.IsNotSupported()) << s.ToString();
-  EXPECT_NE(s.ToString().find("MBbloomCF command migration is not supported"), std::string::npos);
-}
-
 TEST_F(RedisCuckooFilterTest, ReserveVerifyMetadata) {
   uint64_t capacity = 1000;
   uint8_t bucket_size = 4;

tests/gocase/integration/replication/replication_test.go

@@ -357,10 +357,10 @@ func TestReplicationWithLimitSpeed(t *testing.T) {
 	util.Populate(t, slaveClient, "", 1026, 1)
 
 	t.Run("resume broken transfer based files", func(t *testing.T) {
+		// Try to transfer some files, because max-replication-mb 1,
+		// so maybe more than 5 files are transferred for sleep 5s.
 		util.SlaveOf(t, slaveClient, master)
-		require.Eventually(t, func() bool {
-			return slave.LogFileMatches(t, `.*\[fetch\] Fetched .*`)
-		}, 50*time.Second, time.Second)
+		time.Sleep(5 * time.Second)
 
 		// Restart master server, let the slave try to full sync with master again,
 		// because slave already received some SST files, so we will skip them.