jihuayu commented on code in PR #3481:
URL: https://github.com/apache/kvrocks/pull/3481#discussion_r3448513265
##########
tests/gocase/integration/replication/replication_test.go:
##########
@@ -359,7 +372,9 @@ func TestReplicationWithLimitSpeed(t *testing.T) {
require.Eventually(t, func() bool {
return slave.LogFileMatches(t, ".*skip count: 1.*")
}, 50*time.Second, 1000*time.Millisecond)
- util.WaitForSync(t, slaveClient)
+ require.Eventually(t, func() bool {
+ return util.FindInfoEntry(slaveClient,
"master_link_status") == "up"
+ }, 50*time.Second, 100*time.Millisecond)
Review Comment:
This code seems unrelated to this PR; please revert to it.
##########
src/storage/batch_extractor.cc:
##########
@@ -261,7 +264,10 @@ rocksdb::Status WriteBatchExtractor::PutCF(uint32_t
column_family_id, const Slic
}
break;
}
- // TODO: to implement the case of kRedisBloomFilter
+ case kRedisCuckooFilter:
+ return rocksdb::Status::NotSupported(
+ "MBbloomCF command migration is not supported; use raw key-value
migration");
+ // TODO: to implement the case of kRedisBloomFilter
Review Comment:
Remove it.
https://github.com/nagisa-kunhah/kvrocks/blob/a6d50b66fa84ada9f19ea7a5bd52cd1f447183c4/src/storage/batch_extractor.cc#L270
##########
src/cluster/slot_migrate.cc:
##########
@@ -718,6 +718,11 @@ 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"};
+ }
Review Comment:
```suggestion
```
Please remove it. We just do as BloomFilter
##########
tests/gocase/integration/replication/replication_test.go:
##########
@@ -344,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)
- time.Sleep(5 * time.Second)
+ require.Eventually(t, func() bool {
+ return slave.LogFileMatches(t, `.*\[fetch\] Fetched .*`)
+ }, 50*time.Second, time.Second)
Review Comment:
This code seems unrelated to this PR; please revert to it.
##########
src/storage/batch_extractor.cc:
##########
@@ -60,6 +60,9 @@ 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");
+ }
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
