Skip to content

MINOR: fix RocksDBStore range search #883

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

Closed
wants to merge 1 commit into from
Closed

MINOR: fix RocksDBStore range search #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public RocksDBRangeIterator(RocksIterator iter, Serdes<K, V> serdes,

@Override
public boolean hasNext() {
return super.hasNext() && comparator.compare(super.peekRawKey(), this.rawToKey) < 0;
return super.hasNext() && comparator.compare(super.peekRawKey(), this.rawToKey) <= 0;
}
}

Expand Down
5 changes: 3 additions & 2 deletions streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ public void flush() {

@Override
public void close() {
flush();
for (Segment segment : segments) {
if (segment != null)
segment.close();
Expand Down Expand Up @@ -271,15 +272,15 @@ public WindowStoreIterator<V> fetch(K key, long timeFrom, long timeTo) {
long segTo = segmentId(Math.max(0L, timeTo));

byte[] binaryFrom = WindowStoreUtils.toBinaryKey(key, timeFrom, 0, serdes);
byte[] binaryUntil = WindowStoreUtils.toBinaryKey(key, timeTo + 1L, 0, serdes);
byte[] binaryTo = WindowStoreUtils.toBinaryKey(key, timeTo, Integer.MAX_VALUE, serdes);

ArrayList<KeyValueIterator<byte[], byte[]>> iterators = new ArrayList<>();

for (long segmentId = segFrom; segmentId <= segTo; segmentId++) {
Segment segment = segments[(int) (segmentId % segments.length)];

if (segment != null && segment.id == segmentId)
iterators.add(segment.range(binaryFrom, binaryUntil));
iterators.add(segment.range(binaryFrom, binaryTo));
}

if (iterators.size() > 0) {
Expand Down