Skip to content
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

fix: fix how the buffer limit check evaluates streams config #6876

Merged
merged 3 commits into from
Jan 21, 2021
Merged

fix: fix how the buffer limit check evaluates streams config #6876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dd8af2
fix: fix how the buffer limit check evaluates streams config
rodesai Jan 20, 2021
3bec457
checkstyle
rodesai Jan 20, 2021
2d3eb38
pr feedback
rodesai Jan 21, 2021
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
15 changes: 7 additions & 8 deletions ksqldb-engine/src/main/java/io/confluent/ksql/query/KafkaStreamsQueryValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

package io.confluent.ksql.query;

import com.google.common.collect.ImmutableMap;
import io.confluent.ksql.config.SessionConfig;
import io.confluent.ksql.physical.PhysicalPlan;
import io.confluent.ksql.util.KsqlConfig;
Expand All @@ -23,6 +22,8 @@
import io.confluent.ksql.util.QueryMetadata;
import io.confluent.ksql.util.TransientQueryMetadata;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.kafka.streams.StreamsConfig;

Expand Down Expand Up @@ -87,12 +88,10 @@ private long getCacheMaxBytesBuffering(final SessionConfig config) {

private StreamsConfig getDummyStreamsConfig(final SessionConfig config) {
// hack to get at default config value
return new StreamsConfig(
ImmutableMap.<String, Object>builder()
.put(StreamsConfig.APPLICATION_ID_CONFIG, "dummy.app.id")
.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, "dummy.bootstrap")
.putAll(config.getConfig(true).getKsqlStreamConfigProps())
.build()
);
final Map<String, Object> properties = new HashMap<>();
properties.put(StreamsConfig.APPLICATION_ID_CONFIG, "dummy.app.id");
properties.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, "dummy.bootstrap");
properties.putAll(config.getConfig(true).getKsqlStreamConfigProps());
return new StreamsConfig(properties);
}
}
19 changes: 12 additions & 7 deletions ksqldb-engine/src/test/java/io/confluent/ksql/query/KafkaStreamsQueryValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import io.confluent.ksql.util.QueryMetadata;
import io.confluent.ksql.util.TransientQueryMetadata;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.OptionalLong;
import org.apache.kafka.streams.StreamsConfig;
Expand All @@ -39,6 +38,11 @@

@RunWith(MockitoJUnitRunner.class)
public class KafkaStreamsQueryValidatorTest {
private static final Map<String, Object> BASE_STREAMS_PROPERTIES = ImmutableMap.of(
StreamsConfig.APPLICATION_ID_CONFIG, "fake-app-id",
StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, "fake-bootstrap"
);

@Mock
private TransientQueryMetadata transientQueryMetadata1;
@Mock
Expand Down Expand Up @@ -156,18 +160,19 @@ private SessionConfig configWithLimits(
final OptionalLong globalLimit
) {
final Map<String, Object> ksqlProperties = globalLimit.isPresent()
? ImmutableMap.of(config, globalLimit.getAsLong()) : Collections.emptyMap();
? ImmutableMap.<String, Object>builder()
.putAll(BASE_STREAMS_PROPERTIES).put(config, globalLimit.getAsLong()).build()
: BASE_STREAMS_PROPERTIES;
return SessionConfig.of(
new KsqlConfig(ksqlProperties),
ImmutableMap.of(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, queryLimit)
);
}

private Map<String, Object> streamPropsWithCacheLimit(long limit) {
return ImmutableMap.of(
StreamsConfig.APPLICATION_ID_CONFIG, "fake-app-id",
StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, "fake-bootstrap",
StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, limit
);
return ImmutableMap.<String, Object>builder()
.putAll(BASE_STREAMS_PROPERTIES)
.put(StreamsConfig.CACHE_MAX_BYTES_BUFFERING_CONFIG, limit)
.build();
}
}