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

chore: update KSQL_PULL_QUERIES_ENABLE_CONFIG name (MINOR) #4059

Merged
merged 4 commits into from
Dec 10, 2019
Merged

chore: update KSQL_PULL_QUERIES_ENABLE_CONFIG name (MINOR) #4059

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8d7cc0
chore: update KSQL_PULL_QUERIES_ENABLE_CONFIG name
vcrfxia Dec 6, 2019
7af7816
Merge branch 'master' into disable-pull-config-2
vcrfxia Dec 9, 2019
c8b43ff
chore: update more occurrences of old config
vcrfxia Dec 9, 2019
a448648
chore: undo whitespace change
vcrfxia Dec 9, 2019
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 ksql-common/src/main/java/io/confluent/ksql/config/ImmutableProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public final class ImmutableProperties {
.add(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG)
.add(KsqlConfig.KSQL_EXT_DIR)
.add(KsqlConfig.KSQL_ACTIVE_PERSISTENT_QUERY_LIMIT_CONFIG)
.add(KsqlConfig.KSQL_QUERY_PULL_ENABLE_CONFIG)
.add(KsqlConfig.KSQL_PULL_QUERIES_ENABLE_CONFIG)
.add(KsqlConfig.KSQL_PULL_QUERIES_SKIP_ACCESS_VALIDATOR_CONFIG)
.addAll(KsqlConfig.SSL_CONFIG_NAMES)
.build();
Expand Down
4 changes: 2 additions & 2 deletions ksql-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public class KsqlConfig extends AbstractConfig {
+ " which are secured with ACLs. Please enable only after careful consideration."
+ " If \"false\", KSQL pull queries will fail against a secure Kafka cluster";

public static final String KSQL_QUERY_PULL_ENABLE_CONFIG = "ksql.query.pull.enable";
public static final String KSQL_PULL_QUERIES_ENABLE_CONFIG = "ksql.pull.queries.enable";
public static final String KSQL_QUERY_PULL_ENABLE_DOC =
"Config to enable or disable transient pull queries on a specific KSQL server.";
public static final boolean KSQL_QUERY_PULL_ENABLE_DEFAULT = true;
Expand Down Expand Up @@ -465,7 +465,7 @@ private static ConfigDef buildConfigDef(final ConfigGeneration generation) {
Importance.LOW,
METRIC_REPORTER_CLASSES_DOC
).define(
KSQL_QUERY_PULL_ENABLE_CONFIG,
KSQL_PULL_QUERIES_ENABLE_CONFIG,
Type.BOOLEAN,
KSQL_QUERY_PULL_ENABLE_DEFAULT,
Importance.LOW,
Expand Down
2 changes: 1 addition & 1 deletion ...xpected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_both_join_keys_in_projection
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...ts/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_rekey
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...xpected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_right_join_key_in_projection
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...0_6_0-pre/joins_-_stream_to_table_when_neither_have_key_field_and_joining_by_table_ROWKEY
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...0-pre/key-field_-_stream___initially_null___partition_by_(-)___key_in_value___no_aliasing
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...ey-field_-_stream___initially_set___partition_by_(different)___key_in_value___no_aliasing
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...nctional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWTIME
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...rces/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_partition_by_value
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_value
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...ources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...urces/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_some
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
2 changes: 1 addition & 1 deletion ...s/expected_topology/0_6_0-pre/quoted-identifiers_-_joins_using_fields_that_require_quotes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ksql.internal.topic.min.insync.replicas" : "1",
"ksql.internal.topic.replicas" : "1",
"ksql.insert.into.values.enabled" : "true",
"ksql.query.pull.enable" : "true",
"ksql.pull.queries.enable" : "true",
"ksql.streams.default.production.exception.handler" : "io.confluent.ksql.errors.ProductionExceptionHandlerUtil$LogAndFailProductionExceptionHandler",
"ksql.access.validator.enable" : "auto",
"ksql.streams.bootstrap.servers" : "localhost:0",
Expand Down
4 changes: 2 additions & 2 deletions ksql-rest-app/src/main/java/io/confluent/ksql/rest/server/execution/PullQueryExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ public static TableRowsEntity execute(
throw new IllegalArgumentException("Executor can only handle pull queries");
}

if (!statement.getConfig().getBoolean(KsqlConfig.KSQL_QUERY_PULL_ENABLE_CONFIG)) {
if (!statement.getConfig().getBoolean(KsqlConfig.KSQL_PULL_QUERIES_ENABLE_CONFIG)) {
throw new KsqlException(
"Pull queries are disabled. "
+ PullQueryValidator.NEW_QUERY_SYNTAX_SHORT_HELP
+ System.lineSeparator()
+ "Please set " + KsqlConfig.KSQL_QUERY_PULL_ENABLE_CONFIG + "=true to enable "
+ "Please set " + KsqlConfig.KSQL_PULL_QUERIES_ENABLE_CONFIG + "=true to enable "
+ "this feature.");
}

Expand Down
2 changes: 1 addition & 1 deletion ...rest-app/src/test/java/io/confluent/ksql/rest/server/execution/PullQueryExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class PullQueryExecutorTest {
public static class Disabled {
@Rule
public final TemporaryEngine engine = new TemporaryEngine()
.withConfigs(ImmutableMap.of(KsqlConfig.KSQL_QUERY_PULL_ENABLE_CONFIG, false));
.withConfigs(ImmutableMap.of(KsqlConfig.KSQL_PULL_QUERIES_ENABLE_CONFIG, false));

@Rule
public final ExpectedException expectedException = ExpectedException.none();
Expand Down