Skip to content

Kafka-15126: fix merge issue and range queries to accept null lower and upper bounds #14137

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

Merged
bbejeck merged 1 commit into from
Aug 8, 2023
Merged

Kafka-15126: fix merge issue and range queries to accept null lower and upper bounds #14137

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
3 changes: 2 additions & 1 deletion streams/src/main/java/org/apache/kafka/streams/query/RangeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,12 @@ private RangeQuery(final Optional<K> lower, final Optional<K> upper) {
* @param <V> The value type
*/
public static <K, V> RangeQuery<K, V> withRange(final K lower, final K upper) {
return new RangeQuery<>(Optional.of(lower), Optional.of(upper));
return new RangeQuery<>(Optional.ofNullable(lower), Optional.ofNullable(upper));
}

/**
* Interactive range query using an upper bound to filter the keys returned.
* If both <K,V> are null, RangQuery returns a full range scan.
* @param upper The key that specifies the upper bound of the range
* @param <K> The key type
* @param <V> The value type
Expand Down
11 changes: 2 additions & 9 deletions streams/src/test/java/org/apache/kafka/streams/integration/IQv2StoreIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,15 +1089,8 @@ public <V> void shouldHandleRangeQuery(
final Set<Integer> expectedValue) {

final RangeQuery<Integer, V> query;
if (lower.isPresent() && upper.isPresent()) {
query = RangeQuery.withRange(lower.get(), upper.get());
} else if (lower.isPresent()) {
query = RangeQuery.withLowerBound(lower.get());
} else if (upper.isPresent()) {
query = RangeQuery.withUpperBound(upper.get());
} else {
query = RangeQuery.withNoBounds();
}

query = RangeQuery.withRange(lower.orElse(null), upper.orElse(null));

final StateQueryRequest<KeyValueIterator<Integer, V>> request =
inStore(STORE_NAME)
Expand Down