Skip to content

fix scan bug #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wangyj1203 wants to merge 4 commits into
base: unstable
Choose a base branch
from
Open

fix scan bug #450

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9277bb5
fix scan bug
wangyj1203 Jan 21, 2026
b23af56
Update scan.cpp
wangyj1203 Jan 28, 2026
8e2b522
Update scan.cpp
wangyj1203 Jan 28, 2026
c98c1c9
Fix the code style in scan command
wangyj1203 Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/tendisplus/commands/scan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,11 +791,11 @@ class ScanCommand : public Command {
auto kvstoreSlots = getKvstoreSlots(kvstoreId, kvstoreCount, slots);
auto cursor = txn->createDataCursor();
cursor->seek(lastScanRecordKey.encode());
auto seekSlotId = lastScanRecordKey.getChunkId();

while (result.size() < count && *scanTimes < scanMaxTimes) {
// get cursor current record and iterate next cursor
auto expRecord = cursor->next();
(*scanTimes)++;

// ERR_EXHAUST means this kv-store has been iterated over
if (expRecord.status().code() == ErrorCodes::ERR_EXHAUST) {
Expand Down Expand Up @@ -828,7 +828,8 @@ class ScanCommand : public Command {
auto recordSlotId = record.getRecordKey().getChunkId();
auto recordDbId = record.getRecordKey().getDbId();
auto recordType = record.getRecordKey().getRecordType();
if (!kvstoreSlots.test(recordSlotId) || recordDbId != dbId ||
auto isRecordValidSlotId = kvstoreSlots.test(recordSlotId);
if (!isRecordValidSlotId || recordDbId != dbId ||
recordType != RecordType::RT_DATA_META) {
// seq: this key in DBID db's position
// means, recordDbId == dbId && recordType == RT_DATA_META
Expand All @@ -841,18 +842,25 @@ class ScanCommand : public Command {
// recordType == RecordType::RT_DATA_META) {
// (*seq)++;
// }
auto nextSlot = getNextSlot(slots, recordSlotId);
int32_t nextSlot = recordSlotId;
if (!isRecordValidSlotId || recordSlotId == seekSlotId ||
rt2Char(recordType) > rt2Char(RecordType::RT_DATA_META) ||
recordDbId > dbId) {
nextSlot = getNextSlot(slots, recordSlotId);
}
// nextSlot == -1 means this kv-store has been iterated over
if (nextSlot == -1) {
break;
}

// construct new record key to seek
auto nextRecordKey = genRecordKey(nextSlot, dbId, "");
seekSlotId = nextSlot;
auto nextRecordKey = genRecordKey(seekSlotId, dbId, "");
cursor->seek(nextRecordKey.encode());
continue;
}

(*scanTimes)++;
/**
* check if this record has expired
* expired key shouldn't increase scanTimes,
Expand Down