diff --git a/ksql-engine/src/main/java/io/confluent/ksql/planner/LogicalPlanner.java b/ksql-engine/src/main/java/io/confluent/ksql/planner/LogicalPlanner.java index 2a55eb76f14c..f76b4f68459f 100644 --- a/ksql-engine/src/main/java/io/confluent/ksql/planner/LogicalPlanner.java +++ b/ksql-engine/src/main/java/io/confluent/ksql/planner/LogicalPlanner.java @@ -199,7 +199,7 @@ private static FilterNode buildFilterNode( final PlanNode sourcePlanNode, final Expression filterExpression ) { - return new FilterNode(new PlanNodeId("Filter"), sourcePlanNode, filterExpression); + return new FilterNode(new PlanNodeId("WhereFilter"), sourcePlanNode, filterExpression); } private static RepartitionNode buildRepartitionNode( diff --git a/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/AggregateNode.java b/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/AggregateNode.java index 31f5ef480ad7..6bcb6e98a85e 100644 --- a/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/AggregateNode.java +++ b/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/AggregateNode.java @@ -58,13 +58,11 @@ public class AggregateNode extends PlanNode { private static final String INTERNAL_COLUMN_NAME_PREFIX = "KSQL_INTERNAL_COL_"; - private static final String PREPARE_OP_NAME = "prepare"; - private static final String AGGREGATION_OP_NAME = "aggregate"; - private static final String GROUP_BY_OP_NAME = "groupby"; - private static final String HAVING_FILTER_OP_NAME = "having-filter"; - private static final String PROJECT_OP_NAME = "project"; - - private static final String PRE_AGGR_SELECT_NODE_NAME = "PRE-AGGREGATE-SELECT"; + private static final String PREPARE_OP_NAME = "Prepare"; + private static final String AGGREGATION_OP_NAME = "Aggregate"; + private static final String GROUP_BY_OP_NAME = "GroupBy"; + private static final String HAVING_FILTER_OP_NAME = "HavingFilter"; + private static final String PROJECT_OP_NAME = "Project"; private final PlanNode source; private final LogicalSchema schema; @@ -192,7 +190,6 @@ public SchemaKStream buildStream(final KsqlQueryBuilder builder) { final SchemaKStream aggregateArgExpanded = sourceSchemaKStream.select( internalSchema.getAggArgExpansionList(), - PRE_AGGR_SELECT_NODE_NAME, contextStacker.push(PREPARE_OP_NAME), builder ); @@ -240,7 +237,6 @@ public SchemaKStream buildStream(final KsqlQueryBuilder builder) { if (havingExpression.isPresent()) { aggregated = aggregated.filter( havingExpression.get(), - HAVING_FILTER_OP_NAME.toUpperCase(), contextStacker.push(HAVING_FILTER_OP_NAME) ); } @@ -250,7 +246,6 @@ public SchemaKStream buildStream(final KsqlQueryBuilder builder) { return aggregated.select( finalSelects, - ProjectNode.SELECT_NODE_NAME, contextStacker.push(PROJECT_OP_NAME), builder ); diff --git a/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/DataSourceNode.java b/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/DataSourceNode.java index aa0891e6b781..cd9b35297043 100644 --- a/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/DataSourceNode.java +++ b/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/DataSourceNode.java @@ -44,7 +44,7 @@ @Immutable public class DataSourceNode extends PlanNode { - private static final String SOURCE_OP_NAME = "source"; + private static final String SOURCE_OP_NAME = "Source"; private final DataSource dataSource; private final SourceName alias; diff --git a/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/FilterNode.java b/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/FilterNode.java index 3b1a6b1c68e7..a648904cc156 100644 --- a/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/FilterNode.java +++ b/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/FilterNode.java @@ -31,7 +31,6 @@ @Immutable public class FilterNode extends PlanNode { - private static final String WHERE_FILTER_OP_NAME = "WHERE-FILTER"; private final PlanNode source; private final Expression predicate; private final ImmutableList selectExpressions; @@ -93,8 +92,7 @@ public SchemaKStream buildStream(final KsqlQueryBuilder builder) { return getSource().buildStream(builder) .filter( getPredicate(), - WHERE_FILTER_OP_NAME, - contextStacker.push(WHERE_FILTER_OP_NAME.toLowerCase()) + contextStacker ); } } diff --git a/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/ProjectNode.java b/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/ProjectNode.java index a1a75a68da25..c6c83d066b56 100644 --- a/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/ProjectNode.java +++ b/ksql-engine/src/main/java/io/confluent/ksql/planner/plan/ProjectNode.java @@ -34,8 +34,6 @@ @Immutable public class ProjectNode extends PlanNode { - static final String SELECT_NODE_NAME = "SELECT"; - private final PlanNode source; private final LogicalSchema schema; private final ImmutableList projectExpressions; @@ -102,7 +100,6 @@ public SchemaKStream buildStream(final KsqlQueryBuilder builder) { return getSource().buildStream(builder) .select( getSelectExpressions(), - SELECT_NODE_NAME, builder.buildNodeContext(getId().toString()), builder ); diff --git a/ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKStream.java b/ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKStream.java index 62c46f565770..097c0670b15a 100644 --- a/ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKStream.java +++ b/ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKStream.java @@ -116,14 +116,12 @@ public SchemaKStream into( public SchemaKStream filter( final Expression filterExpression, - final String stepName, final Stacker contextStacker ) { final StreamFilter step = ExecutionStepFactory.streamFilter( contextStacker, sourceStep, - rewriteTimeComparisonForFilter(filterExpression), - stepName + rewriteTimeComparisonForFilter(filterExpression) ); return new SchemaKStream<>( @@ -143,7 +141,6 @@ static Expression rewriteTimeComparisonForFilter(final Expression expression) { public SchemaKStream select( final List selectExpressions, - final String selectNodeName, final QueryContext.Stacker contextStacker, final KsqlQueryBuilder ksqlQueryBuilder ) { @@ -151,8 +148,7 @@ public SchemaKStream select( final StreamMapValues step = ExecutionStepFactory.streamMapValues( contextStacker, sourceStep, - selectExpressions, - selectNodeName + selectExpressions ); return new SchemaKStream<>( diff --git a/ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKTable.java b/ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKTable.java index a4f714d02543..13e260a417d1 100644 --- a/ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKTable.java +++ b/ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKTable.java @@ -93,14 +93,12 @@ public SchemaKTable into( @Override public SchemaKTable filter( final Expression filterExpression, - final String stepName, final Stacker contextStacker ) { final TableFilter step = ExecutionStepFactory.tableFilter( contextStacker, sourceTableStep, - rewriteTimeComparisonForFilter(filterExpression), - stepName + rewriteTimeComparisonForFilter(filterExpression) ); return new SchemaKTable<>( @@ -116,7 +114,6 @@ public SchemaKTable filter( @Override public SchemaKTable select( final List selectExpressions, - final String selectNodeName, final QueryContext.Stacker contextStacker, final KsqlQueryBuilder ksqlQueryBuilder ) { @@ -124,8 +121,7 @@ public SchemaKTable select( final TableMapValues step = ExecutionStepFactory.tableMapValues( contextStacker, sourceTableStep, - selectExpressions, - selectNodeName + selectExpressions ); return new SchemaKTable<>( diff --git a/ksql-engine/src/test/java/io/confluent/ksql/physical/PhysicalPlanBuilderTest.java b/ksql-engine/src/test/java/io/confluent/ksql/physical/PhysicalPlanBuilderTest.java index d79a9f0b8ab4..c165a709b96d 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/physical/PhysicalPlanBuilderTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/physical/PhysicalPlanBuilderTest.java @@ -247,7 +247,7 @@ public void shouldCreateExecutionPlanForInsert() { Assert.assertEquals(lines[1], "\t\t > [ PROJECT ] | Schema: [ROWKEY STRING KEY, COL0 BIGINT, COL1 STRING, COL2 DOUBLE] | Logger: InsertQuery_1.Project"); Assert.assertEquals(lines[2], - "\t\t\t\t > [ SOURCE ] | Schema: [TEST1.ROWKEY STRING KEY, TEST1.ROWTIME BIGINT, TEST1.ROWKEY STRING, TEST1.COL0 BIGINT, TEST1.COL1 STRING, TEST1.COL2 DOUBLE] | Logger: InsertQuery_1.KsqlTopic.source"); + "\t\t\t\t > [ SOURCE ] | Schema: [TEST1.ROWKEY STRING KEY, TEST1.ROWTIME BIGINT, TEST1.ROWKEY STRING, TEST1.COL0 BIGINT, TEST1.COL1 STRING, TEST1.COL2 DOUBLE] | Logger: InsertQuery_1.KsqlTopic.Source"); assertThat(queryMetadataList.get(1), instanceOf(PersistentQueryMetadata.class)); final PersistentQueryMetadata persistentQuery = (PersistentQueryMetadata) queryMetadataList.get(1); diff --git a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/AggregateNodeTest.java b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/AggregateNodeTest.java index 4aefc3206049..45a0e0a80329 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/AggregateNodeTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/AggregateNodeTest.java @@ -110,11 +110,6 @@ public class AggregateNodeTest { private final ProcessingLogContext processingLogContext = ProcessingLogContext.create(); private final QueryId queryId = new QueryId("queryid"); - @Before - public void setUp() { - when(ksqlStreamBuilder.buildUniqueNodeName(any())).thenAnswer(inv -> inv.getArgument(0)); - } - @Test public void shouldBuildSourceNode() { // When: @@ -210,11 +205,11 @@ public void shouldHaveSourceNodeForSecondSubtopolgyWithKsqlNameForRepartition() // Then: final TopologyDescription.Source node = (TopologyDescription.Source) getNodeByName( - builder.build(), "Aggregate-groupby-repartition-source"); + builder.build(), "Aggregate-GroupBy-repartition-source"); final List successors = node.successors().stream().map(TopologyDescription.Node::name).collect(Collectors.toList()); assertThat(node.predecessors(), equalTo(Collections.emptySet())); assertThat(successors, equalTo(Collections.singletonList("KSTREAM-AGGREGATE-0000000005"))); - assertThat(node.topicSet(), containsInAnyOrder("Aggregate-groupby-repartition")); + assertThat(node.topicSet(), containsInAnyOrder("Aggregate-GroupBy-repartition")); } @Test @@ -222,7 +217,7 @@ public void shouldHaveKsqlNameForAggregationStateStore() { build(); final TopologyDescription.Processor node = (TopologyDescription.Processor) getNodeByName( builder.build(), "KSTREAM-AGGREGATE-0000000004"); - assertThat(node.stores(), hasItem(equalTo("Aggregate-aggregate"))); + assertThat(node.stores(), hasItem(equalTo("Aggregate-Aggregate-Materialize"))); } @Test @@ -234,9 +229,9 @@ public void shouldHaveSinkNodeWithSameTopicAsSecondSource() { // Then: final TopologyDescription.Sink sink = (TopologyDescription.Sink) getNodeByName(builder.build(), - "Aggregate-groupby-repartition-sink"); + "Aggregate-GroupBy-repartition-sink"); final TopologyDescription.Source source = (TopologyDescription.Source) getNodeByName( - builder.build(), "Aggregate-groupby-repartition-source"); + builder.build(), "Aggregate-GroupBy-repartition-source"); assertThat(sink.successors(), equalTo(Collections.emptySet())); assertThat(source.topicSet(), hasItem(sink.topic())); } @@ -304,9 +299,9 @@ public void shouldCreateLoggers() { .collect(Collectors.toList()); assertThat(loggers, contains( - "queryid.KsqlTopic.source", - "queryid.Aggregate.groupby", - "queryid.Aggregate.aggregate" + "queryid.KsqlTopic.Source", + "queryid.Aggregate.GroupBy", + "queryid.Aggregate.Aggregate.Materialize" )); } diff --git a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/DataSourceNodeTest.java b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/DataSourceNodeTest.java index 56bfec8ec79b..6646754b1f3e 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/DataSourceNodeTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/DataSourceNodeTest.java @@ -309,7 +309,7 @@ public void shouldBuildSourceStreamWithCorrectParams() { ); assertThat( stackerCaptor.getValue().getQueryContext().getContext(), - equalTo(ImmutableList.of("0", "source")) + equalTo(ImmutableList.of("0", "Source")) ); } @@ -332,7 +332,7 @@ public void shouldBuildSourceStreamWithCorrectParamsWhenBuildingTable() { ); assertThat( stackerCaptor.getValue().getQueryContext().getContext(), - equalTo(ImmutableList.of("0", "source")) + equalTo(ImmutableList.of("0", "Source")) ); } diff --git a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/FilterNodeTest.java b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/FilterNodeTest.java index 964872c3ebb7..305c6f1769e7 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/FilterNodeTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/FilterNodeTest.java @@ -18,6 +18,7 @@ import static io.confluent.ksql.metastore.model.DataSource.DataSourceType; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -45,8 +46,6 @@ public class FilterNodeTest { private KsqlQueryBuilder ksqlStreamBuilder; @Mock private Stacker stacker; - @Mock - private Stacker updatedStacker; private FilterNode node; @@ -59,11 +58,10 @@ public void setup() { when(sourceNode.buildStream(any())) .thenReturn(schemaKStream); when(sourceNode.getNodeOutputType()).thenReturn(DataSourceType.KSTREAM); - when(schemaKStream.filter(any(), any(), any())) + when(schemaKStream.filter(any(), any())) .thenReturn(schemaKStream); when(ksqlStreamBuilder.buildNodeContext(nodeId.toString())).thenReturn(stacker); - when(stacker.push(any())).thenReturn(updatedStacker); node = new FilterNode(nodeId, sourceNode, predicate); } @@ -75,7 +73,7 @@ public void shouldApplyFilterCorrectly() { // Then: verify(sourceNode).buildStream(ksqlStreamBuilder); - verify(schemaKStream).filter(predicate, "WHERE-FILTER", updatedStacker); + verify(schemaKStream).filter(predicate, stacker); } @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_INFERRED") @@ -85,6 +83,6 @@ public void shouldUseRightOpName() { node.buildStream(ksqlStreamBuilder); // Then: - verify(stacker).push("where-filter"); + verifyNoMoreInteractions(stacker); } } diff --git a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/JoinNodeTest.java b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/JoinNodeTest.java index cbc73aab8da5..e2bc3c93c53f 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/JoinNodeTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/JoinNodeTest.java @@ -275,7 +275,7 @@ public void shouldHaveLeftJoin() { = (TopologyDescription.Processor) getNodeByName(topology, "Join"); final List predecessors = leftJoin.predecessors().stream() .map(TopologyDescription.Node::name).collect(Collectors.toList()); - assertThat(leftJoin.stores(), equalTo(Utils.mkSet("KafkaTopic_Right-reduce"))); + assertThat(leftJoin.stores(), equalTo(Utils.mkSet("KafkaTopic_Right-Reduce"))); assertThat(predecessors, equalTo(Collections.singletonList("Join-repartition-source"))); } diff --git a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/KsqlBareOutputNodeTest.java b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/KsqlBareOutputNodeTest.java index d7a777b7cbef..4d3e944cb5c6 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/KsqlBareOutputNodeTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/KsqlBareOutputNodeTest.java @@ -63,8 +63,8 @@ @RunWith(MockitoJUnitRunner.class) public class KsqlBareOutputNodeTest { - private static final String FILTER_NODE = "WHERE-FILTER-unique"; - private static final String FILTER_MAPVALUES_NODE = "SELECT-unique"; + private static final String FILTER_NODE = "WhereFilter"; + private static final String FILTER_MAPVALUES_NODE = "Project"; private static final String SIMPLE_SELECT_WITH_FILTER = "SELECT col0, col2, col3 FROM test1 WHERE col0 > 100 EMIT CHANGES;"; private SchemaKStream stream; @@ -93,7 +93,6 @@ public void before() { new QueryContext.Stacker() .push(inv.getArgument(0).toString())); when(ksqlStreamBuilder.buildKeySerde(any(), any(), any())).thenReturn(keySerde); - when(ksqlStreamBuilder.buildUniqueNodeName(any())).thenAnswer(inv -> inv.getArgument(0) + "-unique"); final KsqlBareOutputNode planNode = (KsqlBareOutputNode) AnalysisTestUtil .buildLogicalPlan(ksqlConfig, SIMPLE_SELECT_WITH_FILTER, metaStore); diff --git a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/ProjectNodeTest.java b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/ProjectNodeTest.java index 8d7dca0e4113..c9f1ed2da116 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/ProjectNodeTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/planner/plan/ProjectNodeTest.java @@ -76,7 +76,7 @@ public void init() { when(source.getNodeOutputType()).thenReturn(DataSourceType.KSTREAM); when(source.getSelectExpressions()).thenReturn(ImmutableList.of(SELECT_0, SELECT_1)); when(ksqlStreamBuilder.buildNodeContext(NODE_ID.toString())).thenReturn(stacker); - when(stream.select(any(), any(), any(), any())).thenReturn((SchemaKStream) stream); + when(stream.select(any(), any(), any())).thenReturn((SchemaKStream) stream); projectNode = new ProjectNode( NODE_ID, @@ -126,7 +126,6 @@ public void shouldCreateProjectionWithFieldNameExpressionPairs() { // Then: verify(stream).select( eq(ImmutableList.of(SELECT_0, SELECT_1)), - eq("SELECT"), eq(stacker), same(ksqlStreamBuilder) ); diff --git a/ksql-engine/src/test/java/io/confluent/ksql/structured/SchemaKStreamTest.java b/ksql-engine/src/test/java/io/confluent/ksql/structured/SchemaKStreamTest.java index 000c1d9a7670..e83a44daef71 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/structured/SchemaKStreamTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/structured/SchemaKStreamTest.java @@ -80,8 +80,6 @@ public class SchemaKStreamTest { private static final Expression COL1 = new ColumnReferenceExp(ColumnRef.of(TEST1, ColumnName.of("COL1"))); - private static final String SELECT_NODE_NAME = "SelectStep"; - private final KsqlConfig ksqlConfig = new KsqlConfig(Collections.emptyMap()); private final MetaStore metaStore = MetaStoreFixture.getNewMetaStore(new InternalFunctionRegistry()); private final KeyField validJoinKeyField = KeyField @@ -140,7 +138,6 @@ public void testSelectSchemaKStream() { // When: final SchemaKStream projectedSchemaKStream = initialSchemaKStream.select( selectExpressions, - SELECT_NODE_NAME, childContextStacker, queryBuilder); @@ -163,7 +160,6 @@ public void shouldBuildStepForSelect() { // When: final SchemaKStream projectedSchemaKStream = initialSchemaKStream.select( selectExpressions, - SELECT_NODE_NAME, childContextStacker, queryBuilder); @@ -174,8 +170,7 @@ public void shouldBuildStepForSelect() { ExecutionStepFactory.streamMapValues( childContextStacker, initialSchemaKStream.getSourceStep(), - selectExpressions, - SELECT_NODE_NAME + selectExpressions ) ) ); @@ -192,7 +187,6 @@ public void shouldBuildSchemaForSelect() { // When: final SchemaKStream projectedSchemaKStream = initialSchemaKStream.select( selectExpressions, - SELECT_NODE_NAME, childContextStacker, queryBuilder); @@ -214,7 +208,7 @@ public void shouldUpdateKeyIfRenamed() { // When: final SchemaKStream result = initialSchemaKStream - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), @@ -231,7 +225,7 @@ public void shouldUpdateKeyIfRenamedViaFullyQualifiedName() { // When: final SchemaKStream result = initialSchemaKStream - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), @@ -248,7 +242,7 @@ public void shouldUpdateKeyIfRenamedAndSourceIsAliased() { // When: final SchemaKStream result = initialSchemaKStream - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), @@ -264,7 +258,7 @@ public void shouldPreserveKeyOnSelectStar() { // When: final SchemaKStream result = initialSchemaKStream - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), KeyFieldMatchers.hasName("COL0")); @@ -279,7 +273,7 @@ public void shouldUpdateKeyIfMovedToDifferentIndex() { // When: final SchemaKStream result = initialSchemaKStream - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), @@ -295,7 +289,7 @@ public void shouldDropKeyIfNotSelected() { // When: final SchemaKStream result = initialSchemaKStream - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), is(KeyField.none())); @@ -310,7 +304,7 @@ public void shouldHandleSourceWithoutKey() { // When: final SchemaKStream result = initialSchemaKStream - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), is(KeyField.none())); @@ -326,7 +320,6 @@ public void testSelectWithExpression() { // When: final SchemaKStream projectedSchemaKStream = initialSchemaKStream.select( projectNode.getSelectExpressions(), - SELECT_NODE_NAME, childContextStacker, queryBuilder); @@ -349,7 +342,6 @@ public void shouldReturnSchemaKStreamWithCorrectSchemaForFilter() { // When: final SchemaKStream filteredSchemaKStream = initialSchemaKStream.filter( filterNode.getPredicate(), - "step", childContextStacker ); @@ -378,7 +370,6 @@ public void shouldRewriteTimeComparisonInFilter() { // When: final SchemaKStream filteredSchemaKStream = initialSchemaKStream.filter( filterNode.getPredicate(), - "step", childContextStacker ); @@ -406,7 +397,6 @@ public void shouldBuildStepForFilter() { // When: final SchemaKStream filteredSchemaKStream = initialSchemaKStream.filter( filterNode.getPredicate(), - "step", childContextStacker ); @@ -417,8 +407,7 @@ public void shouldBuildStepForFilter() { ExecutionStepFactory.streamFilter( childContextStacker, initialSchemaKStream.getSourceStep(), - filterNode.getPredicate(), - "step" + filterNode.getPredicate() ) ) ); diff --git a/ksql-engine/src/test/java/io/confluent/ksql/structured/SchemaKTableTest.java b/ksql-engine/src/test/java/io/confluent/ksql/structured/SchemaKTableTest.java index 8ef392317514..94321a73dd10 100644 --- a/ksql-engine/src/test/java/io/confluent/ksql/structured/SchemaKTableTest.java +++ b/ksql-engine/src/test/java/io/confluent/ksql/structured/SchemaKTableTest.java @@ -127,8 +127,6 @@ public class SchemaKTableTest { private final Grouped grouped = Grouped.with( "group", Serdes.String(), Serdes.String()); - private static final String SELECT_NODE_NAME = "SelectStep"; - private SchemaKTable initialSchemaKTable; private KTable kTable; private KTable secondKTable; @@ -279,7 +277,6 @@ public void testSelectSchemaKStream() { // When: final SchemaKTable projectedSchemaKStream = initialSchemaKTable.select( projectNode.getSelectExpressions(), - SELECT_NODE_NAME, childContextStacker, queryBuilder ); @@ -303,7 +300,6 @@ public void shouldBuildStepForSelect() { // When: final SchemaKTable projectedSchemaKStream = initialSchemaKTable.select( projectNode.getSelectExpressions(), - SELECT_NODE_NAME, childContextStacker, queryBuilder ); @@ -315,8 +311,7 @@ public void shouldBuildStepForSelect() { ExecutionStepFactory.tableMapValues( childContextStacker, initialSchemaKTable.getSourceTableStep(), - projectNode.getSelectExpressions(), - SELECT_NODE_NAME + projectNode.getSelectExpressions() ) ) ); @@ -333,7 +328,6 @@ public void shouldBuildSchemaForSelect() { // When: final SchemaKTable projectedSchemaKStream = initialSchemaKTable.select( projectNode.getSelectExpressions(), - SELECT_NODE_NAME, childContextStacker, queryBuilder ); @@ -357,7 +351,6 @@ public void testSelectWithExpression() { // When: final SchemaKTable projectedSchemaKStream = initialSchemaKTable.select( projectNode.getSelectExpressions(), - SELECT_NODE_NAME, childContextStacker, queryBuilder ); @@ -381,7 +374,6 @@ public void shouldBuildSchemaKTableWithCorrectSchemaForFilter() { // When: final SchemaKTable filteredSchemaKStream = initialSchemaKTable.filter( filterNode.getPredicate(), - "step", childContextStacker ); @@ -410,7 +402,6 @@ public void shouldRewriteTimeComparisonInFilter() { // When: final SchemaKTable filteredSchemaKTable = initialSchemaKTable.filter( filterNode.getPredicate(), - "step", childContextStacker ); @@ -440,7 +431,6 @@ public void shouldBuildStepForFilter() { // When: final SchemaKTable filteredSchemaKStream = initialSchemaKTable.filter( filterNode.getPredicate(), - "step", childContextStacker ); @@ -451,8 +441,7 @@ public void shouldBuildStepForFilter() { ExecutionStepFactory.tableFilter( childContextStacker, initialSchemaKTable.getSourceTableStep(), - filterNode.getPredicate(), - "step" + filterNode.getPredicate() ) ) ); @@ -735,7 +724,7 @@ public void shouldUpdateKeyIfRenamed() { // When: final SchemaKTable result = initialSchemaKTable - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); assertThat(result.getKeyField(), is(KeyField.of(ColumnRef.withoutSource(ColumnName.of("NEWKEY"))))); @@ -749,7 +738,7 @@ public void shouldUpdateKeyIfRenamedViaFullyQualifiedName() { // When: final SchemaKTable result = initialSchemaKTable - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), @@ -764,7 +753,7 @@ public void shouldUpdateKeyIfRenamedAndSourceIsAliased() { // When: final SchemaKTable result = initialSchemaKTable - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), @@ -779,7 +768,7 @@ public void shouldPreserveKeyOnSelectStar() { // When: final SchemaKTable result = initialSchemaKTable - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), KeyFieldMatchers.hasName("COL0")); @@ -793,7 +782,7 @@ public void shouldUpdateKeyIfMovedToDifferentIndex() { // When: final SchemaKTable result = initialSchemaKTable - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), @@ -808,7 +797,7 @@ public void shouldDropKeyIfNotSelected() { // When: final SchemaKTable result = initialSchemaKTable - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), is(KeyField.none())); @@ -822,7 +811,7 @@ public void shouldHandleSourceWithoutKey() { // When: final SchemaKTable result = initialSchemaKTable - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); // Then: assertThat(result.getKeyField(), is(KeyField.none())); @@ -835,7 +824,7 @@ public void shouldSetKeyOnGroupBySingleExpressionThatIsInProjection() { "SELECT * FROM test2 EMIT CHANGES;"); final SchemaKTable selected = initialSchemaKTable - .select(selectExpressions, SELECT_NODE_NAME, childContextStacker, queryBuilder); + .select(selectExpressions, childContextStacker, queryBuilder); final List groupByExprs = ImmutableList.of(TEST_2_COL_1); diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/builder/KsqlQueryBuilder.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/builder/KsqlQueryBuilder.java index a472d12f15cd..17d4b238f3e2 100644 --- a/ksql-execution/src/main/java/io/confluent/ksql/execution/builder/KsqlQueryBuilder.java +++ b/ksql-execution/src/main/java/io/confluent/ksql/execution/builder/KsqlQueryBuilder.java @@ -36,7 +36,6 @@ import io.confluent.ksql.util.KsqlConfig; import io.confluent.ksql.util.QuerySchemas; import java.util.LinkedHashMap; -import java.util.concurrent.atomic.AtomicInteger; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.streams.StreamsBuilder; @@ -53,7 +52,6 @@ public final class KsqlQueryBuilder { private final ValueSerdeFactory valueSerdeFactory; private final QueryId queryId; private final LinkedHashMap schemas = new LinkedHashMap<>(); - private final AtomicInteger nodeIdGenerator = new AtomicInteger(); public static KsqlQueryBuilder of( StreamsBuilder streamsBuilder, KsqlConfig ksqlConfig, ServiceContext serviceContext, @@ -185,8 +183,4 @@ private void track(String loggerNamePrefix, PersistenceSchema schema) { } schemas.put(loggerNamePrefix, schema); } - - public String buildUniqueNodeName(final String prefix) { - return prefix + "-" + nodeIdGenerator.getAndIncrement(); - } } diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/materialization/MaterializationInfo.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/materialization/MaterializationInfo.java index 830419f44de6..ab927b699b57 100644 --- a/ksql-execution/src/main/java/io/confluent/ksql/execution/materialization/MaterializationInfo.java +++ b/ksql-execution/src/main/java/io/confluent/ksql/execution/materialization/MaterializationInfo.java @@ -20,6 +20,7 @@ import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.Immutable; import io.confluent.ksql.GenericRow; +import io.confluent.ksql.execution.context.QueryContext; import io.confluent.ksql.execution.transform.KsqlTransformer; import io.confluent.ksql.logging.processing.ProcessingLogger; import io.confluent.ksql.schema.ksql.LogicalSchema; @@ -97,15 +98,15 @@ private Builder(String stateStoreName, LogicalSchema stateStoreSchema) { * * @param mapperFactory a factory from which to get the mapper to apply. * @param resultSchema schema after applying aggregate result mapping. - * @param stepName the name of the step, as will be used by the processing logger + * @param queryContext the query context of the step, used to create the processing logger * @return A builder instance with this transformation. */ public Builder map( final TransformFactory> mapperFactory, final LogicalSchema resultSchema, - final String stepName + final QueryContext queryContext ) { - transforms.add(new MapperInfo(mapperFactory, stepName)); + transforms.add(new MapperInfo(mapperFactory, queryContext)); this.schema = Objects.requireNonNull(resultSchema, "resultSchema"); return this; } @@ -114,14 +115,14 @@ public Builder map( * Adds a transform that filters rows from the materialization. * * @param predicateFactory a factory from which to get the predicate to apply. - * @param stepName the name of the step, as will be used by the processing logger + * @param queryContext the query context of the step, used to create the processing logger * @return A builder instance with this transformation. */ public Builder filter( final TransformFactory>> predicateFactory, - final String stepName + final QueryContext queryContext ) { - transforms.add(new PredicateInfo(predicateFactory, stepName)); + transforms.add(new PredicateInfo(predicateFactory, queryContext)); return this; } @@ -156,20 +157,20 @@ public interface TransformFactory { public static class MapperInfo implements TransformInfo { private final TransformFactory> mapperFactory; - private final String stepName; + private final QueryContext queryContext; MapperInfo( final TransformFactory> mapperFactory, - final String stepName + final QueryContext queryContext ) { this.mapperFactory = requireNonNull(mapperFactory, "mapperFactory"); - this.stepName = requireNonNull(stepName, "stepName"); + this.queryContext = requireNonNull(queryContext, "queryContext"); } public KsqlTransformer getMapper( - final Function loggerFactory + final Function loggerFactory ) { - return mapperFactory.apply(loggerFactory.apply(stepName)); + return mapperFactory.apply(loggerFactory.apply(queryContext)); } public R visit(TransformVisitor visitor) { @@ -180,20 +181,20 @@ public R visit(TransformVisitor visitor) { public static class PredicateInfo implements TransformInfo { private final TransformFactory>> predicate; - private final String stepName; + private final QueryContext queryContext; PredicateInfo( final TransformFactory>> predicate, - final String stepName + final QueryContext queryContext ) { this.predicate = Objects.requireNonNull(predicate, "predicate"); - this.stepName = requireNonNull(stepName, "stepName"); + this.queryContext = requireNonNull(queryContext, "queryContext"); } public KsqlTransformer> getPredicate( - final Function loggerFactory + final Function loggerFactory ) { - return predicate.apply(loggerFactory.apply(stepName)); + return predicate.apply(loggerFactory.apply(queryContext)); } @Override diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/StreamFilter.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/StreamFilter.java index 686dc34e7a45..447d9c044ec3 100644 --- a/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/StreamFilter.java +++ b/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/StreamFilter.java @@ -28,18 +28,15 @@ public class StreamFilter implements ExecutionStep> { private final ExecutionStepPropertiesV1 properties; private final ExecutionStep> source; private final Expression filterExpression; - private final String stepName; public StreamFilter( @JsonProperty(value = "properties", required = true) ExecutionStepPropertiesV1 properties, @JsonProperty(value = "source", required = true) ExecutionStep> source, - @JsonProperty(value = "filterExpression", required = true) Expression filterExpression, - @JsonProperty(value = "stepName", required = true) final String stepName + @JsonProperty(value = "filterExpression", required = true) Expression filterExpression ) { this.properties = Objects.requireNonNull(properties, "properties"); this.source = Objects.requireNonNull(source, "source"); this.filterExpression = Objects.requireNonNull(filterExpression, "filterExpression"); - this.stepName = Objects.requireNonNull(stepName, "stepName"); } @Override @@ -61,10 +58,6 @@ public ExecutionStep> getSource() { return source; } - public String getStepName() { - return stepName; - } - @Override public KStreamHolder build(PlanBuilder builder) { return builder.visitStreamFilter(this); @@ -81,13 +74,12 @@ public boolean equals(Object o) { StreamFilter that = (StreamFilter) o; return Objects.equals(properties, that.properties) && Objects.equals(source, that.source) - && Objects.equals(filterExpression, that.filterExpression) - && Objects.equals(stepName, that.stepName); + && Objects.equals(filterExpression, that.filterExpression); } @Override public int hashCode() { - return Objects.hash(properties, source, filterExpression, stepName); + return Objects.hash(properties, source, filterExpression); } } diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/StreamMapValues.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/StreamMapValues.java index 5fe37a53a825..7f15591740bb 100644 --- a/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/StreamMapValues.java +++ b/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/StreamMapValues.java @@ -30,18 +30,16 @@ public class StreamMapValues implements ExecutionStep> { private final ExecutionStepPropertiesV1 properties; private final ExecutionStep> source; private final ImmutableList selectExpressions; - private final String selectNodeName; public StreamMapValues( @JsonProperty(value = "properties", required = true) ExecutionStepPropertiesV1 properties, @JsonProperty(value = "source", required = true) ExecutionStep> source, @JsonProperty(value = "selectExpressions", required = true) - List selectExpressions, - @JsonProperty(value = "selectNodeName", required = true) String selectNodeName) { + List selectExpressions + ) { this.properties = requireNonNull(properties, "properties"); this.source = requireNonNull(source, "source"); this.selectExpressions = ImmutableList.copyOf(selectExpressions); - this.selectNodeName = requireNonNull(selectNodeName, "selectNodeName"); } @Override @@ -63,10 +61,6 @@ public ExecutionStep> getSource() { return source; } - public String getSelectNodeName() { - return selectNodeName; - } - @Override public KStreamHolder build(PlanBuilder builder) { return builder.visitStreamMapValues(this); @@ -83,13 +77,12 @@ public boolean equals(Object o) { StreamMapValues that = (StreamMapValues) o; return Objects.equals(properties, that.properties) && Objects.equals(source, that.source) - && Objects.equals(selectExpressions, that.selectExpressions) - && Objects.equals(selectNodeName, that.selectNodeName); + && Objects.equals(selectExpressions, that.selectExpressions); } @Override public int hashCode() { - return Objects.hash(properties, source, selectExpressions, selectNodeName); + return Objects.hash(properties, source, selectExpressions); } } diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/TableFilter.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/TableFilter.java index 6a3c5c130e15..6c7443799d73 100644 --- a/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/TableFilter.java +++ b/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/TableFilter.java @@ -28,18 +28,15 @@ public class TableFilter implements ExecutionStep> { private final ExecutionStepPropertiesV1 properties; private final ExecutionStep> source; private final Expression filterExpression; - private final String stepName; public TableFilter( @JsonProperty(value = "properties", required = true) ExecutionStepPropertiesV1 properties, @JsonProperty(value = "source", required = true) ExecutionStep> source, - @JsonProperty(value = "filterExpression", required = true) Expression filterExpression, - @JsonProperty(value = "stepName", required = true) final String stepName + @JsonProperty(value = "filterExpression", required = true) Expression filterExpression ) { this.properties = Objects.requireNonNull(properties, "properties"); this.source = Objects.requireNonNull(source, "source"); this.filterExpression = Objects.requireNonNull(filterExpression, "filterExpression"); - this.stepName = Objects.requireNonNull(stepName, "stepName"); } @Override @@ -61,10 +58,6 @@ public ExecutionStep> getSource() { return source; } - public String getStepName() { - return stepName; - } - @Override public KTableHolder build(PlanBuilder builder) { return builder.visitTableFilter(this); @@ -81,13 +74,12 @@ public boolean equals(Object o) { TableFilter that = (TableFilter) o; return Objects.equals(properties, that.properties) && Objects.equals(source, that.source) - && Objects.equals(filterExpression, that.filterExpression) - && Objects.equals(stepName, that.stepName); + && Objects.equals(filterExpression, that.filterExpression); } @Override public int hashCode() { - return Objects.hash(properties, source, filterExpression, stepName); + return Objects.hash(properties, source, filterExpression); } } diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/TableMapValues.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/TableMapValues.java index 8f001ee54ce5..02d5c93ac801 100644 --- a/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/TableMapValues.java +++ b/ksql-execution/src/main/java/io/confluent/ksql/execution/plan/TableMapValues.java @@ -30,19 +30,16 @@ public class TableMapValues implements ExecutionStep> { private final ExecutionStepPropertiesV1 properties; private final ExecutionStep> source; private final ImmutableList selectExpressions; - private final String selectNodeName; public TableMapValues( @JsonProperty(value = "properties", required = true) ExecutionStepPropertiesV1 properties, @JsonProperty(value = "source", required = true) ExecutionStep> source, @JsonProperty(value = "selectExpressions", required = true) - List selectExpressions, - @JsonProperty(value = "selectNodeName", required = true) String selectNodeName + List selectExpressions ) { this.properties = requireNonNull(properties, "properties"); this.source = requireNonNull(source, "source"); this.selectExpressions = ImmutableList.copyOf(selectExpressions); - this.selectNodeName = requireNonNull(selectNodeName, "selectNodeName"); } @Override @@ -64,10 +61,6 @@ public ExecutionStep> getSource() { return source; } - public String getSelectNodeName() { - return selectNodeName; - } - @Override public KTableHolder build(PlanBuilder builder) { return builder.visitTableMapValues(this); @@ -84,12 +77,11 @@ public boolean equals(Object o) { TableMapValues that = (TableMapValues) o; return Objects.equals(properties, that.properties) && Objects.equals(source, that.source) - && Objects.equals(selectExpressions, that.selectExpressions) - && Objects.equals(selectNodeName, that.selectNodeName); + && Objects.equals(selectExpressions, that.selectExpressions); } @Override public int hashCode() { - return Objects.hash(properties, source, selectExpressions, selectNodeName); + return Objects.hash(properties, source, selectExpressions); } } diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/builder/KsqlQueryBuilderTest.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/builder/KsqlQueryBuilderTest.java index ba76b983904b..b7007e0593e5 100644 --- a/ksql-execution/src/test/java/io/confluent/ksql/execution/builder/KsqlQueryBuilderTest.java +++ b/ksql-execution/src/test/java/io/confluent/ksql/execution/builder/KsqlQueryBuilderTest.java @@ -258,11 +258,4 @@ public void shouldTrackSchemasTakingIntoAccountSerdeOptions() { // Then: assertThat(ksqlQueryBuilder.getSchemas().toString(), is("fred.context = BOOLEAN")); } - - @Test - public void shouldGenerateUnqiueNodeNames() { - assertThat(ksqlQueryBuilder.buildUniqueNodeName("NodeName"), is("NodeName-0")); - assertThat(ksqlQueryBuilder.buildUniqueNodeName("NodeName"), is("NodeName-1")); - assertThat(ksqlQueryBuilder.buildUniqueNodeName("Other"), is("Other-2")); - } } \ No newline at end of file diff --git a/ksql-functional-tests/src/test/java/io/confluent/ksql/test/TopologyFileGenerator.java b/ksql-functional-tests/src/test/java/io/confluent/ksql/test/TopologyFileGenerator.java index 815dae5374c7..07bbbf8b906c 100644 --- a/ksql-functional-tests/src/test/java/io/confluent/ksql/test/TopologyFileGenerator.java +++ b/ksql-functional-tests/src/test/java/io/confluent/ksql/test/TopologyFileGenerator.java @@ -111,7 +111,7 @@ private static void generateTopologies() throws Exception { } static void generateTopologies(final Path base) throws Exception { - final String formattedVersion = getFormattedVersionFromPomFile(); + final String formattedVersion = "0_6_0-pre"; final Path generatedTopologyPath = base.resolve(formattedVersion); System.out.println(String.format("Starting to write topology files to %s", generatedTopologyPath)); diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arraycontains_-_filter_rows_where_the_ARRAY_column_contains_a_specified_STRING b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arraycontains_-_filter_rows_where_the_ARRAY_column_contains_a_specified_STRING index 5cfaa80cb7cf..e4fdde218437 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arraycontains_-_filter_rows_where_the_ARRAY_column_contains_a_specified_STRING +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arraycontains_-_filter_rows_where_the_ARRAY_column_contains_a_specified_STRING @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arraycontains_-_filter_rows_where_the_STRUCT-_ARRAY_column_contains_a_specified_STRING b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arraycontains_-_filter_rows_where_the_STRUCT-_ARRAY_column_contains_a_specified_STRING index ddd08cf2370b..54545a3a446e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arraycontains_-_filter_rows_where_the_STRUCT-_ARRAY_column_contains_a_specified_STRING +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arraycontains_-_filter_rows_where_the_STRUCT-_ARRAY_column_contains_a_specified_STRING @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT>> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT>> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arrayindex_-_select_the_first_element_of_an_Array b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arrayindex_-_select_the_first_element_of_an_Array index ba7151af7f06..9e9b0a9374f9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arrayindex_-_select_the_first_element_of_an_Array +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arrayindex_-_select_the_first_element_of_an_Array @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arrayindex_-_select_the_last_element_of_an_Array_(-1) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arrayindex_-_select_the_last_element_of_an_Array_(-1) index ba7151af7f06..9e9b0a9374f9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arrayindex_-_select_the_last_element_of_an_Array_(-1) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/arrayindex_-_select_the_last_element_of_an_Array_(-1) @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/asarray_-_construct_a_list_from_two_elements b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/asarray_-_construct_a_list_from_two_elements index 79c3d032add8..fe738f75fc9b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/asarray_-_construct_a_list_from_two_elements +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/asarray_-_construct_a_list_from_two_elements @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/asmap_-_create_map_from_key_value_lists b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/asmap_-_create_map_from_key_value_lists index 7ae15d47cb6a..5e6ee31861ec 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/asmap_-_create_map_from_key_value_lists +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/asmap_-_create_map_from_key_value_lists @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, VALS ARRAY> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, VALS ARRAY> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_double b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_double index 7da7794cc3fa..9ba6425da08f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_double +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_double @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_int b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_int index 37b237a986b3..1d474f52d554 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_int +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_int @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_long b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_long index 0e64683aa113..c16686ff63a0 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_long +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average-udaf_-_average_long @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average_-_calculate_average_in_select b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average_-_calculate_average_in_select index f86e7a2754a0..3bdccdc66332 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average_-_calculate_average_in_select +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/average_-_calculate_average_in_select @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_AVG_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_AVG_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_AVG_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_AVG_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_AVG_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_AVG_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_AVG_0.AVG = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_array_dereference b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_array_dereference index 4827a1a807d8..3ae44ced1423 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_array_dereference +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_array_dereference @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_bigint b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_bigint index acd836145cf2..82acb0172377 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_bigint +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_bigint @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_floating_point b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_floating_point index 65302c1ecedd..98a938d366dd 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_floating_point +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_floating_point @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers index 5fb22a78dab2..45bea7721a99 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers_and_expressions b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers_and_expressions index 646f7c1a36fc..cdc69a3cf4ef 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers_and_expressions +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers_and_expressions @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers_and_variable_values b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers_and_variable_values index 13fdece67fac..ea0c1089a6f6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers_and_variable_values +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_integers_and_variable_values @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_string_values b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_string_values index e9c88cc2b8d4..f7dbdcaf22a5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_string_values +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_string_values @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_string_values_with_substring b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_string_values_with_substring index e9c88cc2b8d4..f7dbdcaf22a5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_string_values_with_substring +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_BETWEEN_with_string_values_with_substring @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_NOT_BETWEEN_with_integers b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_NOT_BETWEEN_with_integers index 5fb22a78dab2..45bea7721a99 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_NOT_BETWEEN_with_integers +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/between_-_test_NOT_BETWEEN_with_integers @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_expression b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_expression index 17b1c4f5c727..619dfbdf1507 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_expression +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_expression @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_expression_with_structs,_multiple_expression_and_the_same_type b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_expression_with_structs,_multiple_expression_and_the_same_type index 514a3d1899de..4ed5f2a3cc53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_expression_with_structs,_multiple_expression_and_the_same_type +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_expression_with_structs,_multiple_expression_and_the_same_type @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT
, ITEMID STRUCT> NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT
, ITEMID STRUCT> NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_default_branch b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_default_branch index 5b8fc6cf616c..65c5926a7bb9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_default_branch +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_default_branch @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_first_branch b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_first_branch index 5b8fc6cf616c..65c5926a7bb9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_first_branch +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_first_branch @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_later_branch b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_later_branch index 5b8fc6cf616c..65c5926a7bb9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_later_branch +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_returning_null_in_later_branch @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_with_arithmetic_expression_in_result b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_with_arithmetic_expression_in_result index 3967f842a8f8..dd781140b5c8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_with_arithmetic_expression_in_result +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_with_arithmetic_expression_in_result @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_with_null_in_when b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_with_null_in_when index 475764325139..7976b0d6c74c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_with_null_in_when +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/case-expression_-_searched_case_with_null_in_when @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_decimal_to_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_decimal_to_decimal index 284938e05ea5..121002c89e3f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_decimal_to_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_decimal_to_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUT_0.OUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_decimal_to_other b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_decimal_to_other index 6c7399206ab8..fea5b158d3b5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_decimal_to_other +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_decimal_to_other @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUT_0.OUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_double_to_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_double_to_decimal index aa7e47f7e116..de3f45525b2c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_double_to_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_double_to_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUT_0.OUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_integer_to_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_integer_to_decimal index 0731639108e4..b374d6400227 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_integer_to_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_integer_to_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUT_0.OUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_no_op b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_no_op index 9c894de70bf6..fbc00fb3949a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_no_op +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_no_op @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_of_nulls b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_of_nulls index 331a1911bb6e..c4b310a82d4f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_of_nulls +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_of_nulls @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_string_to_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_string_to_decimal index ec454d5f7fbd..bcbbba71299d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_string_to_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/cast_-_string_to_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUT_0.OUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_bool_map b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_bool_map index 553a5292111f..f5fc5c5be8fb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_bool_map +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_bool_map @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT, KSQL_INTERNAL_COL_2 BOOLEAN> NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT, KSQL_AGG_VARIABLE_0 ARRAY> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT, KSQL_INTERNAL_COL_2 BOOLEAN> NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_AGG_VARIABLE_0 ARRAY> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_bool_map_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_bool_map_table index 53701c0b3a31..1924433efc18 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_bool_map_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_bool_map_table @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT, KSQL_INTERNAL_COL_2 BOOLEAN> NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT, KSQL_AGG_VARIABLE_0 ARRAY> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT, KSQL_INTERNAL_COL_2 BOOLEAN> NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_AGG_VARIABLE_0 ARRAY> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_double b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_double index 6bf026ca3cac..1991aa784183 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_double +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_double @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_double_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_double_table index a5ef11cb6c0d..829a4d8a429f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_double_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_double_table @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_int b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_int index 555147cf77c6..8bb2604eefcf 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_int +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_int @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_int_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_int_table index b33373162a48..71f6d3f0fd86 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_int_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_int_table @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_long b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_long index dabeb9b0ba5f..4e0edbc56b37 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_long +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_long @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_long_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_long_table index 22e3aa994843..d9b149fe2c00 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_long_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_long_table @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_string b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_string index b7a6056738ae..0761ea146b0c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_string +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_string @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_string_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_string_table index 3ccd9def06b8..1b5daf054397 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_string_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-list_-_collect_list_string_table @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_bool_map b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_bool_map index 553a5292111f..f5fc5c5be8fb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_bool_map +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_bool_map @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT, KSQL_INTERNAL_COL_2 BOOLEAN> NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT, KSQL_AGG_VARIABLE_0 ARRAY> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT, KSQL_INTERNAL_COL_2 BOOLEAN> NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_AGG_VARIABLE_0 ARRAY> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_double b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_double index 6bf026ca3cac..1991aa784183 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_double +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_double @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_int b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_int index 555147cf77c6..8bb2604eefcf 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_int +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_int @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_long b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_long index dabeb9b0ba5f..4e0edbc56b37 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_long +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_long @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_string b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_string index b7a6056738ae..0761ea146b0c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_string +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/collect-set_-_collect_set_string @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/concat_-_concat_fields_using_'+'_operator b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/concat_-_concat_fields_using_'+'_operator index f03bbcd39bd7..c65be9c4cdc4 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/concat_-_concat_fields_using_'+'_operator +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/concat_-_concat_fields_using_'+'_operator @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/concat_-_concat_fields_using_CONCAT b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/concat_-_concat_fields_using_CONCAT index f03bbcd39bd7..c65be9c4cdc4 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/concat_-_concat_fields_using_CONCAT +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/concat_-_concat_fields_using_CONCAT @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count index 537cc937c840..10b59a5d4523 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_literal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_literal index af57ba4bd7c0..a47590cd9ceb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_literal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_literal @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_star b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_star index 7d2d9e2921e3..a09a546d3cd9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_star +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_star @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_table index 87ed73311644..5a9be8a46ec0 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/count_-_count_table @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/datestring_-_date_to_string b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/datestring_-_date_to_string index 84789c62da5a..9219f6e4515b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/datestring_-_date_to_string +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/datestring_-_date_to_string @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_DATE_STREAM_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_DATE_STREAM_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_DATE_STREAM_0.DATE_STREAM = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: DATE_STREAM) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_AVRO_in_out b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_AVRO_in_out index 72eca573f6a6..d566df2e32eb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_AVRO_in_out +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_AVRO_in_out @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_DELIMITED_in_out b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_DELIMITED_in_out index 72eca573f6a6..d566df2e32eb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_DELIMITED_in_out +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_DELIMITED_in_out @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_GEQ_-_decimal_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_GEQ_-_decimal_decimal index 343bb55c35ab..be1c8ea16a89 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_GEQ_-_decimal_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_GEQ_-_decimal_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_JSON_in_out b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_JSON_in_out index 72eca573f6a6..d566df2e32eb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_JSON_in_out +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_JSON_in_out @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_LEQ_-_decimal_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_LEQ_-_decimal_decimal index 343bb55c35ab..be1c8ea16a89 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_LEQ_-_decimal_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_LEQ_-_decimal_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition index 6fbe19e84c92..3d352ce97705 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_3_columns b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_3_columns index b027ef47cee8..7837aca82c09 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_3_columns +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_3_columns @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_with_double b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_with_double index 61c36aff498f..8aced70c9b2a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_with_double +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_with_double @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_with_int b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_with_int index 67eaf5f2ed3c..abae919dd354 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_with_int +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_addition_with_int @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_division b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_division index fcea95992d05..f3189538412c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_division +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_division @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_equal_-_decimal_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_equal_-_decimal_decimal index 343bb55c35ab..be1c8ea16a89 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_equal_-_decimal_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_equal_-_decimal_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_greater_than_-_decimal_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_greater_than_-_decimal_decimal index 343bb55c35ab..be1c8ea16a89 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_greater_than_-_decimal_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_greater_than_-_decimal_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_is_distinct_-_decimal_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_is_distinct_-_decimal_decimal index 343bb55c35ab..be1c8ea16a89 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_is_distinct_-_decimal_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_is_distinct_-_decimal_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_decimal index 343bb55c35ab..be1c8ea16a89 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_decimal_differing_scale b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_decimal_differing_scale index 607dc549d341..07154036a21f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_decimal_differing_scale +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_decimal_differing_scale @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_int b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_int index 06b257ec8d5b..2b16d7a51791 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_int +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_less_than_-_decimal_int @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_mod b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_mod index e8fe2964bfdc..f8bd01c588d2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_mod +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_mod @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_multiplication b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_multiplication index 14b57085269c..b16e266f202e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_multiplication +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_multiplication @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_negation b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_negation index 8bf675e65d22..572450abe184 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_negation +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_negation @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_not_equal_-_decimal_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_not_equal_-_decimal_decimal index 343bb55c35ab..be1c8ea16a89 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_not_equal_-_decimal_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_not_equal_-_decimal_decimal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_subtraction b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_subtraction index 6fbe19e84c92..3d352ce97705 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_subtraction +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/decimal_-_subtraction @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TEST2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TEST2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TEST2_0.TEST2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TEST2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format index 04e4b3697f22..bf66cc8a0662 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_$_separated_values_using_custom_delimiter_character b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_$_separated_values_using_custom_delimiter_character index 04e4b3697f22..bf66cc8a0662 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_$_separated_values_using_custom_delimiter_character +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_$_separated_values_using_custom_delimiter_character @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_SPACE_separated_values_using_custom_delimiter_character b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_SPACE_separated_values_using_custom_delimiter_character index 04e4b3697f22..bf66cc8a0662 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_SPACE_separated_values_using_custom_delimiter_character +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_SPACE_separated_values_using_custom_delimiter_character @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_TAB_separated_values_using_custom_delimiter_character b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_TAB_separated_values_using_custom_delimiter_character index 04e4b3697f22..bf66cc8a0662 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_TAB_separated_values_using_custom_delimiter_character +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_TAB_separated_values_using_custom_delimiter_character @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_pipe_separated_values_-_should_take_source_delimiter_for_sink b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_pipe_separated_values_-_should_take_source_delimiter_for_sink index 04e4b3697f22..bf66cc8a0662 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_pipe_separated_values_-_should_take_source_delimiter_for_sink +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/delimited_-_select_delimited_value_format_with_pipe_separated_values_-_should_take_source_delimiter_for_sink @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elements_-_join_leaves_aliased_ROWKEY_and_ROWTIME_in_output's_value_schema b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elements_-_join_leaves_aliased_ROWKEY_and_ROWTIME_in_output's_value_schema index 3c3694a73cd1..26bc3ba0daeb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elements_-_join_leaves_aliased_ROWKEY_and_ROWTIME_in_output's_value_schema +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elements_-_join_leaves_aliased_ROWKEY_and_ROWTIME_in_output's_value_schema @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.right = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Right = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elt-field_-_elect_the_second_parameter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elt-field_-_elect_the_second_parameter index 6f6541869e99..834d2093e0a0 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elt-field_-_elect_the_second_parameter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elt-field_-_elect_the_second_parameter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elt-field_-_field_the_correct_parameter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elt-field_-_field_the_correct_parameter index 609bfbdd7f67..cc6c4180636f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elt-field_-_field_the_correct_parameter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/elt-field_-_field_the_correct_parameter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_explode_array_with_values b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_explode_array_with_values index d63c07aa96cd..7616623068f0 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_explode_array_with_values +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_explode_array_with_values @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_explode_different_types b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_explode_different_types index 03f5004a5d6e..338d5f0e7295 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_explode_different_types +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_explode_different_types @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, F1 ARRAY, F2 ARRAY, F3 ARRAY, F4 ARRAY, F5 ARRAY> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, F1 ARRAY, F2 ARRAY, F3 ARRAY, F4 ARRAY, F5 ARRAY> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_udfs_with_table_functions_and_no_aliases,_verifies_intermediate_generated_column_names_don't_clash_with_aliases b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_udfs_with_table_functions_and_no_aliases,_verifies_intermediate_generated_column_names_don't_clash_with_aliases index 5cdd73ba02bd..d43242d6646d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_udfs_with_table_functions_and_no_aliases,_verifies_intermediate_generated_column_names_don't_clash_with_aliases +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/explode_-_udfs_with_table_functions_and_no_aliases,_verifies_intermediate_generated_column_names_don't_clash_with_aliases @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, F1 BIGINT, F2 BIGINT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, F1 BIGINT, F2 BIGINT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/extract-json-field_-_concat_two_extracted_fields b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/extract-json-field_-_concat_two_extracted_fields index 3adf6cdf1758..f345ed863960 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/extract-json-field_-_concat_two_extracted_fields +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/extract-json-field_-_concat_two_extracted_fields @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/extract-json-field_-_extract_JSON_array_field b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/extract-json-field_-_extract_JSON_array_field index 7058a7d5f87d..a8a820fa0885 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/extract-json-field_-_extract_JSON_array_field +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/extract-json-field_-_extract_JSON_array_field @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/geodistance_-_geo_distance_with_radius b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/geodistance_-_geo_distance_with_radius index e69af6f9988e..f48c7290148f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/geodistance_-_geo_distance_with_radius +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/geodistance_-_geo_distance_with_radius @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_DISTANCE_STREAM_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_DISTANCE_STREAM_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_DISTANCE_STREAM_0.DISTANCE_STREAM = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: DISTANCE_STREAM) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/geodistance_-_geo_distance_without_radius b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/geodistance_-_geo_distance_without_radius index 81f1f54cd427..06e7d5c5521a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/geodistance_-_geo_distance_without_radius +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/geodistance_-_geo_distance_without_radius @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_DISTANCE_STREAM_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_DISTANCE_STREAM_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_DISTANCE_STREAM_0.DISTANCE_STREAM = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: DISTANCE_STREAM) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWKEY_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWKEY_(stream-_table) index 976f3c6f957f..b1d80660f684 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWKEY_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWKEY_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWKEY_(stream-_table)_-_without_repartition b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWKEY_(stream-_table)_-_without_repartition index 976f3c6f957f..b1d80660f684 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWKEY_(stream-_table)_-_without_repartition +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWKEY_(stream-_table)_-_without_repartition @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWTIME_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWTIME_(stream-_table) index 30ee891f879d..280074db83f5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWTIME_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_ROWTIME_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDAF_nested_in_UDF_in_select_expression_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDAF_nested_in_UDF_in_select_expression_(stream-_table) index fc6e7ec688f8..37e02f13dd9e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDAF_nested_in_UDF_in_select_expression_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDAF_nested_in_UDF_in_select_expression_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDAF_nested_in_UDF_in_select_expression_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDAF_nested_in_UDF_in_select_expression_(table-_table) index e5e8a0f421c7..b113da73dc9e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDAF_nested_in_UDF_in_select_expression_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDAF_nested_in_UDF_in_select_expression_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDF_nested_in_UDAF_in_select_expression_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDF_nested_in_UDAF_in_select_expression_(stream-_table) index 5297fce7b902..764bc7dd05fa 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDF_nested_in_UDAF_in_select_expression_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_UDF_nested_in_UDAF_in_select_expression_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_arithmetic_binary_expression_with_projection_in-order_&_non-commutative_group_by_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_arithmetic_binary_expression_with_projection_in-order_&_non-commutative_group_by_(stream-_table) index c24eee7c9367..aa47d9695026 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_arithmetic_binary_expression_with_projection_in-order_&_non-commutative_group_by_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_arithmetic_binary_expression_with_projection_in-order_&_non-commutative_group_by_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_arithmetic_binary_expression_with_projection_in-order_&_non-commutative_group_by_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_arithmetic_binary_expression_with_projection_in-order_&_non-commutative_group_by_(table-_table) index ada47bc24457..98db36f5c90f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_arithmetic_binary_expression_with_projection_in-order_&_non-commutative_group_by_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_arithmetic_binary_expression_with_projection_in-order_&_non-commutative_group_by_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_constant_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_constant_(stream-_table) index 30ee891f879d..280074db83f5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_constant_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_constant_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_constant_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_constant_(table-_table) index 8c9771240823..2e5febadbe56 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_constant_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_constant_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_duplicate_fields_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_duplicate_fields_(stream-_table) index bb0517959554..02c6225809bc 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_duplicate_fields_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_duplicate_fields_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_(stream-_table) index a18ddc94e5e2..6c54bdeffb47 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_(stream-_table)_-_format b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_(stream-_table)_-_format index a18ddc94e5e2..6c54bdeffb47 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_(stream-_table)_-_format +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_(stream-_table)_-_format @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_field_used_in_function_in_projection_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_field_used_in_function_in_projection_(stream-_table) index f288404c75bf..c87dec5c58a6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_field_used_in_function_in_projection_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_field_used_in_function_in_projection_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_field_used_in_function_in_projection_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_field_used_in_function_in_projection_(table-_table) index 7a99cf5ea1cf..b87c7157d345 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_field_used_in_function_in_projection_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_field_used_in_function_in_projection_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(stream-_table) index ccc7affd048c..715d54025ce8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(stream-_table)_-_format b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(stream-_table)_-_format index ccc7affd048c..715d54025ce8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(stream-_table)_-_format +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(stream-_table)_-_format @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(table-_table) index 45478098fea8..2a5ecfdbd7f8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_field_with_re-key_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(stream-_table) index 2133909d083f..af7b55170f53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(stream-_table)_-_format b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(stream-_table)_-_format index 2133909d083f..af7b55170f53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(stream-_table)_-_format +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(stream-_table)_-_format @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(table-_table) index e7d5f35569de..ff3f9296ce0e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(table-_table)_-_format b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(table-_table)_-_format index e7d5f35569de..ff3f9296ce0e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(table-_table)_-_format +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_fields_(table-_table)_-_format @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_function_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_function_(stream-_table) index 39ac7969a7b8..a7b9f36ab15f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_function_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_function_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_function_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_function_(table-_table) index 7a99cf5ea1cf..b87c7157d345 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_function_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_function_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_json_field_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_json_field_(stream-_table) index 21d3f044afdf..568ef5130e4a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_json_field_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_json_field_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT, KSQL_INTERNAL_COL_1 BIGINT> NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT, KSQL_INTERNAL_COL_1 BIGINT, KSQL_AGG_VARIABLE_0 BIGINT> NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT, KSQL_INTERNAL_COL_1 BIGINT> NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_INTERNAL_COL_1 BIGINT, KSQL_AGG_VARIABLE_0 BIGINT> NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_missing_matching_projection_field_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_missing_matching_projection_field_(stream-_table) index 32bd385619fc..087df9a2bed4 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_missing_matching_projection_field_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_missing_matching_projection_field_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_missing_matching_projection_field_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_missing_matching_projection_field_(table-_table) index 5b935e73879a..9730e382534e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_missing_matching_projection_field_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_missing_matching_projection_field_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_string_concat_using_+_op_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_string_concat_using_+_op_(stream-_table) index 7030bcfb494f..1bfdc999a20e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_string_concat_using_+_op_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_string_concat_using_+_op_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_string_concat_using_+_op_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_string_concat_using_+_op_(table-_table) index 102df1e8e75d..f5a15b729e25 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_string_concat_using_+_op_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_string_concat_using_+_op_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_(stream-_table) index ccc7affd048c..715d54025ce8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_(table-_table) index 45478098fea8..2a5ecfdbd7f8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_involving_source_field_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_involving_source_field_(stream-_table) index 913a46d046ed..22e40dba773e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_involving_source_field_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_involving_source_field_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_involving_source_field_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_involving_source_field_(table-_table) index 588fdf48ef0d..47e814733def 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_involving_source_field_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_aggregate_arithmetic_involving_source_field_(table-_table) @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_constant_having_(stream-table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_constant_having_(stream-table) index 5dff6800dfcb..9c3f344b2481 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_constant_having_(stream-table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_constant_having_(stream-table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,47 +46,47 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> HAVING-FILTER-PRE-PROCESS-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-HavingFilter-ApplyPredicate <-- KSTREAM-AGGREGATE-0000000005 - Processor: HAVING-FILTER-PRE-PROCESS-2 (stores: []) - --> HAVING-FILTER-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: HAVING-FILTER-3 (stores: []) - --> HAVING-FILTER-POST-PROCESS-4 - <-- HAVING-FILTER-PRE-PROCESS-2 - Processor: HAVING-FILTER-POST-PROCESS-4 (stores: []) - --> SELECT-5 - <-- HAVING-FILTER-3 - Processor: SELECT-5 (stores: []) + Processor: Aggregate-HavingFilter-ApplyPredicate (stores: []) + --> Aggregate-HavingFilter-Filter + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-HavingFilter-Filter (stores: []) + --> Aggregate-HavingFilter-PostProcess + <-- Aggregate-HavingFilter-ApplyPredicate + Processor: Aggregate-HavingFilter-PostProcess (stores: []) + --> Aggregate-Project + <-- Aggregate-HavingFilter-Filter + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000014 - <-- HAVING-FILTER-POST-PROCESS-4 + <-- Aggregate-HavingFilter-PostProcess Processor: KTABLE-TOSTREAM-0000000014 (stores: []) --> KSTREAM-MAPVALUES-0000000015 - <-- SELECT-5 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000015 (stores: []) --> KSTREAM-SINK-0000000016 <-- KTABLE-TOSTREAM-0000000014 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_constants_in_the_projection_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_constants_in_the_projection_(stream-_table) index 4db5fd5e714f..96313f73cbd6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_constants_in_the_projection_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_constants_in_the_projection_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_groupings_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_groupings_(stream-_table) index f4723edeb5fc..56aa81014377 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_groupings_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_groupings_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_(stream-_table) index e60efab7465d..cb3a976f3685 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,32 +46,32 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> HAVING-FILTER-PRE-PROCESS-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-HavingFilter-ApplyPredicate <-- KSTREAM-AGGREGATE-0000000003 - Processor: HAVING-FILTER-PRE-PROCESS-2 (stores: []) - --> HAVING-FILTER-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: HAVING-FILTER-3 (stores: []) - --> HAVING-FILTER-POST-PROCESS-4 - <-- HAVING-FILTER-PRE-PROCESS-2 - Processor: HAVING-FILTER-POST-PROCESS-4 (stores: []) - --> SELECT-5 - <-- HAVING-FILTER-3 - Processor: SELECT-5 (stores: []) + Processor: Aggregate-HavingFilter-ApplyPredicate (stores: []) + --> Aggregate-HavingFilter-Filter + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-HavingFilter-Filter (stores: []) + --> Aggregate-HavingFilter-PostProcess + <-- Aggregate-HavingFilter-ApplyPredicate + Processor: Aggregate-HavingFilter-PostProcess (stores: []) + --> Aggregate-Project + <-- Aggregate-HavingFilter-Filter + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000009 - <-- HAVING-FILTER-POST-PROCESS-4 + <-- Aggregate-HavingFilter-PostProcess Processor: KTABLE-TOSTREAM-0000000009 (stores: []) --> KSTREAM-MAPVALUES-0000000010 - <-- SELECT-5 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 <-- KTABLE-TOSTREAM-0000000009 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_(table-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_(table-_table) index 8da1f9082f90..1eb5f5808574 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_(table-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_(table-_table) @@ -4,92 +4,89 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> HAVING-FILTER-PRE-PROCESS-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-HavingFilter-ApplyPredicate <-- KTABLE-AGGREGATE-0000000008 - Processor: HAVING-FILTER-PRE-PROCESS-2 (stores: []) - --> HAVING-FILTER-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: HAVING-FILTER-3 (stores: []) - --> HAVING-FILTER-POST-PROCESS-4 - <-- HAVING-FILTER-PRE-PROCESS-2 - Processor: HAVING-FILTER-POST-PROCESS-4 (stores: []) - --> SELECT-5 - <-- HAVING-FILTER-3 - Processor: SELECT-5 (stores: []) + Processor: Aggregate-HavingFilter-ApplyPredicate (stores: []) + --> Aggregate-HavingFilter-Filter + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-HavingFilter-Filter (stores: []) + --> Aggregate-HavingFilter-PostProcess + <-- Aggregate-HavingFilter-ApplyPredicate + Processor: Aggregate-HavingFilter-PostProcess (stores: []) + --> Aggregate-Project + <-- Aggregate-HavingFilter-Filter + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000014 - <-- HAVING-FILTER-POST-PROCESS-4 + <-- Aggregate-HavingFilter-PostProcess Processor: KTABLE-TOSTREAM-0000000014 (stores: []) --> KSTREAM-MAPVALUES-0000000015 - <-- SELECT-5 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000015 (stores: []) --> KSTREAM-SINK-0000000016 <-- KTABLE-TOSTREAM-0000000014 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_on_non-group-by_field_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_on_non-group-by_field_(stream-_table) index 3e0deaefdd26..528c6927564a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_on_non-group-by_field_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_having_expression_on_non-group-by_field_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,47 +46,47 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> HAVING-FILTER-PRE-PROCESS-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-HavingFilter-ApplyPredicate <-- KSTREAM-AGGREGATE-0000000005 - Processor: HAVING-FILTER-PRE-PROCESS-2 (stores: []) - --> HAVING-FILTER-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: HAVING-FILTER-3 (stores: []) - --> HAVING-FILTER-POST-PROCESS-4 - <-- HAVING-FILTER-PRE-PROCESS-2 - Processor: HAVING-FILTER-POST-PROCESS-4 (stores: []) - --> SELECT-5 - <-- HAVING-FILTER-3 - Processor: SELECT-5 (stores: []) + Processor: Aggregate-HavingFilter-ApplyPredicate (stores: []) + --> Aggregate-HavingFilter-Filter + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-HavingFilter-Filter (stores: []) + --> Aggregate-HavingFilter-PostProcess + <-- Aggregate-HavingFilter-ApplyPredicate + Processor: Aggregate-HavingFilter-PostProcess (stores: []) + --> Aggregate-Project + <-- Aggregate-HavingFilter-Filter + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000014 - <-- HAVING-FILTER-POST-PROCESS-4 + <-- Aggregate-HavingFilter-PostProcess Processor: KTABLE-TOSTREAM-0000000014 (stores: []) --> KSTREAM-MAPVALUES-0000000015 - <-- SELECT-5 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000015 (stores: []) --> KSTREAM-SINK-0000000016 <-- KTABLE-TOSTREAM-0000000014 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_multiple_having_expressions_(stream-_table) b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_multiple_having_expressions_(stream-_table) index 3190b23d4c80..2556a07dc84c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_multiple_having_expressions_(stream-_table) +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/group-by_-_with_multiple_having_expressions_(stream-_table) @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,47 +46,47 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> HAVING-FILTER-PRE-PROCESS-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-HavingFilter-ApplyPredicate <-- KSTREAM-AGGREGATE-0000000005 - Processor: HAVING-FILTER-PRE-PROCESS-2 (stores: []) - --> HAVING-FILTER-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: HAVING-FILTER-3 (stores: []) - --> HAVING-FILTER-POST-PROCESS-4 - <-- HAVING-FILTER-PRE-PROCESS-2 - Processor: HAVING-FILTER-POST-PROCESS-4 (stores: []) - --> SELECT-5 - <-- HAVING-FILTER-3 - Processor: SELECT-5 (stores: []) + Processor: Aggregate-HavingFilter-ApplyPredicate (stores: []) + --> Aggregate-HavingFilter-Filter + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-HavingFilter-Filter (stores: []) + --> Aggregate-HavingFilter-PostProcess + <-- Aggregate-HavingFilter-ApplyPredicate + Processor: Aggregate-HavingFilter-PostProcess (stores: []) + --> Aggregate-Project + <-- Aggregate-HavingFilter-Filter + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000014 - <-- HAVING-FILTER-POST-PROCESS-4 + <-- Aggregate-HavingFilter-PostProcess Processor: KTABLE-TOSTREAM-0000000014 (stores: []) --> KSTREAM-MAPVALUES-0000000015 - <-- SELECT-5 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000015 (stores: []) --> KSTREAM-SINK-0000000016 <-- KTABLE-TOSTREAM-0000000014 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/having_-_calculate_average_in_having b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/having_-_calculate_average_in_having index c7fe8a4ca1b1..0befdae14b90 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/having_-_calculate_average_in_having +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/having_-_calculate_average_in_having @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_AVG_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_AVG_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_AVG_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_AVG_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_AVG_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_AVG_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_AVG_0.AVG = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,32 +46,32 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> HAVING-FILTER-PRE-PROCESS-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-HavingFilter-ApplyPredicate <-- KSTREAM-AGGREGATE-0000000003 - Processor: HAVING-FILTER-PRE-PROCESS-2 (stores: []) - --> HAVING-FILTER-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: HAVING-FILTER-3 (stores: []) - --> HAVING-FILTER-POST-PROCESS-4 - <-- HAVING-FILTER-PRE-PROCESS-2 - Processor: HAVING-FILTER-POST-PROCESS-4 (stores: []) - --> SELECT-5 - <-- HAVING-FILTER-3 - Processor: SELECT-5 (stores: []) + Processor: Aggregate-HavingFilter-ApplyPredicate (stores: []) + --> Aggregate-HavingFilter-Filter + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-HavingFilter-Filter (stores: []) + --> Aggregate-HavingFilter-PostProcess + <-- Aggregate-HavingFilter-ApplyPredicate + Processor: Aggregate-HavingFilter-PostProcess (stores: []) + --> Aggregate-Project + <-- Aggregate-HavingFilter-Filter + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000009 - <-- HAVING-FILTER-POST-PROCESS-4 + <-- Aggregate-HavingFilter-PostProcess Processor: KTABLE-TOSTREAM-0000000009 (stores: []) --> KSTREAM-MAPVALUES-0000000010 - <-- SELECT-5 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 <-- KTABLE-TOSTREAM-0000000009 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/having_-_table_having b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/having_-_table_having index 73ef7d9ac2bd..3690ca84fe19 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/having_-_table_having +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/having_-_table_having @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_T1_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_T1_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_T1_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_T1_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_T1_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_T1_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_T1_0.T1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,32 +46,32 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> HAVING-FILTER-PRE-PROCESS-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-HavingFilter-ApplyPredicate <-- KSTREAM-AGGREGATE-0000000003 - Processor: HAVING-FILTER-PRE-PROCESS-2 (stores: []) - --> HAVING-FILTER-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: HAVING-FILTER-3 (stores: []) - --> HAVING-FILTER-POST-PROCESS-4 - <-- HAVING-FILTER-PRE-PROCESS-2 - Processor: HAVING-FILTER-POST-PROCESS-4 (stores: []) - --> SELECT-5 - <-- HAVING-FILTER-3 - Processor: SELECT-5 (stores: []) + Processor: Aggregate-HavingFilter-ApplyPredicate (stores: []) + --> Aggregate-HavingFilter-Filter + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-HavingFilter-Filter (stores: []) + --> Aggregate-HavingFilter-PostProcess + <-- Aggregate-HavingFilter-ApplyPredicate + Processor: Aggregate-HavingFilter-PostProcess (stores: []) + --> Aggregate-Project + <-- Aggregate-HavingFilter-Filter + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000009 - <-- HAVING-FILTER-POST-PROCESS-4 + <-- Aggregate-HavingFilter-PostProcess Processor: KTABLE-TOSTREAM-0000000009 (stores: []) --> KSTREAM-MAPVALUES-0000000010 - <-- SELECT-5 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 <-- KTABLE-TOSTREAM-0000000009 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/histogram_-_histogram_on_a_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/histogram_-_histogram_on_a_table index 41705d8faa22..21690eeb4b57 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/histogram_-_histogram_on_a_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/histogram_-_histogram_on_a_table @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_COUNT_BY_REGION_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_COUNT_BY_REGION_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_COUNT_BY_REGION_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_COUNT_BY_REGION_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_COUNT_BY_REGION_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_COUNT_BY_REGION_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_COUNT_BY_REGION_0.COUNT_BY_REGION = STRUCT> NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/histogram_-_histogram_string b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/histogram_-_histogram_string index 3c1d4ed8145a..a80a635fed8d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/histogram_-_histogram_string +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/histogram_-_histogram_string @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_count b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_count index a22ed69732a5..a1c0d9383a99 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_count +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_count @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_import_hopping_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_import_hopping_table index 106ed9f5deab..08f05109d11e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_import_hopping_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_import_hopping_table @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_max_hopping b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_max_hopping index 2f314d83da34..bd0a339a6999 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_max_hopping +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_max_hopping @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_min_hopping b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_min_hopping index 2f314d83da34..bd0a339a6999 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_min_hopping +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_min_hopping @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_topk_hopping b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_topk_hopping index 4040fc9f665e..d260121b91d9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_topk_hopping +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_topk_hopping @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_topkdistinct_hopping b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_topkdistinct_hopping index 4040fc9f665e..d260121b91d9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_topkdistinct_hopping +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/hopping-windows_-_topkdistinct_hopping @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_join_source b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_join_source index b8fa839d07ff..6f6be86cc358 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_join_source +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_join_source @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.right = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Right = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_join_source_with_AS b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_join_source_with_AS index b8fa839d07ff..6f6be86cc358 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_join_source_with_AS +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_join_source_with_AS @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.right = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Right = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_left_unaliased_right b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_left_unaliased_right index 4f06fa4ac89e..bd3ad1fe9084 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_left_unaliased_right +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_left_unaliased_right @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.right = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Right = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_source b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_source index c880da3e2483..84cb68985e53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_source +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_source @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_source_with_AS b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_source_with_AS index c880da3e2483..84cb68985e53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_source_with_AS +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_aliased_source_with_AS @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_prefixed_wildcard_select_with_aliased_source b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_prefixed_wildcard_select_with_aliased_source index c880da3e2483..84cb68985e53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_prefixed_wildcard_select_with_aliased_source +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_prefixed_wildcard_select_with_aliased_source @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_unaliased_left_aliased_right b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_unaliased_left_aliased_right index 063bef25e046..6e4f30e371b2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_unaliased_left_aliased_right +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_unaliased_left_aliased_right @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.right = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Right = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_wildcard_select_with_aliased_source b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_wildcard_select_with_aliased_source index c880da3e2483..84cb68985e53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_wildcard_select_with_aliased_source +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/identifiers_-_wildcard_select_with_aliased_source @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/initcap_-_do_initcap b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/initcap_-_do_initcap index 87bd77132ae9..4c64a0b949ad 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/initcap_-_do_initcap +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/initcap_-_do_initcap @@ -4,42 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.functions.substring.legacy.args" : "[hidden]", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +45,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__AVRO_to_JSON b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__AVRO_to_JSON index 449e687e5cd7..6f635b3b2baf 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__AVRO_to_JSON +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__AVRO_to_JSON @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -InsertQuery_0.KsqlTopic.source = STRUCT NOT NULL +InsertQuery_0.KsqlTopic.Source = STRUCT NOT NULL InsertQuery_0.SINK = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [source]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: sink) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__DELIMITED_to_JSON b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__DELIMITED_to_JSON index 025d7dfecdbd..917f4be11129 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__DELIMITED_to_JSON +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__DELIMITED_to_JSON @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -InsertQuery_1.KsqlTopic.source = STRUCT NOT NULL +InsertQuery_1.KsqlTopic.Source = STRUCT NOT NULL InsertQuery_1.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [insert-source]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__JSON_to_AVRO b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__JSON_to_AVRO index 449e687e5cd7..6f635b3b2baf 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__JSON_to_AVRO +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_convert_formats__JSON_to_AVRO @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -InsertQuery_0.KsqlTopic.source = STRUCT NOT NULL +InsertQuery_0.KsqlTopic.Source = STRUCT NOT NULL InsertQuery_0.SINK = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [source]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: sink) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_simple b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_simple index 025d7dfecdbd..917f4be11129 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_simple +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_simple @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -InsertQuery_1.KsqlTopic.source = STRUCT NOT NULL +InsertQuery_1.KsqlTopic.Source = STRUCT NOT NULL InsertQuery_1.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [insert-source]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_with_custom_topic_name b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_with_custom_topic_name index ecafa47d5c2f..5242885f23bb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_with_custom_topic_name +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/insert-into_-_with_custom_topic_name @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -InsertQuery_1.KsqlTopic.source = STRUCT NOT NULL +InsertQuery_1.KsqlTopic.Source = STRUCT NOT NULL InsertQuery_1.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [insert-source]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: custom) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts index 5c13ff229f41..55513d6ef74d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_JOIN_S2_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_S1_JOIN_S2_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_S1_JOIN_S2_0.Join.left = STRUCT NOT NULL -CSAS_S1_JOIN_S2_0.Join.right = STRUCT NOT NULL +CSAS_S1_JOIN_S2_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_S1_JOIN_S2_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_S1_JOIN_S2_0.Join.Left = STRUCT NOT NULL +CSAS_S1_JOIN_S2_0.Join.Right = STRUCT NOT NULL CSAS_S1_JOIN_S2_0.S1_JOIN_S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: S1_JOIN_S2) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides index 70a742b4a7b6..a7deecc14ea5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_stream_inner_join_with_ts_extractor_both_sides @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_JOIN_S2_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_S1_JOIN_S2_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_S1_JOIN_S2_0.Join.left = STRUCT NOT NULL -CSAS_S1_JOIN_S2_0.Join.right = STRUCT NOT NULL +CSAS_S1_JOIN_S2_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_S1_JOIN_S2_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_S1_JOIN_S2_0.Join.Left = STRUCT NOT NULL +CSAS_S1_JOIN_S2_0.Join.Right = STRUCT NOT NULL CSAS_S1_JOIN_S2_0.S1_JOIN_S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: S1_JOIN_S2) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_table_join_with_ts_extractor_both_sides b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_table_join_with_ts_extractor_both_sides index a7afcebd81da..299acafa557a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_table_join_with_ts_extractor_both_sides +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_stream_table_join_with_ts_extractor_both_sides @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_JOIN_T1_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_S1_JOIN_T1_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_S1_JOIN_T1_0.Join.left = STRUCT NOT NULL +CSAS_S1_JOIN_T1_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_S1_JOIN_T1_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_S1_JOIN_T1_0.Join.Left = STRUCT NOT NULL CSAS_S1_JOIN_T1_0.S1_JOIN_T1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [t1]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: S1_JOIN_T1) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_table_table_inner_join_with_ts b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_table_table_inner_join_with_ts index 433e295aedf5..b658c99a3384 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_table_table_inner_join_with_ts +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_table_table_inner_join_with_ts @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S1_JOIN_S2_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_S1_JOIN_S2_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_S1_JOIN_S2_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_S1_JOIN_S2_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_S1_JOIN_S2_0.S1_JOIN_S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [s2]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_table_table_inner_join_with_ts_extractor_both_sides b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_table_table_inner_join_with_ts_extractor_both_sides index 7d2cd171a830..f1176e7531f8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_table_table_inner_join_with_ts_extractor_both_sides +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/join-with-custom-timestamp_-_table_table_inner_join_with_ts_extractor_both_sides @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S1_JOIN_S2_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_S1_JOIN_S2_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_S1_JOIN_S2_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_S1_JOIN_S2_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_S1_JOIN_S2_0.S1_JOIN_S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [s2]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria index f2d712f20805..a187b13e3551 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_join_key_not_in_projection index e31d9cdb7486..4f755a791889 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_join_key_not_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_left_rowkey_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_left_rowkey_in_projection index 1adbf2f1ae42..59fac9921203 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_left_rowkey_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_left_rowkey_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_no_source_key_fields b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_no_source_key_fields index 608e6081860b..1986f006e1cb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_no_source_key_fields +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_no_source_key_fields @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_right_join_key_in_projection index 60ad4a7d3ac7..6f79df4a3c1d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_right_join_key_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_right_rowkey_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_right_rowkey_in_projection index 1adbf2f1ae42..59fac9921203 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_right_rowkey_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_join_using_ROWKEY_in_the_criteria_-_right_rowkey_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_multiple_join_keys_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_multiple_join_keys_in_projection index fe1c33ba2348..48652209beb0 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_multiple_join_keys_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_multiple_join_keys_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join index 18cf3d6a4573..9c807e1cea06 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: INNER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_-_join_key_not_in_projection index d8150e0c4c46..0da22465d998 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_-_join_key_not_in_projection @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: INNER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_-_right_join_key_in_projection index 476ff7199be9..78fffe1b9029 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_-_right_join_key_in_projection @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: INNER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_fields b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_fields index d4550e0580b3..fd0cea54ea2d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_fields +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_fields @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: INNER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_left_fields_some_right b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_left_fields_some_right index 37e4782a15a0..86d0340f8296 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_left_fields_some_right +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_left_fields_some_right @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: INNER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_right_fields_some_left b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_right_fields_some_left index 04e5ba035884..caba680b2b76 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_right_fields_some_left +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_all_right_fields_some_left @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: INNER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_with_different_before_and_after_windows b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_with_different_before_and_after_windows index 18cf3d6a4573..9c807e1cea06 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_with_different_before_and_after_windows +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_with_different_before_and_after_windows @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: INNER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_with_out_of_order_messages b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_with_out_of_order_messages index 18cf3d6a4573..9c807e1cea06 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_with_out_of_order_messages +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_inner_join_with_out_of_order_messages @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: INNER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join index 608e6081860b..1986f006e1cb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_both_join_keys_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_both_join_keys_in_projection index 413634fa2ccf..535b5cf28f61 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_both_join_keys_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_both_join_keys_in_projection @@ -36,10 +36,10 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -79,14 +79,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000020 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000020 (stores: []) --> KSTREAM-SINK-0000000021 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000021 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000020 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_join_key_not_in_projection index 02345d037221..bdb250bdfb9e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_join_key_not_in_projection @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_rekey b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_rekey index a46783204d8f..1687f59cbf91 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_rekey +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_rekey @@ -36,10 +36,10 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -79,14 +79,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000020 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000020 (stores: []) --> KSTREAM-SINK-0000000021 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000021 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000020 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_right_join_key_in_projection index 0472edfb674b..390b14877ac1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_left_join_-_right_join_key_in_projection @@ -36,10 +36,10 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -79,14 +79,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000020 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000020 (stores: []) --> KSTREAM-SINK-0000000021 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000021 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000020 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_outer_join b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_outer_join index 6087c6c04735..a8c8292f9885 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_outer_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_outer_join @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-outer-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_outer_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_outer_join_-_right_join_key_in_projection index aae557aea633..d1ae2ca72439 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_outer_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_stream_outer_join_-_right_join_key_in_projection @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-outer-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join index f2d712f20805..a187b13e3551 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join_-_join_key_not_in_projection index e31d9cdb7486..4f755a791889 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join_-_join_key_not_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join_-_right_join_key_in_projection index 60ad4a7d3ac7..6f79df4a3c1d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_inner_join_-_right_join_key_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_INNER_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_INNER_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: INNER_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join index 2b2891939591..fee10208dfb8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_LEFT_JOIN_0.LEFT_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: LEFT_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join_-_join_key_not_in_projection index 59fac9154659..fabf78362182 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join_-_join_key_not_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_LEFT_JOIN_0.LEFT_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: LEFT_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join_-_right_join_key_in_projection index 351f832e6db5..f94955872607 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_table_left_join_-_right_join_key_in_projection @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_JOIN_0.Join.left = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_JOIN_0.Join.Left = STRUCT NOT NULL CSAS_LEFT_JOIN_0.LEFT_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [test_table]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: LEFT_JOIN) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_unwrapped_single_field_value_schema_on_inputs b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_unwrapped_single_field_value_schema_on_inputs index fa039c46f06f..f8a6bf296e7d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_unwrapped_single_field_value_schema_on_inputs +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_unwrapped_single_field_value_schema_on_inputs @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Left.source = BIGINT -CSAS_OUTPUT_0.KafkaTopic_Right.source = BIGINT -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.right = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = BIGINT +CSAS_OUTPUT_0.KafkaTopic_Right.Source = BIGINT +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Right = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_unwrapped_single_field_value_schema_on_inputs_and_output b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_unwrapped_single_field_value_schema_on_inputs_and_output index 9476e69aef6e..8614dd008298 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_unwrapped_single_field_value_schema_on_inputs_and_output +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_unwrapped_single_field_value_schema_on_inputs_and_output @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Left.source = BIGINT -CSAS_OUTPUT_0.KafkaTopic_Right.source = BIGINT -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.right = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = BIGINT +CSAS_OUTPUT_0.KafkaTopic_Right.Source = BIGINT +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Right = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = BIGINT SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_wrapped_single_field_value_schema_on_inputs b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_wrapped_single_field_value_schema_on_inputs index f2083fcb08e5..8ce67e078747 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_wrapped_single_field_value_schema_on_inputs +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_stream_wrapped_single_field_value_schema_on_inputs @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.right = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Right = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_unwrapped_single_field_value_schema_on_inputs b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_unwrapped_single_field_value_schema_on_inputs index c115f9997c64..5e435223d98e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_unwrapped_single_field_value_schema_on_inputs +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_unwrapped_single_field_value_schema_on_inputs @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Right.source = BIGINT -CSAS_OUTPUT_0.KafkaTopic_Left.source = BIGINT -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = BIGINT +CSAS_OUTPUT_0.KafkaTopic_Left.Source = BIGINT +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [T]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: OUTPUT) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_unwrapped_single_field_value_schema_on_inputs_and_output b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_unwrapped_single_field_value_schema_on_inputs_and_output index e5fb44549c25..489da5544a26 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_unwrapped_single_field_value_schema_on_inputs_and_output +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_unwrapped_single_field_value_schema_on_inputs_and_output @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Right.source = BIGINT -CSAS_OUTPUT_0.KafkaTopic_Left.source = BIGINT -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = BIGINT +CSAS_OUTPUT_0.KafkaTopic_Left.Source = BIGINT +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = BIGINT SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [T]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: OUTPUT) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_when_neither_have_key_field_and_joining_by_table_ROWKEY b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_when_neither_have_key_field_and_joining_by_table_ROWKEY index 3ef9b1d9b023..27d455e7b9c8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_when_neither_have_key_field_and_joining_by_table_ROWKEY +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_when_neither_have_key_field_and_joining_by_table_ROWKEY @@ -36,27 +36,27 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: Join-repartition-source (topics: [Join-repartition]) --> Join - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- Join-repartition-source Source: KSTREAM-SOURCE-0000000000 (topics: [NO_KEY]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000012 <-- Join Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000013 (topic: OUTPUT) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_when_table_does_not_have_key_field_and_joining_by_table_ROWKEY b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_when_table_does_not_have_key_field_and_joining_by_table_ROWKEY index aa85a46f35a3..8db9c88a9dc1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_when_table_does_not_have_key_field_and_joining_by_table_ROWKEY +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_when_table_does_not_have_key_field_and_joining_by_table_ROWKEY @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [NO_KEY]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: OUTPUT) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_wrapped_single_field_value_schema_on_inputs b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_wrapped_single_field_value_schema_on_inputs index 473f90e72124..5395b278939f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_wrapped_single_field_value_schema_on_inputs +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_stream_to_table_wrapped_single_field_value_schema_on_inputs @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_OUTPUT_0.Join.left = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_OUTPUT_0.Join.Left = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,18 +48,18 @@ Topologies: Processor: KSTREAM-TRANSFORMVALUES-0000000004 (stores: []) --> Join <-- KSTREAM-SOURCE-0000000003 - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000004 Source: KSTREAM-SOURCE-0000000000 (topics: [T]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000007 <-- Join Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000008 (topic: OUTPUT) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_join_pipeline b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_join_pipeline index 60e76ea540ea..61a54bd51b4b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_join_pipeline +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_join_pipeline @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_INNER_JOIN_2_1.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_INNER_JOIN_2_1.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_INNER_JOIN_2_1.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_INNER_JOIN_2_1.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_INNER_JOIN_2_1.INNER_JOIN_2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic_2]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join index df2f4a298279..68b3b629014b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join_-_join_key_not_in_projection index 2343acc79222..adad9df8de6b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join_-_join_key_not_in_projection @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join_-_right_join_key_in_projection index 41694ad126e2..bf76f131bdde 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_inner_join_-_right_join_key_in_projection @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_INNER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_INNER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_INNER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_INNER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_INNER_JOIN_0.INNER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_join_with_where_clause b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_join_with_where_clause index 602ee0425339..302f235d3ef6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_join_with_where_clause +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_join_with_where_clause @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,30 +58,30 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> WHERE-FILTER-PRE-PROCESS-0 + --> WhereFilter-ApplyPredicate <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: WHERE-FILTER-PRE-PROCESS-0 (stores: []) - --> WHERE-FILTER-1 + Processor: WhereFilter-ApplyPredicate (stores: []) + --> WhereFilter-Filter <-- KTABLE-MERGE-0000000006 - Processor: WHERE-FILTER-1 (stores: []) - --> WHERE-FILTER-POST-PROCESS-2 - <-- WHERE-FILTER-PRE-PROCESS-0 - Processor: WHERE-FILTER-POST-PROCESS-2 (stores: []) - --> SELECT-3 - <-- WHERE-FILTER-1 - Processor: SELECT-3 (stores: []) + Processor: WhereFilter-Filter (stores: []) + --> WhereFilter-PostProcess + <-- WhereFilter-ApplyPredicate + Processor: WhereFilter-PostProcess (stores: []) + --> Project + <-- WhereFilter-Filter + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000013 - <-- WHERE-FILTER-POST-PROCESS-2 + <-- WhereFilter-PostProcess Processor: KTABLE-TOSTREAM-0000000013 (stores: []) --> KSTREAM-MAPVALUES-0000000014 - <-- SELECT-3 + <-- Project Processor: KSTREAM-MAPVALUES-0000000014 (stores: []) --> KSTREAM-SINK-0000000015 <-- KTABLE-TOSTREAM-0000000013 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join index c56c8b278f9a..bb9bcac745cd 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_both_join_keys_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_both_join_keys_in_projection index 3d7cf802eb25..7bc6eae82d3e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_both_join_keys_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_both_join_keys_in_projection @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_join_key_not_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_join_key_not_in_projection index 618810aee573..7f8be2f32270 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_join_key_not_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_join_key_not_in_projection @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_right_join_key_in_projection index 459c0b833f70..2b36558b83a6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_left_join_-_right_join_key_in_projection @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_outer_join b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_outer_join index 6c229555449f..9a96f9e44951 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_outer_join +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_outer_join @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_OUTER_JOIN_0.OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_outer_join_-_right_join_key_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_outer_join_-_right_join_key_in_projection index 2adfbe811e46..270353c368c3 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_outer_join_-_right_join_key_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_table_outer_join_-_right_join_key_in_projection @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_OUTER_JOIN_0.OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [right_topic]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_unwrapped_single_field_value_schema_on_inputs b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_unwrapped_single_field_value_schema_on_inputs index a6cef605af3c..34152b553bb6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_unwrapped_single_field_value_schema_on_inputs +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_unwrapped_single_field_value_schema_on_inputs @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KafkaTopic_Left.source = BIGINT -CTAS_OUTPUT_0.KafkaTopic_Right.source = BIGINT +CTAS_OUTPUT_0.KafkaTopic_Left.Source = BIGINT +CTAS_OUTPUT_0.KafkaTopic_Right.Source = BIGINT CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [T2]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_unwrapped_single_field_value_schema_on_inputs_and_output b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_unwrapped_single_field_value_schema_on_inputs_and_output index 43eceb450a84..ed540bdd6ec2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_unwrapped_single_field_value_schema_on_inputs_and_output +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_unwrapped_single_field_value_schema_on_inputs_and_output @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KafkaTopic_Left.source = BIGINT -CTAS_OUTPUT_0.KafkaTopic_Right.source = BIGINT +CTAS_OUTPUT_0.KafkaTopic_Left.Source = BIGINT +CTAS_OUTPUT_0.KafkaTopic_Right.Source = BIGINT CTAS_OUTPUT_0.OUTPUT = BIGINT SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [T2]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_wrapped_single_field_value_schema_on_inputs b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_wrapped_single_field_value_schema_on_inputs index 64cf98bff891..1b17fd6698c0 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_wrapped_single_field_value_schema_on_inputs +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_table_to_table_wrapped_single_field_value_schema_on_inputs @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,10 +46,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [T2]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -61,21 +58,21 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-TOSTREAM-0000000010 (stores: []) --> KSTREAM-MAPVALUES-0000000011 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000011 (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-TOSTREAM-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_unqualified_join_criteria b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_unqualified_join_criteria index 5189397c6cf5..5ea57117eda7 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_unqualified_join_criteria +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/joins_-_unqualified_join_criteria @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.left = STRUCT NOT NULL -CSAS_LEFT_OUTER_JOIN_0.Join.right = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Left = STRUCT NOT NULL +CSAS_LEFT_OUTER_JOIN_0.Join.Right = STRUCT NOT NULL CSAS_LEFT_OUTER_JOIN_0.LEFT_OUTER_JOIN = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -70,14 +67,14 @@ Topologies: --> Join-merge <-- Join-this-windowed Processor: Join-merge (stores: []) - --> SELECT-0 + --> Project <-- Join-this-join, Join-outer-other-join - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000010 <-- Join-merge Processor: KSTREAM-MAPVALUES-0000000010 (stores: []) --> KSTREAM-SINK-0000000011 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000011 (topic: LEFT_OUTER_JOIN) <-- KSTREAM-MAPVALUES-0000000010 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_multiple_copies_of_key_field_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_multiple_copies_of_key_field_in_projection index a4c4afec5364..42a043e5895b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_multiple_copies_of_key_field_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_multiple_copies_of_key_field_in_projection @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_in_value___aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_in_value___aliasing index dcbbcc8b69f5..0ada72f7418d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_in_value___aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_in_value___aliasing @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_in_value___no_aliasing index 33c7ce60f316..822a144b13d7 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_in_value___no_aliasing @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_not_in_value___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_not_in_value___- index 6cded9b33f85..1c8280d08c36 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_not_in_value___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___group_by_(-)___key_not_in_value___- @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___no_key_change___-___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___no_key_change___-___- index c880da3e2483..84cb68985e53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___no_key_change___-___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___no_key_change___-___- @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___partition_by_(-)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___partition_by_(-)___key_in_value___no_aliasing index d170f4b406b4..5f8e067ef5ba 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___partition_by_(-)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_null___partition_by_(-)___key_in_value___no_aliasing @@ -36,7 +36,7 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -50,14 +50,14 @@ Topologies: --> KSTREAM-KEY-SELECT-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-KEY-SELECT-0000000003 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-FILTER-0000000002 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 <-- KSTREAM-KEY-SELECT-0000000003 Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_in_value___aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_in_value___aliasing index dcbbcc8b69f5..0ada72f7418d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_in_value___aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_in_value___aliasing @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_in_value___no_aliasing index 594633a12f9a..15ee5965f52b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_in_value___no_aliasing @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_not_in_value___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_not_in_value___- index 6cded9b33f85..1c8280d08c36 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_not_in_value___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(different)___key_not_in_value___- @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_in_value___aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_in_value___aliasing index 8602677e1a3e..bcb91fbb4cec 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_in_value___aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_in_value___aliasing @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_in_value___no_aliasing index 3cd412868220..6347e2d957b7 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_in_value___no_aliasing @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_not_in_value___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_not_in_value___- index b3e1ea4c60f8..034be2218414 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_not_in_value___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_(same)___key_not_in_value___- @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_expression___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_expression___key_in_value___no_aliasing index 48db10a6c167..2f05b8dba666 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_expression___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_expression___key_in_value___no_aliasing @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_multiple___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_multiple___key_in_value___no_aliasing index 5aa4909d0dcb..139336c37c7b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_multiple___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___group_by_multiple___key_in_value___no_aliasing @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___aliasing index c1f5a945bcb6..8de62cb0cea4 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___aliasing @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___aliasing_+_duplicate b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___aliasing_+_duplicate index fdab65e02132..743e8c3bbb31 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___aliasing_+_duplicate +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___aliasing_+_duplicate @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___no_aliasing index c880da3e2483..84cb68985e53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_in_value___no_aliasing @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_not_in_value___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_not_in_value___- index d47cae56b682..484e71a87c1d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_not_in_value___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___no_key_change___key_not_in_value___- @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___partition_by_(different)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___partition_by_(different)___key_in_value___no_aliasing index d170f4b406b4..5f8e067ef5ba 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___partition_by_(different)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___partition_by_(different)___key_in_value___no_aliasing @@ -36,7 +36,7 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -50,14 +50,14 @@ Topologies: --> KSTREAM-KEY-SELECT-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-KEY-SELECT-0000000003 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-FILTER-0000000002 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 <-- KSTREAM-KEY-SELECT-0000000003 Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___partition_by_(same)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___partition_by_(same)___key_in_value___no_aliasing index c880da3e2483..84cb68985e53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___partition_by_(same)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_stream___initially_set___partition_by_(same)___key_in_value___no_aliasing @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___group_by_(-)___key_in_value___aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___group_by_(-)___key_in_value___aliasing index 1cb08ed09088..e04bcbbea170 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___group_by_(-)___key_in_value___aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___group_by_(-)___key_in_value___aliasing @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___group_by_(-)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___group_by_(-)___key_in_value___no_aliasing index c7d36dc1bc40..61a107e048e5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___group_by_(-)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___group_by_(-)___key_in_value___no_aliasing @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___no_key_change___-___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___no_key_change___-___- index b85c19dac158..55186e73f520 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___no_key_change___-___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_null___no_key_change___-___- @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_in_value___aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_in_value___aliasing index 8ee626f5d8c5..ecf270ef6002 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_in_value___aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_in_value___aliasing @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_in_value___no_aliasing index c5a98d1f96c9..cd0f084e9b5c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_in_value___no_aliasing @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_not_in_value___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_not_in_value___- index d965a01af22a..18eb9a7a6b53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_not_in_value___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(different)___key_not_in_value___- @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_in_value___aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_in_value___aliasing index 8ee626f5d8c5..ecf270ef6002 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_in_value___aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_in_value___aliasing @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_in_value___no_aliasing index 2d09776754b2..00ba4f5e5588 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_in_value___no_aliasing @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_not_in_value___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_not_in_value___- index d965a01af22a..18eb9a7a6b53 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_not_in_value___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___group_by_(same)___key_not_in_value___- @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_in_value___aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_in_value___aliasing index 67e31ecfbca6..e0779eeeecda 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_in_value___aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_in_value___aliasing @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_in_value___no_aliasing b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_in_value___no_aliasing index 5a11768c9183..e892b0181ac0 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_in_value___no_aliasing +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_in_value___no_aliasing @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_not_in_value___- b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_not_in_value___- index c795ca8f43da..3c0e8ec17ea5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_not_in_value___- +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_table___initially_set___no_key_change___key_not_in_value___- @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_using_full_source_name_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_using_full_source_name_in_projection index 9dc1b9f2b6d4..2cbb68fea4b6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_using_full_source_name_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_using_full_source_name_in_projection @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_using_source_alias_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_using_source_alias_in_projection index 9dc1b9f2b6d4..2cbb68fea4b6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_using_source_alias_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_using_source_alias_in_projection @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_clause b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_clause index 9dc1b9f2b6d4..2cbb68fea4b6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_clause +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_clause @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_clause_with_alias b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_clause_with_alias index b268d12eeef6..344af9687d0f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_clause_with_alias +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_clause_with_alias @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_only_rowkey_is_in_projection b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_only_rowkey_is_in_projection index 58d144883c37..f3ebfee8767a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_only_rowkey_is_in_projection +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-field_-_where_only_rowkey_is_in_projection @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_KEY_value_field_name b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_KEY_value_field_name index bafdad50a5c9..465c4682905d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_KEY_value_field_name +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_KEY_value_field_name @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_stream_explicit_STRING_ROWKEY b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_stream_explicit_STRING_ROWKEY index 2f25e6dd66b2..bb20bf15080f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_stream_explicit_STRING_ROWKEY +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_stream_explicit_STRING_ROWKEY @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_stream_implicit_STRING_ROWKEY b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_stream_implicit_STRING_ROWKEY index 2f25e6dd66b2..bb20bf15080f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_stream_implicit_STRING_ROWKEY +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_stream_implicit_STRING_ROWKEY @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_table_explicit_STRING_ROWKEY b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_table_explicit_STRING_ROWKEY index 9dec1e7b25fd..0c98208cbb00 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_table_explicit_STRING_ROWKEY +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_table_explicit_STRING_ROWKEY @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_table_implicit_STRING_ROWKEY b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_table_implicit_STRING_ROWKEY index 9dec1e7b25fd..0c98208cbb00 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_table_implicit_STRING_ROWKEY +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/key-schemas_-_table_implicit_STRING_ROWKEY @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_BIGINT_literal_min_max b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_BIGINT_literal_min_max index 1c78314ce322..737a071e41d7 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_BIGINT_literal_min_max +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_BIGINT_literal_min_max @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_BOOLEAN_literal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_BOOLEAN_literal index f915c6c6ee47..78138a4bc153 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_BOOLEAN_literal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_BOOLEAN_literal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_DOUBLE_literal_min_max b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_DOUBLE_literal_min_max index 2c1633993f9e..b32c7f204ac9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_DOUBLE_literal_min_max +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_DOUBLE_literal_min_max @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_INT_literal_min_max b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_INT_literal_min_max index 7ef78573a3f5..a415a3ebb85a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_INT_literal_min_max +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/literals_-_INT_literal_min_max @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_abs b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_abs index 91e1a4a634ac..1fd3f3ea255e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_abs +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_abs @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_calculate_CEIL_function b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_calculate_CEIL_function index 91e1a4a634ac..1fd3f3ea255e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_calculate_CEIL_function +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_calculate_CEIL_function @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_exp b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_exp index ca144c7f06f1..646a92a2d45f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_exp +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_exp @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_floor b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_floor index 91e1a4a634ac..1fd3f3ea255e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_floor +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_floor @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_ln b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_ln index ca144c7f06f1..646a92a2d45f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_ln +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_ln @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_round b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_round index 6b0ca5ef27a7..217281b942ea 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_round +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_round @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_round_with_large_DECIMAL_values b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_round_with_large_DECIMAL_values index 2777fd0abebe..ad53be287114 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_round_with_large_DECIMAL_values +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_round_with_large_DECIMAL_values @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_sign b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_sign index cecdbf1dfa02..b75717adf902 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_sign +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_sign @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_sqrt b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_sqrt index ca144c7f06f1..646a92a2d45f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_sqrt +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/math_-_sqrt @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_decimal_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_decimal_group_by index 345ebb9231ab..ada58f13ec0c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_decimal_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_decimal_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_double_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_double_group_by index a4c6106a2e94..f370ec965c87 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_double_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_double_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_integer_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_integer_group_by index b4889efb8053..0ca47cc7ff6f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_integer_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_integer_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_long_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_long_group_by index 53535338e2f8..3f0019320cee 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_long_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/max-group-by_-_max_long_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_decimal_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_decimal_group_by index bbccd6480c53..6f01a1a1f980 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_decimal_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_decimal_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_double_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_double_group_by index b1ce268af309..cf380659d215 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_double_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_double_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_integer_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_integer_group_by index 67f326e757c0..4f16c0f8755c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_integer_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_integer_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_long_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_long_group_by index b0542ce3a764..97fc18d6dfc7 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_long_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/min-group-by_-_min_long_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_array,_map,_map_value_struct b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_array,_map,_map_value_struct index 6dba7178a807..d7972907c8da 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_array,_map,_map_value_struct +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_array,_map,_map_value_struct @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT>, SL3_DOUBLE_ARRAY ARRAY, SL3_STRING VARCHAR>, SL2_STRUCT_MAP MAP>, SL2_DOUBLE DOUBLE, SL2_BOOLEAN BOOLEAN>, SL1_STRING VARCHAR, SL1_STRUCT_ARRAY ARRAY>>, COL1 BIGINT, COL2 VARCHAR> NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT>, SL3_DOUBLE_ARRAY ARRAY, SL3_STRING VARCHAR>, SL2_STRUCT_MAP MAP>, SL2_DOUBLE DOUBLE, SL2_BOOLEAN BOOLEAN>, SL1_STRING VARCHAR, SL1_STRUCT_ARRAY ARRAY>>, COL1 BIGINT, COL2 VARCHAR> NOT NULL CSAS_S2_0.S2 = STRUCT, NESTED_STRUCT_FIELD__SL1_STRUCT__SL2_STRUCT_MAP MAP>> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_array_and_map_items b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_array_and_map_items index 3148d855f858..a56d1d985c0b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_array_and_map_items +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_array_and_map_items @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S3_0.KsqlTopic.source = STRUCT>, SL3_DOUBLE_ARRAY ARRAY, SL3_STRING VARCHAR>, SL2_STRUCT_MAP MAP>, SL2_DOUBLE DOUBLE, SL2_BOOLEAN BOOLEAN>, SL1_STRING VARCHAR, SL1_STRUCT_ARRAY ARRAY>>, COL1 BIGINT, COL2 VARCHAR> NOT NULL +CSAS_S3_0.KsqlTopic.Source = STRUCT>, SL3_DOUBLE_ARRAY ARRAY, SL3_STRING VARCHAR>, SL2_STRUCT_MAP MAP>, SL2_DOUBLE DOUBLE, SL2_BOOLEAN BOOLEAN>, SL1_STRING VARCHAR, SL1_STRUCT_ARRAY ARRAY>>, COL1 BIGINT, COL2 VARCHAR> NOT NULL CSAS_S3_0.S3 = STRUCT, COL3 DOUBLE, COL4 DOUBLE> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S3) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_star b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_star index d7e463df7349..6b625cbd47e5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_star +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/more-complex-struct_-_complex_struct_select_star @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT>, SL3_DOUBLE_ARRAY ARRAY, SL3_STRING VARCHAR>, SL2_STRUCT_MAP MAP>, SL2_DOUBLE DOUBLE, SL2_BOOLEAN BOOLEAN>, SL1_STRING VARCHAR, SL1_STRUCT_ARRAY ARRAY>>, COL1 BIGINT, COL2 VARCHAR> NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT>, SL3_DOUBLE_ARRAY ARRAY, SL3_STRING VARCHAR>, SL2_STRUCT_MAP MAP>, SL2_DOUBLE DOUBLE, SL2_BOOLEAN BOOLEAN>, SL1_STRING VARCHAR, SL1_STRUCT_ARRAY ARRAY>>, COL1 BIGINT, COL2 VARCHAR> NOT NULL CSAS_S1_0.S1 = STRUCT>, SL3_DOUBLE_ARRAY ARRAY, SL3_STRING VARCHAR>, SL2_STRUCT_MAP MAP>, SL2_DOUBLE DOUBLE, SL2_BOOLEAN BOOLEAN>, SL1_STRING VARCHAR, SL1_STRUCT_ARRAY ARRAY>>, COL1 BIGINT, COL2 VARCHAR> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/multiple-avro-maps_-_project_multiple_avro_maps b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/multiple-avro-maps_-_project_multiple_avro_maps index 6375f08fdba1..6f09150c9f17 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/multiple-avro-maps_-_project_multiple_avro_maps +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/multiple-avro-maps_-_project_multiple_avro_maps @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_SINK_0.KsqlTopic.source = STRUCT, M2 MAP> NOT NULL +CSAS_SINK_0.KsqlTopic.Source = STRUCT, M2 MAP> NOT NULL CSAS_SINK_0.SINK = STRUCT, M2 MAP> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: SINK) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_aliased_key_field_-_same_name b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_aliased_key_field_-_same_name index 83a754624e9b..a99b4d4e0684 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_aliased_key_field_-_same_name +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_aliased_key_field_-_same_name @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_REPARTITIONED_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_REPARTITIONED_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_REPARTITIONED_0.REPARTITIONED = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: REPARTITIONED) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by index c7a2e414b424..3567b4f7c6e0 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by @@ -36,7 +36,7 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -50,14 +50,14 @@ Topologies: --> KSTREAM-KEY-SELECT-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-KEY-SELECT-0000000003 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-FILTER-0000000002 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 <-- KSTREAM-KEY-SELECT-0000000003 Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWKEY b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWKEY index d938e1cbbd66..3636f72cfeea 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWKEY +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWKEY @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWTIME b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWTIME index a78689a8b354..cbe03e28c61d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWTIME +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_ROWTIME @@ -36,7 +36,7 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -50,14 +50,14 @@ Topologies: --> KSTREAM-KEY-SELECT-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-KEY-SELECT-0000000003 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-FILTER-0000000002 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 <-- KSTREAM-KEY-SELECT-0000000003 Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_partition_by_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_partition_by_value index d1555f1bca9b..0f5d6d0416e1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_partition_by_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_partition_by_value @@ -36,7 +36,7 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_REPARTITIONED_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_REPARTITIONED_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_REPARTITIONED_0.REPARTITIONED = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -50,14 +50,14 @@ Topologies: --> KSTREAM-KEY-SELECT-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-KEY-SELECT-0000000003 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-FILTER-0000000002 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 <-- KSTREAM-KEY-SELECT-0000000003 Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: REPARTITIONED) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_value index d1555f1bca9b..0f5d6d0416e1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_null_value @@ -36,7 +36,7 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_REPARTITIONED_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_REPARTITIONED_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_REPARTITIONED_0.REPARTITIONED = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -50,14 +50,14 @@ Topologies: --> KSTREAM-KEY-SELECT-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-KEY-SELECT-0000000003 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-FILTER-0000000002 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 <-- KSTREAM-KEY-SELECT-0000000003 Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: REPARTITIONED) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_all b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_all index 83cdf12d5b28..a171cbdd02a1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_all +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_all @@ -36,7 +36,7 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_REPARTITIONED_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_REPARTITIONED_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_REPARTITIONED_0.REPARTITIONED = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -50,14 +50,14 @@ Topologies: --> KSTREAM-KEY-SELECT-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-KEY-SELECT-0000000003 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-FILTER-0000000002 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 <-- KSTREAM-KEY-SELECT-0000000003 Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: REPARTITIONED) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_some b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_some index d1555f1bca9b..0f5d6d0416e1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_some +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/partition-by_-_partition_by_with_projection_select_some @@ -36,7 +36,7 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_REPARTITIONED_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_REPARTITIONED_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_REPARTITIONED_0.REPARTITIONED = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -50,14 +50,14 @@ Topologies: --> KSTREAM-KEY-SELECT-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-KEY-SELECT-0000000003 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-FILTER-0000000002 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 <-- KSTREAM-KEY-SELECT-0000000003 Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: REPARTITIONED) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_CSAS_with_custom_Kafka_topic_name b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_CSAS_with_custom_Kafka_topic_name index 9686d95c0088..99fa02b5bfaf 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_CSAS_with_custom_Kafka_topic_name +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_CSAS_with_custom_Kafka_topic_name @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: topic_s) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_BETWEEN b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_BETWEEN index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_BETWEEN +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_BETWEEN @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_IS_DISTINCT_FROM b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_IS_DISTINCT_FROM index 55ff51e0937b..3f18248a0a12 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_IS_DISTINCT_FROM +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_IS_DISTINCT_FROM @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_IS_NOT_DISTINCT_FROM b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_IS_NOT_DISTINCT_FROM index 55ff51e0937b..3f18248a0a12 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_IS_NOT_DISTINCT_FROM +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_IS_NOT_DISTINCT_FROM @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NOT_BETWEEN b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NOT_BETWEEN index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NOT_BETWEEN +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NOT_BETWEEN @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NOT_NULL b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NOT_NULL index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NOT_NULL +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NOT_NULL @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NULL b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NULL index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NULL +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_NULL @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_like_pattern b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_like_pattern index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_like_pattern +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_like_pattern @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_like_pattern_without_wildcards b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_like_pattern_without_wildcards index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_like_pattern_without_wildcards +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_like_pattern_without_wildcards @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_long_literal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_long_literal index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_long_literal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_long_literal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_not_like_pattern b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_not_like_pattern index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_not_like_pattern +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_not_like_pattern @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_string_literal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_string_literal index 4c19bc332f2e..c9468d92a201 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_string_literal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Filter_on_string_literal @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Map_filter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Map_filter index 21c95b66c8f9..2e0d2a239772 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Map_filter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Map_filter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Multi_Dimensional_Array b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Multi_Dimensional_Array index 1222a1435ae4..9a5f0ed73b2a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Multi_Dimensional_Array +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Multi_Dimensional_Array @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S3_0.KsqlTopic.source = STRUCT>>> NOT NULL +CSAS_S3_0.KsqlTopic.Source = STRUCT>>> NOT NULL CSAS_S3_0.S3 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S3) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Multi_Dimensional_Array_2 b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Multi_Dimensional_Array_2 index a67368040a8c..8bd86dc70099 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Multi_Dimensional_Array_2 +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Json_Multi_Dimensional_Array_2 @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S3_0.KsqlTopic.source = STRUCT>> NOT NULL +CSAS_S3_0.KsqlTopic.Source = STRUCT>> NOT NULL CSAS_S3_0.S3 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S3) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Null_row_filter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Null_row_filter index aa23b32fe8a0..1e3b01dc0d18 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Null_row_filter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Null_row_filter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S3_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_S3_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_S3_0.S3 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S3) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Project_fields_with_reserved_name b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Project_fields_with_reserved_name index 3aca9a2d7c25..defbd57c77c9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Project_fields_with_reserved_name +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Project_fields_with_reserved_name @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Project_struct_fields_with_reserved_name b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Project_struct_fields_with_reserved_name index 392ca138c79b..503ca0d25af9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Project_struct_fields_with_reserved_name +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_Project_struct_fields_with_reserved_name @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_WHERE_with_many_comparisons._This_tests_the_fix_for_#1784 b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_WHERE_with_many_comparisons._This_tests_the_fix_for_#1784 index 6a2f3b6881ec..5f89ddf5c85f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_WHERE_with_many_comparisons._This_tests_the_fix_for_#1784 +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_WHERE_with_many_comparisons._This_tests_the_fix_for_#1784 @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_EVENTSTEST_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_EVENTSTEST_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_EVENTSTEST_0.EVENTSTEST = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [events]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: EVENTSTEST) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_and_filter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_and_filter index e96acb3a1e8d..d04260b4f204 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_and_filter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_and_filter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S1) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_and_negative_filter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_and_negative_filter index 780b87a7de4c..e1f72ec81fb8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_and_negative_filter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_and_negative_filter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S2) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_string_with_embedded_code b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_string_with_embedded_code index 09f103929163..f23d0b06fdcc 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_string_with_embedded_code +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/project-filter_-_project_string_with_embedded_code @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_create_table_with_key_that_is_quoted b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_create_table_with_key_that_is_quoted index 11d1790f38b0..274be92035d8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_create_table_with_key_that_is_quoted +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_create_table_with_key_that_is_quoted @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_joins_using_fields_that_require_quotes b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_joins_using_fields_that_require_quotes index 8418862914f7..15672b9d7118 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_joins_using_fields_that_require_quotes +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_joins_using_fields_that_require_quotes @@ -36,27 +36,27 @@ "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_JOINED_0.KafkaTopic_Right.source = STRUCT NOT NULL -CSAS_JOINED_0.KafkaTopic_Left.source = STRUCT NOT NULL +CSAS_JOINED_0.Join.Left = STRUCT NOT NULL CSAS_JOINED_0.JOINED = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: Join-repartition-source (topics: [Join-repartition]) --> Join - Processor: Join (stores: [KafkaTopic_Right-reduce]) - --> SELECT-0 + Processor: Join (stores: [KafkaTopic_Right-Reduce]) + --> Project <-- Join-repartition-source Source: KSTREAM-SOURCE-0000000000 (topics: [right_topic]) --> KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000012 <-- Join Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 - <-- SELECT-0 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-reduce]) + <-- Project + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Sink: KSTREAM-SINK-0000000013 (topic: JOINED) diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_math_using_fields_that_require_quotes b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_math_using_fields_that_require_quotes index 8dc2c1b993f4..a112f27f5ccd 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_math_using_fields_that_require_quotes +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_math_using_fields_that_require_quotes @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_sink_fields_that_require_quotes b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_sink_fields_that_require_quotes index c8d28e8c41f4..bce79a0ac0e1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_sink_fields_that_require_quotes +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_sink_fields_that_require_quotes @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_source_fields_that_require_quotes b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_source_fields_that_require_quotes index 78367ba16653..fd2d0d4aa020 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_source_fields_that_require_quotes +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_source_fields_that_require_quotes @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_source_names_requiring_quotes b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_source_names_requiring_quotes index 23cdd44e26d6..5402653c6440 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_source_names_requiring_quotes +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_source_names_requiring_quotes @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_foo-too_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_foo-too_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_foo-too_0.foo-too = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [foo-source]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: foo-too) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_udf_using_fields_that_require_quotes b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_udf_using_fields_that_require_quotes index 93c86a5c5923..72923d670927 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_udf_using_fields_that_require_quotes +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/quoted-identifiers_-_udf_using_fields_that_require_quotes @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/replace_-_replace b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/replace_-_replace index 1cf53570a2e4..c7cb08ce4652 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/replace_-_replace +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/replace_-_replace @@ -4,42 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.functions.substring.legacy.args" : "[hidden]", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +45,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME index 5fb22a78dab2..45bea7721a99 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_AND b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_AND index 5fb22a78dab2..45bea7721a99 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_AND +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_AND @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_BETWEEN b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_BETWEEN index 5fb22a78dab2..45bea7721a99 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_BETWEEN +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_BETWEEN @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_inexact_timestring b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_inexact_timestring index 5fb22a78dab2..45bea7721a99 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_inexact_timestring +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_inexact_timestring @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_timezone b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_timezone index 5fb22a78dab2..45bea7721a99 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_timezone +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/rowtime_-_test_ROWTIME_with_timezone @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialization_should_default_to_wrapped_values b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialization_should_default_to_wrapped_values index cb89db6d3356..9b4861b7859a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialization_should_default_to_wrapped_values +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialization_should_default_to_wrapped_values @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialization_should_pick_up_value_wrapping_from_config b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialization_should_pick_up_value_wrapping_from_config index e8a6652deb36..b19a5a2ae58c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialization_should_pick_up_value_wrapping_from_config +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialization_should_pick_up_value_wrapping_from_config @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "false", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = VARCHAR +CSAS_OUTPUT_0.KsqlTopic.Source = VARCHAR CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value index 8800fba417c7..f2c3bfd4d380 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = ARRAY +CSAS_OUTPUT_0.KsqlTopic.Source = ARRAY CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value_-_non-nullable b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value_-_non-nullable index 8800fba417c7..f2c3bfd4d380 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value_-_non-nullable +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value_-_non-nullable @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = ARRAY +CSAS_OUTPUT_0.KsqlTopic.Source = ARRAY CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value_-_with_coercion b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value_-_with_coercion index 8800fba417c7..f2c3bfd4d380 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value_-_with_coercion +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_array_-_value_-_with_coercion @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = ARRAY +CSAS_OUTPUT_0.KsqlTopic.Source = ARRAY CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value index 6900f35c9cd1..3f67e19ad1b5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = MAP +CSAS_OUTPUT_0.KsqlTopic.Source = MAP CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value_-_non-nullable b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value_-_non-nullable index 6900f35c9cd1..3f67e19ad1b5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value_-_non-nullable +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value_-_non-nullable @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = MAP +CSAS_OUTPUT_0.KsqlTopic.Source = MAP CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value_-_with_coercion b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value_-_with_coercion index c8bb7f8dc331..c2e78ed6b43b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value_-_with_coercion +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_map_-_value_-_with_coercion @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = MAP +CSAS_OUTPUT_0.KsqlTopic.Source = MAP CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_-_value index 5e05cf3e248c..237f980b9122 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = INT +CSAS_OUTPUT_0.KsqlTopic.Source = INT CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_-_value_-_with_coercion b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_-_value_-_with_coercion index b88343d27c2e..c5209f93e9f6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_-_value_-_with_coercion +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_-_value_-_with_coercion @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = VARCHAR +CSAS_OUTPUT_0.KsqlTopic.Source = VARCHAR CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_by_default_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_by_default_-_value index ec9dec89c0d8..1fbe71da6ba6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_by_default_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_anonymous_primitive_by_default_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_array_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_array_-_value index 06eedf80d6ec..b793a1568b78 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_array_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_array_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_map_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_map_-_value index 695ddcb8b4e0..2736f4b37ad7 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_map_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_map_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_primitive_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_primitive_-_value index ec9dec89c0d8..1fbe71da6ba6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_primitive_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_deserialize_nested_primitive_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialization_should_default_to_wrapped_values b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialization_should_default_to_wrapped_values index cb89db6d3356..9b4861b7859a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialization_should_default_to_wrapped_values +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialization_should_default_to_wrapped_values @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialization_should_pick_up_value_wrapping_from_config b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialization_should_pick_up_value_wrapping_from_config index dc3d11593740..39b41eaedb5a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialization_should_pick_up_value_wrapping_from_config +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialization_should_pick_up_value_wrapping_from_config @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "false", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = VARCHAR SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_array_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_array_-_value index 273ef54440b7..e20d4b430b91 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_array_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_array_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = ARRAY SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_map_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_map_-_value index 3895f366a5ce..c66c2081fd98 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_map_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_map_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = MAP SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_primitive_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_primitive_-_value index 4c0f76185484..f828318c71a7 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_primitive_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_primitive_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = BOOLEAN SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_struct_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_struct_-_value index 6ce2f29036da..361ecfaf6563 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_struct_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_anonymous_struct_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_array_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_array_-_value index a9984d9ccc4a..695f6497f1e1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_array_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_array_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_map_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_map_-_value index 98e789692a42..c493a49f89a8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_map_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_map_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_primitive_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_primitive_-_value index 6375087c979e..9a226e43a2de 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_primitive_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_primitive_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_struct_-_value b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_struct_-_value index 9805f6903a1e..950ebc76420e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_struct_-_value +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/serdes_-_serialize_nested_struct_-_value @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_import_session_stream b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_import_session_stream index 2043c09d6ce7..53e8cba73471 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_import_session_stream +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_import_session_stream @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S2) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_import_session_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_import_session_table index 106ed9f5deab..08f05109d11e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_import_session_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_import_session_table @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_inherit_windowed_keys b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_inherit_windowed_keys index 327bac382256..03b642e2be4b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_inherit_windowed_keys +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_inherit_windowed_keys @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S3_1.KsqlTopic.source = STRUCT NOT NULL +CTAS_S3_1.KsqlTopic.Source = STRUCT NOT NULL CTAS_S3_1.S3 = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [S2]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_max_session b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_max_session index 2f314d83da34..bd0a339a6999 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_max_session +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/session-windows_-_max_session @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_read_struct_as_json_string b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_read_struct_as_json_string index 8f21e9cfbfb3..da2c71c2136f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_read_struct_as_json_string +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_read_struct_as_json_string @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT, MAPCOL MAP, ADDRESS STRUCT> NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT, MAPCOL MAP, ADDRESS STRUCT> NOT NULL CSAS_S1_0.S1 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter index 86e3c98b942f..c7dcf4c97bbe 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S2_0.KsqlTopic.source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL +CSAS_S2_0.KsqlTopic.Source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL CSAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S2) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter_2 b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter_2 index bce6ee98f228..90af878aa392 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter_2 +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter_2 @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S3_0.KsqlTopic.source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL +CSAS_S3_0.KsqlTopic.Source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL CSAS_S3_0.S3 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S3) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter_4 b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter_4 index fa1e184468d1..adbe0818c732 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter_4 +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_filter_4 @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S5_0.KsqlTopic.source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL +CSAS_S5_0.KsqlTopic.Source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL CSAS_S5_0.S5 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S5) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_for_ambiguity b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_for_ambiguity index 86b83d3b4e33..e878b46df852 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_for_ambiguity +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_for_ambiguity @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S7_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_S7_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_S7_0.S7 = STRUCT, S2 STRUCT, S3 VARCHAR, S4 VARCHAR> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S7) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_star b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_star index 0ff6c523598f..c7fd58c98112 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_star +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_star @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S1_0.KsqlTopic.source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL +CSAS_S1_0.KsqlTopic.Source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL CSAS_S1_0.S1 = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S1) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_with_nulls b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_with_nulls index aa4ebf7f9723..624aa60be5f4 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_with_nulls +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simple_struct_select_with_nulls @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S6_0.KsqlTopic.source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL +CSAS_S6_0.KsqlTopic.Source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL CSAS_S6_0.S6 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S6) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simples_struct_select_filter_3 b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simples_struct_select_filter_3 index ccffc56b6b34..4eeb9251596a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simples_struct_select_filter_3 +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/simple-struct_-_simples_struct_select_filter_3 @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S4_0.KsqlTopic.source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL +CSAS_S4_0.KsqlTopic.Source = STRUCT>, ORDERUNITS DOUBLE, ARRAYCOL ARRAY, MAPCOL MAP, ADDRESS STRUCT> NOT NULL CSAS_S4_0.S4 = STRUCT>, CATNAME VARCHAR> NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> SELECT-1 + Processor: WhereFilter (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- WHERE-FILTER-0 + <-- WhereFilter Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: S4) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-partitions-replicas_-_Use_the_legacy_default_sink_properties_for_the_sink_topic_if_default_partitions_and_replicas_were_set. b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-partitions-replicas_-_Use_the_legacy_default_sink_properties_for_the_sink_topic_if_default_partitions_and_replicas_were_set. index 38add09e9e4e..96489b752895 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-partitions-replicas_-_Use_the_legacy_default_sink_properties_for_the_sink_topic_if_default_partitions_and_replicas_were_set. +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-partitions-replicas_-_Use_the_legacy_default_sink_properties_for_the_sink_topic_if_default_partitions_and_replicas_were_set. @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : "4", "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : "1", "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S_0.S = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-partitions-replicas_-_should_copy_partition_and_replica_count_from_source_topic b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-partitions-replicas_-_should_copy_partition_and_replica_count_from_source_topic index ce5879b2fe51..96489b752895 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-partitions-replicas_-_should_copy_partition_and_replica_count_from_source_topic +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-partitions-replicas_-_should_copy_partition_and_replica_count_from_source_topic @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_S_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_S_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_S_0.S = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: S) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__default_topic_name_is_stream_name,_in_upper-case b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__default_topic_name_is_stream_name,_in_upper-case index 70a46b399655..6b04e9f1a35e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__default_topic_name_is_stream_name,_in_upper-case +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__default_topic_name_is_stream_name,_in_upper-case @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__use_prefixed_default_topic_name_when_property_set b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__use_prefixed_default_topic_name_when_property_set index b22e3aa3c941..563fa420732d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__use_prefixed_default_topic_name_when_property_set +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__use_prefixed_default_topic_name_when_property_set @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "some-prefix-", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: some-prefix-OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__use_supplied_topic_name,_when_supplied b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__use_supplied_topic_name,_when_supplied index 54a6a58fa6fe..cf4fd95295ed 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__use_supplied_topic_name,_when_supplied +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sink-topic-naming_-_sink-topic-naming__use_supplied_topic_name,_when_supplied @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "some-prefix-", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: Fred) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_list_of_lists b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_list_of_lists index 0b2ec118ce32..139622e8c72f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_list_of_lists +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_list_of_lists @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT>> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT>> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT>> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_list_of_maps b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_list_of_maps index f8a6ee48b603..a64b7895ec5c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_list_of_maps +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_list_of_maps @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT>> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT>> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT>> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_string_list b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_string_list index c103036539f3..c706301138ff 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_string_list +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/slice_-_sublist_for_string_list @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_commas_and_display_pos_0_and_2_of_the_returned_array b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_commas_and_display_pos_0_and_2_of_the_returned_array index 91590b24cc3c..769f36f01146 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_commas_and_display_pos_0_and_2_of_the_returned_array +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_commas_and_display_pos_0_and_2_of_the_returned_array @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_using_the_'$$'_delimiter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_using_the_'$$'_delimiter index 6e6c597b6a48..7bbf3204fbe2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_using_the_'$$'_delimiter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_using_the_'$$'_delimiter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_using_the_'.'_delimiter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_using_the_'.'_delimiter index 6e6c597b6a48..7bbf3204fbe2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_using_the_'.'_delimiter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_a_message_by_using_the_'.'_delimiter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_all_characters_by_using_the_''_delimiter b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_all_characters_by_using_the_''_delimiter index 6e6c597b6a48..7bbf3204fbe2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_all_characters_by_using_the_''_delimiter +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/split_-_split_all_characters_by_using_the_''_delimiter @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/stringdate_-_string_to_date b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/stringdate_-_string_to_date index 656f90574b47..0af0771a8c9b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/stringdate_-_string_to_date +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/stringdate_-_string_to_date @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TS_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TS_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TS_0.TS = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TS) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/stringtimestamp_-_string_to_timestamp b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/stringtimestamp_-_string_to_timestamp index 8d678d460c53..5fa9fcdc688b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/stringtimestamp_-_string_to_timestamp +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/stringtimestamp_-_string_to_timestamp @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TS_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TS_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TS_0.TS = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TS) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/struct-udfs_-_Create_a_struct_from_a_string b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/struct-udfs_-_Create_a_struct_from_a_string index c4a9f4d85fa5..bc4bfb7041d4 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/struct-udfs_-_Create_a_struct_from_a_string +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/struct-udfs_-_Create_a_struct_from_a_string @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/struct-udfs_-_Extract_value_from_struct b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/struct-udfs_-_Extract_value_from_struct index 0e148df9918f..eaf39b0f41a6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/struct-udfs_-_Extract_value_from_struct +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/struct-udfs_-_Extract_value_from_struct @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_do_substring_with_just_pos b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_do_substring_with_just_pos index 0ed5c7439712..1cc06d0eb128 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_do_substring_with_just_pos +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_do_substring_with_just_pos @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_do_substring_with_pos_and_length b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_do_substring_with_pos_and_length index fc57cef58072..c298b127a474 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_do_substring_with_pos_and_length +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_do_substring_with_pos_and_length @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_in_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_in_group_by index b19930396dfe..7b4596a68f4c 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_in_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_in_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_should_default_to_current_mode_for_new_queries b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_should_default_to_current_mode_for_new_queries index 01e932b2aee8..0300fd8968d5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_should_default_to_current_mode_for_new_queries +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/substring_-_should_default_to_current_mode_for_new_queries @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_decimal index 40034c1c9309..f11a939d7168 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_decimal @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_double b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_double index 6dd26c428a0a..cc48c070877f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_double +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_double @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_double_map b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_double_map index 0490838ffe4f..63ea4f5e54f9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_double_map +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_double_map @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT, KSQL_INTERNAL_COL_2 DOUBLE> NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT, KSQL_AGG_VARIABLE_0 DOUBLE> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT, KSQL_INTERNAL_COL_2 DOUBLE> NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_AGG_VARIABLE_0 DOUBLE> NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_int b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_int index 173367bbfa35..54a2f0468216 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_int +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_int @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_int_left_join_of_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_int_left_join_of_table index 1362002cb0e8..473004f7e910 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_int_left_join_of_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_int_left_join_of_table @@ -4,45 +4,42 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KafkaTopic_Left.source = STRUCT NOT NULL -CTAS_OUTPUT_0.KafkaTopic_Right.source = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_OUTPUT_0.KafkaTopic_Left.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.KafkaTopic_Right.Source = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -51,10 +48,10 @@ Topologies: --> KTABLE-SOURCE-0000000001 Source: KSTREAM-SOURCE-0000000003 (topics: [T2]) --> KTABLE-SOURCE-0000000004 - Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 - Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-SOURCE-0000000004 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000005 <-- KSTREAM-SOURCE-0000000003 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) @@ -63,42 +60,42 @@ Topologies: Processor: KTABLE-TRANSFORMVALUES-0000000005 (stores: []) --> KTABLE-JOINOTHER-0000000008 <-- KTABLE-SOURCE-0000000004 - Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-reduce]) + Processor: KTABLE-JOINOTHER-0000000008 (stores: [KafkaTopic_Left-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000005 - Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-reduce]) + Processor: KTABLE-JOINTHIS-0000000007 (stores: [KafkaTopic_Right-Reduce]) --> KTABLE-MERGE-0000000006 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-MERGE-0000000006 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-JOINTHIS-0000000007, KTABLE-JOINOTHER-0000000008 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000010 <-- KTABLE-MERGE-0000000006 Processor: KTABLE-FILTER-0000000010 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000012 <-- KTABLE-FILTER-0000000010 - Sink: KSTREAM-SINK-0000000012 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000012 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000013 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000013 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000014 - Processor: KTABLE-AGGREGATE-0000000014 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000014 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000013 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000014 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000017 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000017 (stores: []) --> KSTREAM-MAPVALUES-0000000018 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000018 (stores: []) --> KSTREAM-SINK-0000000019 <-- KTABLE-TOSTREAM-0000000017 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_doubles_into_a_single_double b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_doubles_into_a_single_double index d066761c1c48..c0cbde624bc4 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_doubles_into_a_single_double +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_doubles_into_a_single_double @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR> NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR, KSQL_AGG_VARIABLE_0 DOUBLE> NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR> NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR, KSQL_AGG_VARIABLE_0 DOUBLE> NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_ints_into_a_single_int b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_ints_into_a_single_int index bb24fc88a0b3..0246fd91bc92 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_ints_into_a_single_int +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_ints_into_a_single_int @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR> NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR, KSQL_AGG_VARIABLE_0 INT> NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR> NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR, KSQL_AGG_VARIABLE_0 INT> NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_longs_into_a_single_long b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_longs_into_a_single_long index 0801de267390..a04722d0c7fd 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_longs_into_a_single_long +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_list_of_longs_into_a_single_long @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_OUTPUT_0.Aggregate.groupby = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR> NOT NULL -CTAS_OUTPUT_0.Aggregate.aggregate = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR, KSQL_AGG_VARIABLE_0 BIGINT> NOT NULL +CTAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_OUTPUT_0.Aggregate.GroupBy = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR> NOT NULL +CTAS_OUTPUT_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_INTERNAL_COL_1 VARCHAR, KSQL_AGG_VARIABLE_0 BIGINT> NOT NULL CTAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_long b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_long index c330e194791d..3a4c66d5e06a 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_long +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_long @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_double_arg b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_double_arg index 7fa01c47cd53..9e53a6aa2434 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_double_arg +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_double_arg @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_int_arg b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_int_arg index 76133902a0c6..7809b75bb0fd 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_int_arg +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_int_arg @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_long_arg b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_long_arg index 89f56a3fdeb0..6c41b0fae334 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_long_arg +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/sum_-_sum_with_constant_long_arg @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_multiple_table_functions b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_multiple_table_functions index 299b47262da8..fe21e06cc990 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_multiple_table_functions +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_multiple_table_functions @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, MY_ARR2 ARRAY, BAR BIGINT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, MY_ARR2 ARRAY, BAR BIGINT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_as_first_select b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_as_first_select index 008eba1a2f66..1d0db585fdc4 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_as_first_select +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_as_first_select @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_as_last_select b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_as_last_select index ad709254568e..f3bfc97bfe37 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_as_last_select +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_as_last_select @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_no_alias b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_no_alias index 1978d9c091ce..74d17a13aae6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_no_alias +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_no_alias @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, BAR BIGINT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, BAR BIGINT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_no_other_selected_columns b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_no_other_selected_columns index 5de84df2f052..254a6b8cc57b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_no_other_selected_columns +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_no_other_selected_columns @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, BAR BIGINT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, BAR BIGINT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_non_selected_columns b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_non_selected_columns index e849f675b4fb..639844c5a5ba 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_non_selected_columns +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_non_selected_columns @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, BAR BIGINT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, BAR BIGINT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_where_clause b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_where_clause index 29c6723fdf9d..c93dcd93fba5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_where_clause +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_function_with_where_clause @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,20 +44,20 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> WHERE-FILTER-0 + --> WhereFilter <-- KSTREAM-SOURCE-0000000000 - Processor: WHERE-FILTER-0 (stores: []) - --> TABLE-FUNCTIONS-APPLY-1 + Processor: WhereFilter (stores: []) + --> FlatMap <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: TABLE-FUNCTIONS-APPLY-1 (stores: []) - --> SELECT-2 - <-- WHERE-FILTER-0 - Processor: SELECT-2 (stores: []) + Processor: FlatMap (stores: []) + --> Project + <-- WhereFilter + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- TABLE-FUNCTIONS-APPLY-1 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 - <-- SELECT-2 + <-- Project Sink: KSTREAM-SINK-0000000006 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000005 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_functions_with_complex_expressions b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_functions_with_complex_expressions index 70217ffe0b4f..2f5868deb0de 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_functions_with_complex_expressions +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_table_functions_with_complex_expressions @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_array_params b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_array_params index 1c37ca3fd80a..eb0e65d24047 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_array_params +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_array_params @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, F1 ARRAY, F2 ARRAY, F3 ARRAY, F4 ARRAY, F5 ARRAY, F6 ARRAY>> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, F1 ARRAY, F2 ARRAY, F3 ARRAY, F4 ARRAY, F5 ARRAY, F6 ARRAY>> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_map_params b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_map_params index b1cf6b8cedc6..bec0f615778f 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_map_params +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_map_params @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT, F1 MAP, F2 MAP, F3 MAP, F4 MAP, F5 MAP, F6 MAP>> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT, F1 MAP, F2 MAP, F3 MAP, F4 MAP, F5 MAP, F6 MAP>> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_return_vals b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_return_vals index 73ca4b9a99b4..e2857795a20d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_return_vals +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_return_vals @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_simple_params b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_simple_params index 8a36b947df90..652669d5b7c9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_simple_params +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/table-functions_-_test_udtf_-_simple_params @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT> NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT> NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,17 +44,17 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> TABLE-FUNCTIONS-APPLY-0 + --> FlatMap <-- KSTREAM-SOURCE-0000000000 - Processor: TABLE-FUNCTIONS-APPLY-0 (stores: []) - --> SELECT-1 + Processor: FlatMap (stores: []) + --> Project <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: SELECT-1 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000004 - <-- TABLE-FUNCTIONS-APPLY-0 + <-- FlatMap Processor: KSTREAM-MAPVALUES-0000000004 (stores: []) --> KSTREAM-SINK-0000000005 - <-- SELECT-1 + <-- Project Sink: KSTREAM-SINK-0000000005 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_group_by b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_group_by index 348a287a3c1a..5ba04da1c04e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_group_by +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_group_by @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_on_a_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_on_a_table index 5dcc902a10d5..312c7f9fea00 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_on_a_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_on_a_table @@ -4,83 +4,80 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_SUM_ID_BY_REGION_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_SUM_ID_BY_REGION_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_SUM_ID_BY_REGION_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_SUM_ID_BY_REGION_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_SUM_ID_BY_REGION_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_SUM_ID_BY_REGION_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_SUM_ID_BY_REGION_0.SUM_ID_BY_REGION = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KTABLE-SOURCE-0000000001 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KTABLE-FILTER-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-FILTER-0000000004 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-FILTER-0000000004 - Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby + Sink: KSTREAM-SINK-0000000006 (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy Sub-topology: 1 - Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-groupby-repartition]) + Source: KSTREAM-SOURCE-0000000007 (topics: [Aggregate-GroupBy-repartition]) --> KTABLE-AGGREGATE-0000000008 - Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 + Processor: KTABLE-AGGREGATE-0000000008 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema <-- KSTREAM-SOURCE-0000000007 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KTABLE-AGGREGATE-0000000008 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_with_struct b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_with_struct index 01e625dbdb48..2ffd2ae3bc19 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_with_struct +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/test-custom-udaf_-_test_udaf_with_struct @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_RESULT_0.KsqlTopic.source = STRUCT> NOT NULL -CTAS_RESULT_0.Aggregate.groupby = STRUCT> NOT NULL -CTAS_RESULT_0.Aggregate.aggregate = STRUCT, KSQL_AGG_VARIABLE_0 STRUCT> NOT NULL +CTAS_RESULT_0.KsqlTopic.Source = STRUCT> NOT NULL +CTAS_RESULT_0.Aggregate.GroupBy = STRUCT> NOT NULL +CTAS_RESULT_0.Aggregate.Aggregate.Materialize = STRUCT, KSQL_AGG_VARIABLE_0 STRUCT> NOT NULL CTAS_RESULT_0.RESULT = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,38 +46,38 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-FILTER-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-FILTER-0000000003 (stores: []) - --> Aggregate-groupby - <-- PRE-AGGREGATE-SELECT-0 - Processor: Aggregate-groupby (stores: []) - --> Aggregate-groupby-repartition-filter + --> Aggregate-GroupBy + <-- Aggregate-Prepare + Processor: Aggregate-GroupBy (stores: []) + --> Aggregate-GroupBy-repartition-filter <-- KSTREAM-FILTER-0000000003 - Processor: Aggregate-groupby-repartition-filter (stores: []) - --> Aggregate-groupby-repartition-sink - <-- Aggregate-groupby - Sink: Aggregate-groupby-repartition-sink (topic: Aggregate-groupby-repartition) - <-- Aggregate-groupby-repartition-filter + Processor: Aggregate-GroupBy-repartition-filter (stores: []) + --> Aggregate-GroupBy-repartition-sink + <-- Aggregate-GroupBy + Sink: Aggregate-GroupBy-repartition-sink (topic: Aggregate-GroupBy-repartition) + <-- Aggregate-GroupBy-repartition-filter Sub-topology: 1 - Source: Aggregate-groupby-repartition-source (topics: [Aggregate-groupby-repartition]) + Source: Aggregate-GroupBy-repartition-source (topics: [Aggregate-GroupBy-repartition]) --> KSTREAM-AGGREGATE-0000000005 - Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- Aggregate-groupby-repartition-source - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000005 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-GroupBy-repartition-source + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000005 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000011 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000011 (stores: []) --> KSTREAM-MAPVALUES-0000000012 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000012 (stores: []) --> KSTREAM-SINK-0000000013 <-- KTABLE-TOSTREAM-0000000011 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-extractor_-_KSQL_default_timestamp_extractor b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-extractor_-_KSQL_default_timestamp_extractor index c00791ddb5f9..ee4246b5a71e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-extractor_-_KSQL_default_timestamp_extractor +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-extractor_-_KSQL_default_timestamp_extractor @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TS_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TS_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TS_0.TS = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TS) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-extractor_-_KSQL_override_timestamp_extractor b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-extractor_-_KSQL_override_timestamp_extractor index 45cd53a7dc6f..aea7e61c2ea8 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-extractor_-_KSQL_override_timestamp_extractor +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-extractor_-_KSQL_override_timestamp_extractor @@ -4,43 +4,40 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647", "ksql.streams.default.timestamp.extractor" : "org.apache.kafka.streams.processor.LogAndSkipOnInvalidTimestamp" } CONFIGS_END -CSAS_TS_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TS_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TS_0.TS = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -48,14 +45,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TS) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-to-string_-_with_valid_zone b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-to-string_-_with_valid_zone index 8b1480102e7e..0dfdf3cd9abb 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-to-string_-_with_valid_zone +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestamp-to-string_-_with_valid_zone @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [input]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestampformat_-_timestamp_format b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestampformat_-_timestamp_format index 4f157a1c8f03..7d0f706be65d 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestampformat_-_timestamp_format +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestampformat_-_timestamp_format @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TS_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TS_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TS_0.TS = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TS) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestampformat_-_with_single_digit_ms_and_numeric_tz b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestampformat_-_with_single_digit_ms_and_numeric_tz index 71b972947e6b..7da06de3dc1b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestampformat_-_with_single_digit_ms_and_numeric_tz +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/timestampformat_-_with_single_digit_ms_and_numeric_tz @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_TS_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_TS_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_TS_0.TS = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: TS) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_decimal b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_decimal index 3571d145206d..be7073e11baa 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_decimal +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_decimal @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_integer b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_integer index 78c4a1ec837d..73494648c2a1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_integer +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_integer @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_long b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_long index 06abc24512f6..58acf63d88bd 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_long +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_long @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_string b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_string index d1d63331ceed..6c0f41bb6b54 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_string +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-distinct_-_topk_distinct_string @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_double b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_double index 4040fc9f665e..d260121b91d9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_double +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_double @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_integer b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_integer index 78c4a1ec837d..73494648c2a1 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_integer +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_integer @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_long b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_long index 06abc24512f6..58acf63d88bd 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_long +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_long @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_string b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_string index d1d63331ceed..6c0f41bb6b54 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_string +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/topk-group-by_-_topk_string @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_import_tumbling_table b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_import_tumbling_table index 106ed9f5deab..08f05109d11e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_import_tumbling_table +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_import_tumbling_table @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_inherit_windowed_keys b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_inherit_windowed_keys index 327bac382256..03b642e2be4b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_inherit_windowed_keys +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_inherit_windowed_keys @@ -4,60 +4,57 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S3_1.KsqlTopic.source = STRUCT NOT NULL +CTAS_S3_1.KsqlTopic.Source = STRUCT NOT NULL CTAS_S3_1.S3 = STRUCT NOT NULL SCHEMAS_END Topologies: Sub-topology: 0 Source: KSTREAM-SOURCE-0000000000 (topics: [S2]) --> KTABLE-SOURCE-0000000001 - Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-reduce]) + Processor: KTABLE-SOURCE-0000000001 (stores: [KsqlTopic-Reduce]) --> KTABLE-TRANSFORMVALUES-0000000002 <-- KSTREAM-SOURCE-0000000000 Processor: KTABLE-TRANSFORMVALUES-0000000002 (stores: []) - --> SELECT-0 + --> Project <-- KTABLE-SOURCE-0000000001 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KTABLE-TOSTREAM-0000000004 <-- KTABLE-TRANSFORMVALUES-0000000002 Processor: KTABLE-TOSTREAM-0000000004 (stores: []) --> KSTREAM-MAPVALUES-0000000005 - <-- SELECT-0 + <-- Project Processor: KSTREAM-MAPVALUES-0000000005 (stores: []) --> KSTREAM-SINK-0000000006 <-- KTABLE-TOSTREAM-0000000004 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_max_tumbling b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_max_tumbling index 2f314d83da34..bd0a339a6999 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_max_tumbling +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_max_tumbling @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_min_tumbling b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_min_tumbling index 2f314d83da34..bd0a339a6999 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_min_tumbling +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_min_tumbling @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_topk_tumbling b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_topk_tumbling index 4040fc9f665e..d260121b91d9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_topk_tumbling +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_topk_tumbling @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_topkdistinct_tumbling b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_topkdistinct_tumbling index 4040fc9f665e..d260121b91d9 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_topkdistinct_tumbling +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/tumbling-windows_-_topkdistinct_tumbling @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT> NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT> NOT NULL CTAS_S2_0.S2 = STRUCT> NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_chain_a_call_to_URL_EXTRACT_PARAMETER_with_URL_DECODE_PARAM b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_chain_a_call_to_URL_EXTRACT_PARAMETER_with_URL_DECODE_PARAM index 3922ff704e6c..3ad4c0592464 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_chain_a_call_to_URL_EXTRACT_PARAMETER_with_URL_DECODE_PARAM +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_chain_a_call_to_URL_EXTRACT_PARAMETER_with_URL_DECODE_PARAM @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_decode_a_url_parameter_using_DECODE_URL_PARAM b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_decode_a_url_parameter_using_DECODE_URL_PARAM index b9d50cb7f872..9fcc03ed1941 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_decode_a_url_parameter_using_DECODE_URL_PARAM +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_decode_a_url_parameter_using_DECODE_URL_PARAM @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_encode_a_url_parameter_using_ENCODE_URL_PARAM b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_encode_a_url_parameter_using_ENCODE_URL_PARAM index 1b47139c435f..c265d2c7459b 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_encode_a_url_parameter_using_ENCODE_URL_PARAM +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_encode_a_url_parameter_using_ENCODE_URL_PARAM @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_fragment_from_a_URL_using_URL_EXTRACT_FRAGMENT b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_fragment_from_a_URL_using_URL_EXTRACT_FRAGMENT index 41ceb6a86887..c519830bf9f6 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_fragment_from_a_URL_using_URL_EXTRACT_FRAGMENT +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_fragment_from_a_URL_using_URL_EXTRACT_FRAGMENT @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_host_from_a_URL_using_URL_EXTRACT_HOST b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_host_from_a_URL_using_URL_EXTRACT_HOST index 191f603268d6..00e9facb41ea 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_host_from_a_URL_using_URL_EXTRACT_HOST +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_host_from_a_URL_using_URL_EXTRACT_HOST @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_parameter_from_a_URL_using_URL_EXTRACT_PARAMETER b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_parameter_from_a_URL_using_URL_EXTRACT_PARAMETER index c1b7f77f18a7..aa96ed54abe5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_parameter_from_a_URL_using_URL_EXTRACT_PARAMETER +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_parameter_from_a_URL_using_URL_EXTRACT_PARAMETER @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_path_from_a_URL_using_URL_EXTRACT_PATH b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_path_from_a_URL_using_URL_EXTRACT_PATH index c2e0996a6d46..b13755ded09e 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_path_from_a_URL_using_URL_EXTRACT_PATH +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_path_from_a_URL_using_URL_EXTRACT_PATH @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_port_from_a_URL_using_URL_EXTRACT_PORT b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_port_from_a_URL_using_URL_EXTRACT_PORT index 18acec2f6870..24e7f936ada5 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_port_from_a_URL_using_URL_EXTRACT_PORT +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_port_from_a_URL_using_URL_EXTRACT_PORT @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_protocol_from_a_URL_using_URL_EXTRACT_PROTOCOL b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_protocol_from_a_URL_using_URL_EXTRACT_PROTOCOL index 140a0174040d..06ee22289c43 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_protocol_from_a_URL_using_URL_EXTRACT_PROTOCOL +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_protocol_from_a_URL_using_URL_EXTRACT_PROTOCOL @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_query_from_a_URL_using_URL_EXTRACT_QUERY b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_query_from_a_URL_using_URL_EXTRACT_QUERY index e9e1a2bdeb52..6d09323e5287 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_query_from_a_URL_using_URL_EXTRACT_QUERY +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/url_-_extract_a_query_from_a_URL_using_URL_EXTRACT_QUERY @@ -4,42 +4,39 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CSAS_OUTPUT_0.KsqlTopic.source = STRUCT NOT NULL +CSAS_OUTPUT_0.KsqlTopic.Source = STRUCT NOT NULL CSAS_OUTPUT_0.OUTPUT = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -47,14 +44,14 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> SELECT-0 + --> Project <-- KSTREAM-SOURCE-0000000000 - Processor: SELECT-0 (stores: []) + Processor: Project (stores: []) --> KSTREAM-MAPVALUES-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-MAPVALUES-0000000003 (stores: []) --> KSTREAM-SINK-0000000004 - <-- SELECT-0 + <-- Project Sink: KSTREAM-SINK-0000000004 (topic: OUTPUT) <-- KSTREAM-MAPVALUES-0000000003 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_in_expressions b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_in_expressions index ac159f3f5de9..d3f356ba84ae 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_in_expressions +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_in_expressions @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,26 +46,26 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> AGGREGATE-WINDOW-SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Aggregate-WindowSelect <-- KSTREAM-AGGREGATE-0000000003 - Processor: AGGREGATE-WINDOW-SELECT-2 (stores: []) - --> SELECT-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: SELECT-3 (stores: []) + Processor: Aggregate-Aggregate-WindowSelect (stores: []) + --> Aggregate-Project + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000007 - <-- AGGREGATE-WINDOW-SELECT-2 + <-- Aggregate-Aggregate-WindowSelect Processor: KTABLE-TOSTREAM-0000000007 (stores: []) --> KSTREAM-MAPVALUES-0000000008 - <-- SELECT-3 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000008 (stores: []) --> KSTREAM-SINK-0000000009 <-- KTABLE-TOSTREAM-0000000007 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_none b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_none index da8c2072934a..3da4195eedf2 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_none +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_none @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,23 +46,23 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Project <-- KSTREAM-AGGREGATE-0000000003 - Processor: SELECT-2 (stores: []) + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000006 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 + <-- Aggregate-Aggregate-ToOutputSchema Processor: KTABLE-TOSTREAM-0000000006 (stores: []) --> KSTREAM-MAPVALUES-0000000007 - <-- SELECT-2 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000007 (stores: []) --> KSTREAM-SINK-0000000008 <-- KTABLE-TOSTREAM-0000000006 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_hopping b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_hopping index ac159f3f5de9..d3f356ba84ae 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_hopping +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_hopping @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,26 +46,26 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> AGGREGATE-WINDOW-SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Aggregate-WindowSelect <-- KSTREAM-AGGREGATE-0000000003 - Processor: AGGREGATE-WINDOW-SELECT-2 (stores: []) - --> SELECT-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: SELECT-3 (stores: []) + Processor: Aggregate-Aggregate-WindowSelect (stores: []) + --> Aggregate-Project + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000007 - <-- AGGREGATE-WINDOW-SELECT-2 + <-- Aggregate-Aggregate-WindowSelect Processor: KTABLE-TOSTREAM-0000000007 (stores: []) --> KSTREAM-MAPVALUES-0000000008 - <-- SELECT-3 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000008 (stores: []) --> KSTREAM-SINK-0000000009 <-- KTABLE-TOSTREAM-0000000007 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_session b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_session index ac159f3f5de9..d3f356ba84ae 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_session +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_session @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,26 +46,26 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> AGGREGATE-WINDOW-SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Aggregate-WindowSelect <-- KSTREAM-AGGREGATE-0000000003 - Processor: AGGREGATE-WINDOW-SELECT-2 (stores: []) - --> SELECT-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: SELECT-3 (stores: []) + Processor: Aggregate-Aggregate-WindowSelect (stores: []) + --> Aggregate-Project + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000007 - <-- AGGREGATE-WINDOW-SELECT-2 + <-- Aggregate-Aggregate-WindowSelect Processor: KTABLE-TOSTREAM-0000000007 (stores: []) --> KSTREAM-MAPVALUES-0000000008 - <-- SELECT-3 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000008 (stores: []) --> KSTREAM-SINK-0000000009 <-- KTABLE-TOSTREAM-0000000007 diff --git a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_tumbling b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_tumbling index ac159f3f5de9..d3f356ba84ae 100644 --- a/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_tumbling +++ b/ksql-functional-tests/src/test/resources/expected_topology/0_6_0-pre/window-bounds_-_table_tumbling @@ -4,44 +4,41 @@ "ksql.security.extension.class" : null, "ksql.transient.prefix" : "transient_", "ksql.persistence.wrap.single.values" : "true", - "ksql.named.internal.topics" : "on", - "ksql.windowed.session.key.legacy" : "false", - "ksql.query.stream.groupby.rowkey.repartition" : "false", "ksql.schema.registry.url" : "http://localhost:8081", "ksql.streams.default.deserialization.exception.handler" : "io.confluent.ksql.errors.LogMetricAndContinueExceptionHandler", "ksql.output.topic.name.prefix" : "", "ksql.streams.auto.offset.reset" : "earliest", - "ksql.sink.partitions" : null, "ksql.connect.url" : "http://localhost:8083", - "ksql.avro.maps.named" : "true", "ksql.service.id" : "some.ksql.service.id", + "ksql.internal.topic.min.insync.replicas" : "1", "ksql.internal.topic.replicas" : "1", "ksql.insert.into.values.enabled" : "true", + "ksql.query.pull.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", "ksql.streams.commit.interval.ms" : "2000", "ksql.metric.reporters" : "", "ksql.streams.auto.commit.interval.ms" : "0", - "ksql.sink.replicas" : null, "ksql.metrics.extension" : null, "ksql.streams.topology.optimization" : "all", + "ksql.query.pull.streamsstore.rebalancing.timeout.ms" : "10000", "ksql.streams.num.stream.threads" : "4", "ksql.metrics.tags.custom" : "", "ksql.udfs.enabled" : "true", "ksql.udf.enable.security.manager" : "true", - "ksql.functions.substring.legacy.args" : "false", + "ksql.query.pull.skip.access.validator" : "false", "ksql.connect.worker.config" : "", + "ksql.query.pull.routing.timeout.ms" : "30000", "ksql.sink.window.change.log.additional.retention" : "1000000", - "ksql.query.inject.legacy.map.values.node" : "false", "ksql.udf.collect.metrics" : "false", "ksql.persistent.prefix" : "query_", "ksql.query.persistent.active.limit" : "2147483647" } CONFIGS_END -CTAS_S2_0.KsqlTopic.source = STRUCT NOT NULL -CTAS_S2_0.Aggregate.groupby = STRUCT NOT NULL -CTAS_S2_0.Aggregate.aggregate = STRUCT NOT NULL +CTAS_S2_0.KsqlTopic.Source = STRUCT NOT NULL +CTAS_S2_0.Aggregate.GroupBy = STRUCT NOT NULL +CTAS_S2_0.Aggregate.Aggregate.Materialize = STRUCT NOT NULL CTAS_S2_0.S2 = STRUCT NOT NULL SCHEMAS_END Topologies: @@ -49,26 +46,26 @@ Topologies: Source: KSTREAM-SOURCE-0000000000 (topics: [test_topic]) --> KSTREAM-TRANSFORMVALUES-0000000001 Processor: KSTREAM-TRANSFORMVALUES-0000000001 (stores: []) - --> PRE-AGGREGATE-SELECT-0 + --> Aggregate-Prepare <-- KSTREAM-SOURCE-0000000000 - Processor: PRE-AGGREGATE-SELECT-0 (stores: []) + Processor: Aggregate-Prepare (stores: []) --> KSTREAM-AGGREGATE-0000000003 <-- KSTREAM-TRANSFORMVALUES-0000000001 - Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-aggregate]) - --> AGGREGATE-TO-OUTPUT-SCHEMA-1 - <-- PRE-AGGREGATE-SELECT-0 - Processor: AGGREGATE-TO-OUTPUT-SCHEMA-1 (stores: []) - --> AGGREGATE-WINDOW-SELECT-2 + Processor: KSTREAM-AGGREGATE-0000000003 (stores: [Aggregate-Aggregate-Materialize]) + --> Aggregate-Aggregate-ToOutputSchema + <-- Aggregate-Prepare + Processor: Aggregate-Aggregate-ToOutputSchema (stores: []) + --> Aggregate-Aggregate-WindowSelect <-- KSTREAM-AGGREGATE-0000000003 - Processor: AGGREGATE-WINDOW-SELECT-2 (stores: []) - --> SELECT-3 - <-- AGGREGATE-TO-OUTPUT-SCHEMA-1 - Processor: SELECT-3 (stores: []) + Processor: Aggregate-Aggregate-WindowSelect (stores: []) + --> Aggregate-Project + <-- Aggregate-Aggregate-ToOutputSchema + Processor: Aggregate-Project (stores: []) --> KTABLE-TOSTREAM-0000000007 - <-- AGGREGATE-WINDOW-SELECT-2 + <-- Aggregate-Aggregate-WindowSelect Processor: KTABLE-TOSTREAM-0000000007 (stores: []) --> KSTREAM-MAPVALUES-0000000008 - <-- SELECT-3 + <-- Aggregate-Project Processor: KSTREAM-MAPVALUES-0000000008 (stores: []) --> KSTREAM-SINK-0000000009 <-- KTABLE-TOSTREAM-0000000007 diff --git a/ksql-functional-tests/src/test/resources/query-validation-tests/group-by.json b/ksql-functional-tests/src/test/resources/query-validation-tests/group-by.json index c1a0e93da974..76e2c19f2d42 100644 --- a/ksql-functional-tests/src/test/resources/query-validation-tests/group-by.json +++ b/ksql-functional-tests/src/test/resources/query-validation-tests/group-by.json @@ -17,11 +17,11 @@ {"topic": "test_topic", "key": "d1", "value": "d1"} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": "d1,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": "d2,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": "d1,0,2"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": "d2,0,2"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": "d1,0,3"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": "d1,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": "d2,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": "d1,0,2"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": "d2,0,2"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": "d1,0,3"}, {"topic": "OUTPUT", "key": "d1", "value": "d1,1"}, {"topic": "OUTPUT", "key": "d2", "value": "d2,1"}, {"topic": "OUTPUT", "key": "d1", "value": "d1,2"}, @@ -55,11 +55,11 @@ {"topic": "test_topic", "key": "d1", "value": {"DATA": "d1"}, "timestamp": 5} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 1, "KSQL_AGG_VARIABLE_0": 1}, "timestamp": 1}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 2, "KSQL_AGG_VARIABLE_0": 1}, "timestamp": 2}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 3, "KSQL_AGG_VARIABLE_0": 2}, "timestamp": 3}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 4, "KSQL_AGG_VARIABLE_0": 2}, "timestamp": 4}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 5, "KSQL_AGG_VARIABLE_0": 3}, "timestamp": 5}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 1, "KSQL_AGG_VARIABLE_0": 1}, "timestamp": 1}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 2, "KSQL_AGG_VARIABLE_0": 1}, "timestamp": 2}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 3, "KSQL_AGG_VARIABLE_0": 2}, "timestamp": 3}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 4, "KSQL_AGG_VARIABLE_0": 2}, "timestamp": 4}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 5, "KSQL_AGG_VARIABLE_0": 3}, "timestamp": 5}, {"topic": "OUTPUT", "key": "d1", "value": {"DATA": "d1", "KSQL_COL_1":1}, "timestamp": 1}, {"topic": "OUTPUT", "key": "d2", "value": {"DATA": "d2", "KSQL_COL_1":1}, "timestamp": 2}, {"topic": "OUTPUT", "key": "d1", "value": {"DATA": "d1", "KSQL_COL_1":2}, "timestamp": 3}, @@ -81,11 +81,11 @@ {"topic": "test_topic", "key": 3, "value": "3,a"} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": "1,a,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|2", "value": "2,b,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": "1,a,0,2"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|2", "value": "2,b,0,2"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|3", "value": "3,a,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": "1,a,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|2", "value": "2,b,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": "1,a,0,2"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|2", "value": "2,b,0,2"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|3", "value": "3,a,0,1"}, {"topic": "OUTPUT", "key": "a|+|1", "value": "1,a,1"}, {"topic": "OUTPUT", "key": "b|+|2", "value": "2,b,1"}, {"topic": "OUTPUT", "key": "a|+|1", "value": "1,a,2"}, @@ -108,11 +108,11 @@ {"topic": "test_topic", "key": 3, "value": {"F1": 3, "F2": "a"}} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 2}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 2}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|3", "value": {"KSQL_INTERNAL_COL_0": 3, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 2}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 2}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|3", "value": {"KSQL_INTERNAL_COL_0": 3, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, {"topic": "OUTPUT", "key": "a|+|1", "value": {"F1": 1, "F2": "a", "KSQL_COL_2": 1}}, {"topic": "OUTPUT", "key": "b|+|2", "value": {"F1": 2, "F2": "b", "KSQL_COL_2": 1}}, {"topic": "OUTPUT", "key": "a|+|1", "value": {"F1": 1, "F2": "a", "KSQL_COL_2": 2}}, @@ -155,13 +155,13 @@ {"topic": "test_topic", "key": 1, "value": "1,a"} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": "1,a,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|2", "value": "2,b,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": "1,a,0,0"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|1", "value": "1,b,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|2", "value": "2,b,0,0"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|1", "value": "1,b,0,0"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": "1,a,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": "1,a,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|2", "value": "2,b,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": "1,a,0,0"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|1", "value": "1,b,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|2", "value": "2,b,0,0"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|1", "value": "1,b,0,0"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": "1,a,0,1"}, {"topic": "OUTPUT", "key": "a|+|1", "value": "1,a,1"}, {"topic": "OUTPUT", "key": "b|+|2", "value": "2,b,1"}, {"topic": "OUTPUT", "key": "a|+|1", "value": "1,a,0"}, @@ -186,13 +186,13 @@ {"topic": "test_topic", "key": 1, "value": {"F1": 1, "F2": "a"}} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 0}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 0}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "b|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 0}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 0}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 0}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "b|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "b", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 0}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "a|+|1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "a", "KSQL_INTERNAL_COL_2": 0, "KSQL_AGG_VARIABLE_0": 1}}, {"topic": "OUTPUT", "key": "a|+|1", "value": {"F1": 1, "F2": "a", "KSQL_COL_2": 1}}, {"topic": "OUTPUT", "key": "b|+|2", "value": {"F1": 2, "F2": "b", "KSQL_COL_2": 1}}, {"topic": "OUTPUT", "key": "a|+|1", "value": {"F1": 1, "F2": "a", "KSQL_COL_2": 0}}, @@ -216,16 +216,16 @@ {"topic": "test_topic", "value": "d1"} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d1", "value": "d1,0"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d2", "value": "d2,0"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d1", "value": "d1,0"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d2", "value": "d2,0"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d1", "value": "d1,0"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": "d1,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": "d2,0,1"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": "d1,0,2"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": "d2,0,2"}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": "d1,0,3"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d1", "value": "d1,0"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d2", "value": "d2,0"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d1", "value": "d1,0"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d2", "value": "d2,0"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d1", "value": "d1,0"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": "d1,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": "d2,0,1"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": "d1,0,2"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": "d2,0,2"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": "d1,0,3"}, {"topic": "OUTPUT", "key": "d1", "value": "d1,1"}, {"topic": "OUTPUT", "key": "d2", "value": "d2,1"}, {"topic": "OUTPUT", "key": "d1", "value": "d1,2"}, @@ -248,16 +248,16 @@ {"topic": "test_topic", "value": {"DATA": "d1"}} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 0}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 0}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-groupby-repartition", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 1}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 1}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 2}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 2}}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 3}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 0}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 0}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-GroupBy-repartition", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 1}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 2}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 2}}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 0, "KSQL_AGG_VARIABLE_0": 3}}, {"topic": "OUTPUT", "key": "d1", "value": {"DATA": "d1", "KSQL_COL_1":1}}, {"topic": "OUTPUT", "key": "d2", "value": {"DATA": "d2", "KSQL_COL_1":1}}, {"topic": "OUTPUT", "key": "d1", "value": {"DATA": "d1", "KSQL_COL_1":2}}, @@ -930,9 +930,9 @@ {"topic": "test_topic", "value": {"DATA": "d1"}, "timestamp": 3} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "d1", "KSQL_AGG_VARIABLE_0": 1}, "timestamp": 1}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "d2", "KSQL_AGG_VARIABLE_0": 1}, "timestamp": 2}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": 3, "KSQL_INTERNAL_COL_1": "d1", "KSQL_AGG_VARIABLE_0": 2}, "timestamp": 3}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": 1, "KSQL_INTERNAL_COL_1": "d1", "KSQL_AGG_VARIABLE_0": 1}, "timestamp": 1}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": 2, "KSQL_INTERNAL_COL_1": "d2", "KSQL_AGG_VARIABLE_0": 1}, "timestamp": 2}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": 3, "KSQL_INTERNAL_COL_1": "d1", "KSQL_AGG_VARIABLE_0": 2}, "timestamp": 3}, {"topic": "OUTPUT", "key": "d1", "value": {"KSQL_COL_0": 1}, "timestamp": 1}, {"topic": "OUTPUT", "key": "d2", "value": {"KSQL_COL_0": 1}, "timestamp": 2}, {"topic": "OUTPUT", "key": "d1", "value": {"KSQL_COL_0": 2}, "timestamp": 3} @@ -973,9 +973,9 @@ {"topic": "test_topic", "value": {"DATA": "d1"}, "timestamp": 3} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 1, "KSQL_AGG_VARIABLE_0": 1, "KSQL_AGG_VARIABLE_1": 1}, "timestamp": 1}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 2, "KSQL_AGG_VARIABLE_0": 1, "KSQL_AGG_VARIABLE_1": 1}, "timestamp": 2}, - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-aggregate-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 3, "KSQL_AGG_VARIABLE_0": 2, "KSQL_AGG_VARIABLE_1": 2}, "timestamp": 3}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 1, "KSQL_AGG_VARIABLE_0": 1, "KSQL_AGG_VARIABLE_1": 1}, "timestamp": 1}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d2", "value": {"KSQL_INTERNAL_COL_0": "d2", "KSQL_INTERNAL_COL_1": 2, "KSQL_AGG_VARIABLE_0": 1, "KSQL_AGG_VARIABLE_1": 1}, "timestamp": 2}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_OUTPUT_0-Aggregate-Aggregate-Materialize-changelog", "key": "d1", "value": {"KSQL_INTERNAL_COL_0": "d1", "KSQL_INTERNAL_COL_1": 3, "KSQL_AGG_VARIABLE_0": 2, "KSQL_AGG_VARIABLE_1": 2}, "timestamp": 3}, {"topic": "OUTPUT", "key": "d1", "value": {"DATA": "d1", "KSQL_COL_1": 1, "KSQL_COL_2": 1, "COPY": "d1"}, "timestamp": 1}, {"topic": "OUTPUT", "key": "d2", "value": {"DATA": "d2", "KSQL_COL_1": 1, "KSQL_COL_2": 1, "COPY": "d2"}, "timestamp": 2}, {"topic": "OUTPUT", "key": "d1", "value": {"DATA": "d1", "KSQL_COL_1": 2, "KSQL_COL_2": 2, "COPY": "d1"}, "timestamp": 3} diff --git a/ksql-functional-tests/src/test/resources/query-validation-tests/table.json b/ksql-functional-tests/src/test/resources/query-validation-tests/table.json index 588794eb572f..42b342e50858 100644 --- a/ksql-functional-tests/src/test/resources/query-validation-tests/table.json +++ b/ksql-functional-tests/src/test/resources/query-validation-tests/table.json @@ -50,7 +50,7 @@ {"topic": "test_topic", "key": 1, "value": "2"} ], "outputs": [ - {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_T1_0-KsqlTopic-reduce-changelog", "key": "1", "value": "2"}, + {"topic": "_confluent-ksql-some.ksql.service.idquery_CTAS_T1_0-KsqlTopic-Reduce-changelog", "key": "1", "value": "2"}, {"topic": "T1", "key": 1, "value": "2"} ] } diff --git a/ksql-rest-app/src/test/resources/ksql-plan-schema/schema.json b/ksql-rest-app/src/test/resources/ksql-plan-schema/schema.json index 6bc9033b0982..9ab9c777b3fb 100644 --- a/ksql-rest-app/src/test/resources/ksql-plan-schema/schema.json +++ b/ksql-rest-app/src/test/resources/ksql-plan-schema/schema.json @@ -300,13 +300,10 @@ }, "filterExpression" : { "type" : "string" - }, - "stepName" : { - "type" : "string" } }, "title" : "streamFilterV1", - "required" : [ "@type", "properties", "source", "filterExpression", "stepName" ] + "required" : [ "@type", "properties", "source", "filterExpression" ] }, "StreamFlatMap" : { "type" : "object", @@ -403,13 +400,10 @@ "items" : { "type" : "string" } - }, - "selectNodeName" : { - "type" : "string" } }, "title" : "streamMapValuesV1", - "required" : [ "@type", "properties", "source", "selectExpressions", "selectNodeName" ] + "required" : [ "@type", "properties", "source", "selectExpressions" ] }, "StreamSelectKey" : { "type" : "object", @@ -753,13 +747,10 @@ }, "filterExpression" : { "type" : "string" - }, - "stepName" : { - "type" : "string" } }, "title" : "tableFilterV1", - "required" : [ "@type", "properties", "source", "filterExpression", "stepName" ] + "required" : [ "@type", "properties", "source", "filterExpression" ] }, "TableGroupBy" : { "type" : "object", @@ -809,13 +800,10 @@ "items" : { "type" : "string" } - }, - "selectNodeName" : { - "type" : "string" } }, "title" : "tableMapValuesV1", - "required" : [ "@type", "properties", "source", "selectExpressions", "selectNodeName" ] + "required" : [ "@type", "properties", "source", "selectExpressions" ] }, "TableSink" : { "type" : "object", diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/AggregateBuilderUtils.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/AggregateBuilderUtils.java index 2198801a61d0..c39ac1a1c28f 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/AggregateBuilderUtils.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/AggregateBuilderUtils.java @@ -18,8 +18,10 @@ import io.confluent.ksql.GenericRow; import io.confluent.ksql.execution.builder.KsqlQueryBuilder; import io.confluent.ksql.execution.context.QueryContext; +import io.confluent.ksql.execution.context.QueryContext.Stacker; import io.confluent.ksql.execution.function.udaf.KudafAggregator; import io.confluent.ksql.execution.materialization.MaterializationInfo; +import io.confluent.ksql.execution.plan.ExecutionStep; import io.confluent.ksql.execution.plan.Formats; import io.confluent.ksql.schema.ksql.LogicalSchema; import io.confluent.ksql.schema.ksql.PhysicalSchema; @@ -30,14 +32,33 @@ import org.apache.kafka.streams.state.KeyValueStore; final class AggregateBuilderUtils { - - static final String STEP_NAME = "AGGREGATE-TO-OUTPUT-SCHEMA"; + private static final String MATERIALIZE_OP = "Materialize"; + private static final String WINDOW_SELECT_OP = "WindowSelect"; + private static final String TO_OUTPUT_SCHEMA_OP = "ToOutputSchema"; private AggregateBuilderUtils() { } + static QueryContext materializeContext(final ExecutionStep step) { + return Stacker.of(step.getProperties().getQueryContext()) + .push(MATERIALIZE_OP) + .getQueryContext(); + } + + static QueryContext windowSelectContext(final ExecutionStep step) { + return Stacker.of(step.getProperties().getQueryContext()) + .push(WINDOW_SELECT_OP) + .getQueryContext(); + } + + static QueryContext outputContext(final ExecutionStep step) { + return Stacker.of(step.getProperties().getQueryContext()) + .push(TO_OUTPUT_SCHEMA_OP) + .getQueryContext(); + } + static Materialized> buildMaterialized( - final QueryContext queryContext, + final ExecutionStep step, final LogicalSchema aggregateSchema, final Formats formats, final KsqlQueryBuilder queryBuilder, @@ -46,6 +67,7 @@ static Materialized> buildMater aggregateSchema, formats.getOptions() ); + final QueryContext queryContext = materializeContext(step); final Serde keySerde = queryBuilder.buildKeySerde( formats.getKeyFormat(), physicalAggregationSchema, @@ -61,12 +83,12 @@ static Materialized> buildMater static MaterializationInfo.Builder materializationInfoBuilder( final KudafAggregator aggregator, - final QueryContext queryContext, + final ExecutionStep step, final LogicalSchema aggregationSchema, final LogicalSchema outputSchema ) { - + final QueryContext queryContext = materializeContext(step); return MaterializationInfo.builder(StreamsUtil.buildOpName(queryContext), aggregationSchema) - .map(pl -> aggregator.getResultMapper(), outputSchema, STEP_NAME); + .map(pl -> aggregator.getResultMapper(), outputSchema, queryContext); } } diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/ExecutionStepFactory.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/ExecutionStepFactory.java index 30fdd0a18666..8e8d1cad4c1c 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/ExecutionStepFactory.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/ExecutionStepFactory.java @@ -185,23 +185,20 @@ public static StreamFlatMap streamFlatMap( public static StreamFilter streamFilter( final Stacker stacker, final ExecutionStep> source, - final Expression filterExpression, - final String stepName + final Expression filterExpression ) { final QueryContext queryContext = stacker.getQueryContext(); return new StreamFilter<>( new ExecutionStepPropertiesV1(queryContext), source, - filterExpression, - stepName + filterExpression ); } public static StreamMapValues streamMapValues( final QueryContext.Stacker stacker, final ExecutionStep> source, - final List selectExpressions, - final String selectNodeName + final List selectExpressions ) { final ExecutionStepPropertiesV1 properties = new ExecutionStepPropertiesV1( stacker.getQueryContext() @@ -209,8 +206,7 @@ public static StreamMapValues streamMapValues( return new StreamMapValues<>( properties, source, - selectExpressions, - selectNodeName + selectExpressions ); } @@ -280,23 +276,20 @@ public static TableSink tableSink( public static TableFilter tableFilter( final Stacker stacker, final ExecutionStep> source, - final Expression filterExpression, - final String stepName + final Expression filterExpression ) { final QueryContext queryContext = stacker.getQueryContext(); return new TableFilter<>( new ExecutionStepPropertiesV1(queryContext), source, - filterExpression, - stepName + filterExpression ); } public static TableMapValues tableMapValues( final QueryContext.Stacker stacker, final ExecutionStep> source, - final List selectExpressions, - final String selectNodeName + final List selectExpressions ) { final ExecutionStepPropertiesV1 properties = new ExecutionStepPropertiesV1( stacker.getQueryContext() @@ -304,8 +297,7 @@ public static TableMapValues tableMapValues( return new TableMapValues<>( properties, source, - selectExpressions, - selectNodeName + selectExpressions ); } diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/SourceBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/SourceBuilder.java index 556075097a9e..2a28ca609b14 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/SourceBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/SourceBuilder.java @@ -360,7 +360,7 @@ private static String tableChangeLogOpName(final ExecutionStepPropertiesV1 props for (final String part : parts.subList(0, parts.size() - 1)) { stacker = stacker.push(part); } - return StreamsUtil.buildOpName(stacker.push("reduce").getQueryContext()); + return StreamsUtil.buildOpName(stacker.push("Reduce").getQueryContext()); } private static Function, String> windowedRowKeyGenerator( diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamAggregateBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamAggregateBuilder.java index d63ab0336afb..629077f55897 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamAggregateBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamAggregateBuilder.java @@ -85,7 +85,7 @@ static KTableHolder build( final LogicalSchema resultSchema = aggregateParams.getSchema(); final Materialized> materialized = AggregateBuilderUtils.buildMaterialized( - aggregate.getProperties().getQueryContext(), + aggregate, aggregateSchema, aggregate.getFormats(), queryBuilder, @@ -103,7 +103,7 @@ static KTableHolder build( final MaterializationInfo.Builder materializationBuilder = AggregateBuilderUtils.materializationInfoBuilder( aggregateParams.getAggregator(), - aggregate.getProperties().getQueryContext(), + aggregate, aggregateSchema, resultSchema ); @@ -111,7 +111,8 @@ static KTableHolder build( final KTable result = aggregated .transformValues( () -> new KsTransformer<>(aggregator.getResultMapper()), - Named.as(queryBuilder.buildUniqueNodeName(AggregateBuilderUtils.STEP_NAME)) + Named.as(StreamsUtil.buildOpName( + AggregateBuilderUtils.outputContext(aggregate))) ); return KTableHolder.materialized( @@ -171,13 +172,13 @@ static KTableHolder> build( KTable, GenericRow> reduced = aggregated.transformValues( () -> new KsTransformer<>(aggregator.getResultMapper()), - Named.as(queryBuilder.buildUniqueNodeName(AggregateBuilderUtils.STEP_NAME)) + Named.as(StreamsUtil.buildOpName(AggregateBuilderUtils.outputContext(aggregate))) ); final MaterializationInfo.Builder materializationBuilder = AggregateBuilderUtils.materializationInfoBuilder( aggregateParams.getAggregator(), - aggregate.getProperties().getQueryContext(), + aggregate, aggregateSchema, resultSchema ); @@ -186,7 +187,7 @@ static KTableHolder> build( if (windowSelectMapper.hasSelects()) { reduced = reduced.transformValues( () -> new KsTransformer<>(windowSelectMapper.getTransformer()), - Named.as(queryBuilder.buildUniqueNodeName("AGGREGATE-WINDOW-SELECT")) + Named.as(StreamsUtil.buildOpName(AggregateBuilderUtils.windowSelectContext(aggregate))) ); } @@ -221,12 +222,13 @@ private static class WindowedAggregator this.queryBuilder = Objects.requireNonNull(queryBuilder, "queryBuilder"); this.materializedFactory = Objects.requireNonNull(materializedFactory, "materializedFactory"); this.aggregateParams = Objects.requireNonNull(aggregateParams, "aggregateParams"); - this.queryContext = aggregate.getProperties().getQueryContext(); + this.queryContext = AggregateBuilderUtils.materializeContext(aggregate); this.formats = aggregate.getFormats(); final PhysicalSchema physicalSchema = PhysicalSchema.from( aggregateSchema, formats.getOptions() ); + keySerde = queryBuilder.buildKeySerde( formats.getKeyFormat(), physicalSchema, diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamFilterBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamFilterBuilder.java index c4530eaf311f..05cd9216086b 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamFilterBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamFilterBuilder.java @@ -17,7 +17,6 @@ import io.confluent.ksql.GenericRow; import io.confluent.ksql.execution.builder.KsqlQueryBuilder; -import io.confluent.ksql.execution.context.QueryContext; import io.confluent.ksql.execution.context.QueryLoggerUtil; import io.confluent.ksql.execution.plan.KStreamHolder; import io.confluent.ksql.execution.plan.StreamFilter; @@ -49,10 +48,6 @@ static KStreamHolder build( final KsqlQueryBuilder queryBuilder, final SqlPredicateFactory predicateFactory ) { - final QueryContext.Stacker contextStacker = QueryContext.Stacker.of( - step.getProperties().getQueryContext() - ); - final SqlPredicate predicate = predicateFactory.create( step.getFilterExpression(), stream.getSchema(), @@ -66,14 +61,14 @@ static KStreamHolder build( .getLogger( QueryLoggerUtil.queryLoggerName( queryBuilder.getQueryId(), - contextStacker.push(step.getStepName()).getQueryContext() + step.getProperties().getQueryContext() ) ); final KStream filtered = stream.getStream() .flatTransformValues( () -> toFlatMapTransformer(predicate.getTransformer(processingLogger)), - Named.as(queryBuilder.buildUniqueNodeName(step.getStepName())) + Named.as(StreamsUtil.buildOpName(step.getProperties().getQueryContext())) ); return stream.withStream( diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamFlatMapBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamFlatMapBuilder.java index 778d00546bfd..0d220a0e6ab5 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamFlatMapBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamFlatMapBuilder.java @@ -80,7 +80,7 @@ public static KStreamHolder build( final KStream mapped = stream.getStream().flatTransformValues( () -> new KsTransformer<>(new KudtfFlatMapper<>(tableFunctionAppliers)), - Named.as(queryBuilder.buildUniqueNodeName("TABLE-FUNCTIONS-APPLY")) + Named.as(StreamsUtil.buildOpName(step.getProperties().getQueryContext())) ); return stream.withStream( diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilder.java index 445dc692f1f4..c73882166105 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilder.java @@ -36,9 +36,7 @@ public static KStreamHolder build( final StreamMapValues step, final KsqlQueryBuilder queryBuilder ) { - final QueryContext.Stacker contextStacker = QueryContext.Stacker.of( - step.getProperties().getQueryContext() - ); + final QueryContext queryContext = step.getProperties().getQueryContext(); final LogicalSchema sourceSchema = stream.getSchema(); @@ -55,13 +53,11 @@ public static KStreamHolder build( .getProcessingLogContext() .getLoggerFactory() .getLogger( - QueryLoggerUtil.queryLoggerName( - queryBuilder.getQueryId(), - contextStacker.push("PROJECT").getQueryContext() - ) + QueryLoggerUtil.queryLoggerName(queryBuilder.getQueryId(), queryContext) ); - final Named selectName = Named.as(queryBuilder.buildUniqueNodeName(step.getSelectNodeName())); + final Named selectName = + Named.as(StreamsUtil.buildOpName(queryContext)); return stream.withStream( stream.getStream().transformValues( diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilder.java index b4f883354652..71b5be4aa7bc 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilder.java @@ -29,8 +29,8 @@ import org.apache.kafka.streams.kstream.StreamJoined; public final class StreamStreamJoinBuilder { - private static final String LEFT_SERDE_CTX = "left"; - private static final String RIGHT_SERDE_CTX = "right"; + private static final String LEFT_SERDE_CTX = "Left"; + private static final String RIGHT_SERDE_CTX = "Right"; private StreamStreamJoinBuilder() { } diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamTableJoinBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamTableJoinBuilder.java index 530feb10b511..131a3506afae 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamTableJoinBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamTableJoinBuilder.java @@ -29,7 +29,7 @@ import org.apache.kafka.streams.kstream.KStream; public final class StreamTableJoinBuilder { - private static final String SERDE_CTX = "left"; + private static final String SERDE_CTX = "Left"; private StreamTableJoinBuilder() { } diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableAggregateBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableAggregateBuilder.java index 6db55f4ed0c0..357ed6e50936 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableAggregateBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableAggregateBuilder.java @@ -68,7 +68,7 @@ public static KTableHolder build( final LogicalSchema resultSchema = aggregateParams.getSchema(); final Materialized> materialized = AggregateBuilderUtils.buildMaterialized( - aggregate.getProperties().getQueryContext(), + aggregate, aggregateSchema, aggregate.getFormats(), queryBuilder, @@ -81,13 +81,13 @@ public static KTableHolder build( materialized ).transformValues( () -> new KsTransformer<>(aggregateParams.getAggregator().getResultMapper()), - Named.as(queryBuilder.buildUniqueNodeName(AggregateBuilderUtils.STEP_NAME)) + Named.as(StreamsUtil.buildOpName(AggregateBuilderUtils.outputContext(aggregate))) ); final MaterializationInfo.Builder materializationBuilder = AggregateBuilderUtils.materializationInfoBuilder( aggregateParams.getAggregator(), - aggregate.getProperties().getQueryContext(), + aggregate, aggregateSchema, resultSchema ); diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableFilterBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableFilterBuilder.java index 4cc7162e3957..1b4a5940f8bb 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableFilterBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableFilterBuilder.java @@ -29,6 +29,10 @@ import org.apache.kafka.streams.kstream.Named; public final class TableFilterBuilder { + private static final String PRE_PROCESS_OP = "ApplyPredicate"; + private static final String FILTER_OP = "Filter"; + private static final String POST_PROCESS_OP = "PostProcess"; + private TableFilterBuilder() { } @@ -46,10 +50,6 @@ static KTableHolder build( final KsqlQueryBuilder queryBuilder, final SqlPredicateFactory sqlPredicateFactory ) { - final Stacker contextStacker = Stacker.of( - step.getProperties().getQueryContext() - ); - final SqlPredicate predicate = sqlPredicateFactory.create( step.getFilterExpression(), table.getSchema(), @@ -63,22 +63,23 @@ static KTableHolder build( .getLogger( QueryLoggerUtil.queryLoggerName( queryBuilder.getQueryId(), - contextStacker.push(step.getStepName()).getQueryContext() + step.getProperties().getQueryContext() ) ); + final Stacker stacker = Stacker.of(step.getProperties().getQueryContext()); final KTable filtered = table.getTable() .transformValues( () -> new KsTransformer<>(predicate.getTransformer(processingLogger)), - Named.as(queryBuilder.buildUniqueNodeName(step.getStepName() + "-PRE-PROCESS")) + Named.as(StreamsUtil.buildOpName(stacker.push(PRE_PROCESS_OP).getQueryContext())) ) .filter( (k, v) -> v.isPresent(), - Named.as(queryBuilder.buildUniqueNodeName(step.getStepName())) + Named.as(StreamsUtil.buildOpName(stacker.push(FILTER_OP).getQueryContext())) ) .mapValues( Optional::get, - Named.as(queryBuilder.buildUniqueNodeName(step.getStepName() + "-POST-PROCESS")) + Named.as(StreamsUtil.buildOpName(stacker.push(POST_PROCESS_OP).getQueryContext())) ); return table @@ -89,7 +90,7 @@ static KTableHolder build( .withMaterialization( table.getMaterializationBuilder().map(b -> b.filter( predicate::getTransformer, - step.getStepName() + step.getProperties().getQueryContext() )) ); } diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableMapValuesBuilder.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableMapValuesBuilder.java index 7830971ed1c9..839e88b90178 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableMapValuesBuilder.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/TableMapValuesBuilder.java @@ -31,8 +31,6 @@ public final class TableMapValuesBuilder { - private static final String PROJECT_OP_NAME = "PROJECT"; - private TableMapValuesBuilder() { } @@ -42,11 +40,8 @@ public static KTableHolder build( final TableMapValues step, final KsqlQueryBuilder queryBuilder ) { - final QueryContext.Stacker contextStacker = QueryContext.Stacker.of( - step.getProperties().getQueryContext() - ); - final LogicalSchema sourceSchema = table.getSchema(); + final QueryContext queryContext = step.getProperties().getQueryContext(); final Selection selection = Selection.of( sourceSchema, @@ -63,11 +58,11 @@ public static KTableHolder build( .getLogger( QueryLoggerUtil.queryLoggerName( queryBuilder.getQueryId(), - contextStacker.push(PROJECT_OP_NAME).getQueryContext() + queryContext ) ); - final Named selectName = Named.as(queryBuilder.buildUniqueNodeName(step.getSelectNodeName())); + final Named selectName = Named.as(StreamsUtil.buildOpName(queryContext)); return table .withTable( @@ -81,7 +76,7 @@ public static KTableHolder build( table.getMaterializationBuilder().map(b -> b.map( pl -> (KsqlTransformer) selectMapper.getTransformer(pl), selection.getSchema(), - PROJECT_OP_NAME + queryContext )) ); } diff --git a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/materialization/KsqlMaterializationFactory.java b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/materialization/KsqlMaterializationFactory.java index f3ff3620be65..13f928936155 100644 --- a/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/materialization/KsqlMaterializationFactory.java +++ b/ksql-streams/src/main/java/io/confluent/ksql/execution/streams/materialization/KsqlMaterializationFactory.java @@ -120,9 +120,13 @@ public Transform visit( return predicate::transform; } - private ProcessingLogger getLogger(final String stepName) { + private ProcessingLogger getLogger(final QueryContext queryContext) { + QueryContext.Stacker stacker = this.stacker; + for (final String ctx : queryContext.getContext()) { + stacker = stacker.push(ctx); + } return processingLogContext.getLoggerFactory().getLogger( - QueryLoggerUtil.queryLoggerName(queryId, stacker.push(stepName).getQueryContext()) + QueryLoggerUtil.queryLoggerName(queryId, stacker.getQueryContext()) ); } } diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/SourceBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/SourceBuilderTest.java index d10a99408700..830ffbc411fd 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/SourceBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/SourceBuilderTest.java @@ -570,7 +570,7 @@ public void shouldBuildTableWithCorrectStoreName() { tableSource.build(planBuilder); // Then: - verify(materializationFactory).create(keySerde, valueSerde, "base-reduce"); + verify(materializationFactory).create(keySerde, valueSerde, "base-Reduce"); } @SuppressWarnings("unchecked") diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StepSchemaResolverTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StepSchemaResolverTest.java index cf4af38a6449..b2ac747c732f 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StepSchemaResolverTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StepSchemaResolverTest.java @@ -169,8 +169,7 @@ public void shouldResolveSchemaForStreamSelect() { ImmutableList.of( add("JUICE", "ORANGE", "APPLE"), ref("PLANTAIN", "BANANA"), - ref("CITRUS", "ORANGE")), - "foo" + ref("CITRUS", "ORANGE")) ); // When: @@ -216,8 +215,7 @@ public void shouldResolveSchemaForStreamFilter() { final StreamFilter step = new StreamFilter<>( PROPERTIES, streamSource, - mock(Expression.class), - "name" + mock(Expression.class) ); // When: @@ -365,8 +363,7 @@ public void shouldResolveSchemaForTableSelect() { ImmutableList.of( add("JUICE", "ORANGE", "APPLE"), ref("PLANTAIN", "BANANA"), - ref("CITRUS", "ORANGE")), - "foo" + ref("CITRUS", "ORANGE")) ); // When: @@ -388,8 +385,7 @@ public void shouldResolveSchemaForTableFilter() { final TableFilter step = new TableFilter<>( PROPERTIES, tableSource, - mock(Expression.class), - "name" + mock(Expression.class) ); // When: diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamAggregateBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamAggregateBuilderTest.java index 45d54979b0ba..3c9d2a828a25 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamAggregateBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamAggregateBuilderTest.java @@ -132,6 +132,8 @@ public class StreamAggregateBuilderTest { private static final List FUNCTIONS = ImmutableList.of(AGG0, AGG1); private static final QueryContext CTX = new QueryContext.Stacker().push("agg").push("regate").getQueryContext(); + private static final QueryContext MATERIALIZE_CTX = QueryContext.Stacker.of(CTX) + .push("Materialize").getQueryContext(); private static final FormatInfo KEY_FORMAT = FormatInfo.of(Format.KAFKA); private static final FormatInfo VALUE_FORMAT = FormatInfo.of(Format.JSON); private static final Duration WINDOW = Duration.ofMillis(30000); @@ -204,8 +206,6 @@ public void init() { when(queryBuilder.buildKeySerde(any(), any(), any())).thenReturn(keySerde); when(queryBuilder.buildValueSerde(any(), any(), any())).thenReturn(valueSerde); when(queryBuilder.getFunctionRegistry()).thenReturn(functionRegistry); - when(queryBuilder.buildUniqueNodeName(any())) - .thenAnswer(inv -> inv.getArgument(0) + "-unique"); when(aggregateParamsFactory.create(any(), anyInt(), any(), any())) .thenReturn(aggregateParams); when(aggregateParams.getAggregator()).thenReturn((KudafAggregator) aggregator); @@ -367,7 +367,7 @@ public void shouldBuildMaterializedWithCorrectNameForUnwindowedAggregate() { aggregate.build(planBuilder); // Then: - verify(materializedFactory).create(any(), any(), eq("agg-regate")); + verify(materializedFactory).create(any(), any(), eq("agg-regate-Materialize")); } @Test @@ -379,7 +379,7 @@ public void shouldBuildKeySerdeCorrectlyForUnwindowedAggregate() { aggregate.build(planBuilder); // Then: - verify(queryBuilder).buildKeySerde(KEY_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, CTX); + verify(queryBuilder).buildKeySerde(KEY_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, MATERIALIZE_CTX); } @Test @@ -394,7 +394,7 @@ public void shouldBuildValueSerdeCorrectlyForUnwindowedAggregate() { verify(queryBuilder).buildValueSerde( VALUE_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, - CTX + MATERIALIZE_CTX ); } @@ -539,7 +539,7 @@ public void shouldBuildMaterializedWithCorrectNameForWindowedAggregate() { windowedAggregate.build(planBuilder); // Then: - verify(materializedFactory).create(any(), any(), eq("agg-regate")); + verify(materializedFactory).create(any(), any(), eq("agg-regate-Materialize")); } } @@ -555,7 +555,7 @@ public void shouldBuildKeySerdeCorrectlyForWindowedAggregate() { // Then: verify(queryBuilder) - .buildKeySerde(KEY_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, CTX); + .buildKeySerde(KEY_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, MATERIALIZE_CTX); } } @@ -596,7 +596,7 @@ public void shouldBuildValueSerdeCorrectlyForWindowedAggregate() { // Then: verify(queryBuilder) - .buildValueSerde(VALUE_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, CTX); + .buildValueSerde(VALUE_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, MATERIALIZE_CTX); } } @@ -651,7 +651,7 @@ private void assertCorrectMaterializationBuilder(final KTableHolder result) { assertThat(result.getMaterializationBuilder().isPresent(), is(true)); final MaterializationInfo info = result.getMaterializationBuilder().get().build(); - assertThat(info.stateStoreName(), equalTo("agg-regate")); + assertThat(info.stateStoreName(), equalTo("agg-regate-Materialize")); assertThat(info.getSchema(), equalTo(OUTPUT_SCHEMA)); assertThat(info.getStateStoreSchema(), equalTo(AGGREGATE_SCHEMA)); assertThat(info.getTransforms(), hasSize(1)); diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamFilterBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamFilterBuilderTest.java index 5766dbfcb567..92c364933dac 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamFilterBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamFilterBuilderTest.java @@ -89,7 +89,6 @@ public void init() { when(queryBuilder.getKsqlConfig()).thenReturn(ksqlConfig); when(queryBuilder.getFunctionRegistry()).thenReturn(functionRegistry); when(queryBuilder.getProcessingLogContext()).thenReturn(processingLogContext); - when(queryBuilder.buildUniqueNodeName(any())).thenAnswer(inv -> inv.getArgument(0) + "-unique"); when(processingLogContext.getLoggerFactory()).thenReturn(processingLoggerFactory); when(processingLoggerFactory.getLogger(any())).thenReturn(processingLogger); when(sourceStep.getProperties()).thenReturn(sourceProperties); @@ -110,7 +109,7 @@ public void init() { mock(AggregateParamsFactory.class), mock(StreamsFactories.class) ); - step = new StreamFilter<>(properties, sourceStep, filterExpression, "stepName"); + step = new StreamFilter<>(properties, sourceStep, filterExpression); } @Test @@ -152,6 +151,6 @@ public void shouldUseCorrectNameForProcessingLogger() { step.build(planBuilder); // Then: - verify(processingLoggerFactory).getLogger("foo.bar.stepName"); + verify(processingLoggerFactory).getLogger("foo.bar"); } } \ No newline at end of file diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilderTest.java index 55be55b17f69..e9b85f5b5ad3 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamMapValuesBuilderTest.java @@ -79,7 +79,7 @@ public class StreamMapValuesBuilderTest { SelectExpression.of(ColumnName.of("expr2"), EXPRESSION2) ); - private static final String SELECT_STEP_NAME = "StepName"; + private static final String SELECT_STEP_NAME = "foo-bar"; @Mock private ExecutionStep> sourceStep; @@ -110,7 +110,7 @@ public class StreamMapValuesBuilderTest { public final MockitoRule mockitoRule = MockitoJUnit.rule(); private final QueryContext context = - new QueryContext.Stacker().getQueryContext(); + new QueryContext.Stacker().push("foo").push("bar").getQueryContext(); private PlanBuilder planBuilder; private StreamMapValues step; @@ -125,7 +125,6 @@ public void setup() { when(queryBuilder.getFunctionRegistry()).thenReturn(mock(FunctionRegistry.class)); when(queryBuilder.getProcessingLogContext()).thenReturn(processingLogContext); when(queryBuilder.getKsqlConfig()).thenReturn(ksqlConfig); - when(queryBuilder.buildUniqueNodeName(any())).thenAnswer(inv -> inv.getArgument(0) + "-unique"); when( sourceKStream.transformValues(any(ValueTransformerWithKeySupplier.class), any(Named.class))) .thenReturn(resultKStream); @@ -135,8 +134,7 @@ public void setup() { step = new StreamMapValues<>( properties, sourceStep, - SELECT_EXPRESSIONS, - SELECT_STEP_NAME + SELECT_EXPRESSIONS ); planBuilder = new KSPlanBuilder( queryBuilder, @@ -167,9 +165,10 @@ public void shouldBuildKsNodeWithRightName() { nameCaptor.capture() ); - assertThat(NamedTestAccessor.getName(nameCaptor.getValue()), is(SELECT_STEP_NAME + "-unique")); + assertThat(NamedTestAccessor.getName(nameCaptor.getValue()), is(SELECT_STEP_NAME)); } + @Test public void shouldReturnCorrectSchema() { // When: final KStreamHolder result = step.build(planBuilder); @@ -190,6 +189,6 @@ public void shouldBuildSelectValueMapperLoggerCorrectly() { step.build(planBuilder); // Then: - verify(processingLoggerFactory).getLogger("qid.PROJECT"); + verify(processingLoggerFactory).getLogger("qid.foo.bar"); } } diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilderTest.java index 672b896c217d..b79e2efc1f80 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamStreamJoinBuilderTest.java @@ -297,7 +297,7 @@ public void shouldBuildLeftSerdeCorrectly() { join.build(planBuilder); // Then: - final QueryContext leftCtx = QueryContext.Stacker.of(CTX).push("left").getQueryContext(); + final QueryContext leftCtx = QueryContext.Stacker.of(CTX).push("Left").getQueryContext(); verify(queryBuilder).buildValueSerde(FormatInfo.of(Format.JSON), LEFT_PHYSICAL, leftCtx); } @@ -310,7 +310,7 @@ public void shouldBuildRightSerdeCorrectly() { join.build(planBuilder); // Then: - final QueryContext leftCtx = QueryContext.Stacker.of(CTX).push("right").getQueryContext(); + final QueryContext leftCtx = QueryContext.Stacker.of(CTX).push("Right").getQueryContext(); verify(queryBuilder).buildValueSerde(FormatInfo.of(Format.AVRO), RIGHT_PHYSICAL, leftCtx); } } diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamTableJoinBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamTableJoinBuilderTest.java index 73ac93689455..1366287a74d2 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamTableJoinBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/StreamTableJoinBuilderTest.java @@ -264,7 +264,7 @@ public void shouldBuildLeftSerdeCorrectly() { join.build(planBuilder); // Then: - final QueryContext leftCtx = QueryContext.Stacker.of(CTX).push("left").getQueryContext(); + final QueryContext leftCtx = QueryContext.Stacker.of(CTX).push("Left").getQueryContext(); verify(queryBuilder).buildValueSerde(FormatInfo.of(Format.JSON), LEFT_PHYSICAL, leftCtx); } } diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/TableAggregateBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/TableAggregateBuilderTest.java index bbaef31c486d..b81edf93da29 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/TableAggregateBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/TableAggregateBuilderTest.java @@ -104,6 +104,8 @@ public class TableAggregateBuilderTest { private static final List FUNCTIONS = ImmutableList.of(AGG0, AGG1); private static final QueryContext CTX = new QueryContext.Stacker().push("agg").push("regate").getQueryContext(); + private static final QueryContext MATERIALIZE_CTX = QueryContext.Stacker.of(CTX) + .push("Materialize").getQueryContext(); private static final FormatInfo KEY_FORMAT = FormatInfo.of(Format.KAFKA); private static final FormatInfo VALUE_FORMAT = FormatInfo.of(Format.JSON); @@ -151,8 +153,6 @@ public void init() { when(queryBuilder.buildKeySerde(any(), any(), any())).thenReturn(keySerde); when(queryBuilder.buildValueSerde(any(), any(), any())).thenReturn(valueSerde); when(queryBuilder.getFunctionRegistry()).thenReturn(functionRegistry); - when(queryBuilder.buildUniqueNodeName(any())) - .thenAnswer(inv -> inv.getArgument(0) + "-unique"); when(aggregateParamsFactory.createUndoable(any(), anyInt(), any(), any())) .thenReturn(aggregateParams); when(aggregateParams.getAggregator()).thenReturn((KudafAggregator)aggregator); @@ -226,7 +226,7 @@ public void shouldBuildMaterializedWithCorrectNameForAggregate() { aggregate.build(planBuilder); // Then: - verify(materializedFactory).create(any(), any(), eq("agg-regate")); + verify(materializedFactory).create(any(), any(), eq("agg-regate-Materialize")); } @Test @@ -235,7 +235,7 @@ public void shouldBuildKeySerdeCorrectlyForAggregate() { aggregate.build(planBuilder); // Then: - verify(queryBuilder).buildKeySerde(KEY_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, CTX); + verify(queryBuilder).buildKeySerde(KEY_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, MATERIALIZE_CTX); } @Test @@ -247,7 +247,7 @@ public void shouldBuildValueSerdeCorrectlyForAggregate() { verify(queryBuilder).buildValueSerde( VALUE_FORMAT, PHYSICAL_AGGREGATE_SCHEMA, - CTX + MATERIALIZE_CTX ); } @@ -269,7 +269,7 @@ public void shouldBuildMaterializationCorrectlyForAggregate() { assertThat(result.getMaterializationBuilder().isPresent(), is(true)); final MaterializationInfo info = result.getMaterializationBuilder().get().build(); - assertThat(info.stateStoreName(), equalTo("agg-regate")); + assertThat(info.stateStoreName(), equalTo("agg-regate-Materialize")); assertThat(info.getSchema(), equalTo(AGGREGATE_SCHEMA)); assertThat(info.getStateStoreSchema(), equalTo(AGGREGATE_SCHEMA)); assertThat(info.getTransforms(), hasSize(1)); diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/TableFilterBuilderTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/TableFilterBuilderTest.java index 410d821f2c07..497a8052cd3c 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/TableFilterBuilderTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/TableFilterBuilderTest.java @@ -111,7 +111,6 @@ public void init() { when(queryBuilder.getKsqlConfig()).thenReturn(ksqlConfig); when(queryBuilder.getFunctionRegistry()).thenReturn(functionRegistry); when(queryBuilder.getProcessingLogContext()).thenReturn(processingLogContext); - when(queryBuilder.buildUniqueNodeName(any())).thenAnswer(inv -> inv.getArgument(0) + "-unique"); when(processingLogContext.getLoggerFactory()).thenReturn(processingLoggerFactory); when(processingLoggerFactory.getLogger(any())).thenReturn(processingLogger); when(sourceStep.getProperties()).thenReturn(sourceProperties); @@ -122,7 +121,7 @@ public void init() { when(sqlPredicate.getTransformer(any())).thenReturn((KsqlTransformer) preTransformer); when(materializationBuilder.filter(any(), any())).thenReturn(materializationBuilder); final ExecutionStepPropertiesV1 properties = new ExecutionStepPropertiesV1(queryContext); - step = new TableFilter<>(properties, sourceStep, filterExpression, "stepName"); + step = new TableFilter<>(properties, sourceStep, filterExpression); when(sourceStep.build(any())).thenReturn( KTableHolder.materialized(sourceKTable, schema, keySerdeFactory, materializationBuilder)) ; @@ -174,7 +173,7 @@ public void shouldUseCorrectNameForProcessingLogger() { step.build(planBuilder); // Then: - verify(processingLoggerFactory).getLogger("foo.bar.stepName"); + verify(processingLoggerFactory).getLogger("foo.bar"); } @Test @@ -183,7 +182,9 @@ public void shouldFilterMaterialization() { step.build(planBuilder); // Then: - verify(materializationBuilder).filter(predicateFactoryCaptor.capture(), eq("stepName")); + verify(materializationBuilder).filter( + predicateFactoryCaptor.capture(), + eq(queryContext)); // Given: final KsqlTransformer> predicate = predicateFactoryCaptor @@ -209,4 +210,4 @@ public void shouldFilterMaterialization() { // Then: assertThat(result, is(Optional.of(value))); } -} \ No newline at end of file +} diff --git a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/materialization/KsqlMaterializationFactoryTest.java b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/materialization/KsqlMaterializationFactoryTest.java index 9ef5f94a6d0c..28c6b93aab63 100644 --- a/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/materialization/KsqlMaterializationFactoryTest.java +++ b/ksql-streams/src/test/java/io/confluent/ksql/execution/streams/materialization/KsqlMaterializationFactoryTest.java @@ -27,6 +27,7 @@ import com.google.common.testing.NullPointerTester; import com.google.common.testing.NullPointerTester.Visibility; import io.confluent.ksql.GenericRow; +import io.confluent.ksql.execution.context.QueryContext; import io.confluent.ksql.execution.context.QueryContext.Stacker; import io.confluent.ksql.execution.materialization.MaterializationInfo; import io.confluent.ksql.execution.materialization.MaterializationInfo.MapperInfo; @@ -96,7 +97,7 @@ public class KsqlMaterializationFactoryTest { @Mock private KsqlProcessingContext ctx; @Captor - private ArgumentCaptor> loggerCaptor; + private ArgumentCaptor> loggerCaptor; private final QueryId queryId = new QueryId("start"); private final Stacker contextStacker = new Stacker(); @@ -136,21 +137,27 @@ public void shouldThrowNPEs() { @Test public void shouldUseCorrectLoggerForPredicate() { // When: - factory.create(materialization, info, queryId, contextStacker); + factory.create(materialization, info, queryId, new Stacker().push("filter")); // Then: verify(predicateInfo).getPredicate(loggerCaptor.capture()); - assertThat(loggerCaptor.getValue().apply("filter"), is(filterProcessingLogger)); + assertThat( + loggerCaptor.getValue().apply(new Stacker().getQueryContext()), + is(filterProcessingLogger) + ); } @Test public void shouldUseCorrectLoggerForSelectMapper() { // When: - factory.create(materialization, info, queryId, contextStacker); + factory.create(materialization, info, queryId, new Stacker().push("project")); // Then: verify(mapperInfo).getMapper(loggerCaptor.capture()); - assertThat(loggerCaptor.getValue().apply("project"), is(mapProcessingLogger)); + assertThat( + loggerCaptor.getValue().apply(new Stacker().getQueryContext()), + is(mapProcessingLogger) + ); } @Test