chore: victorias comments

confluentinc · Nov 5, 2020 · 3362d09 · 3362d09
1 parent 20d2c78
commit 3362d09
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/ksqldb-engine/src/main/java/io/confluent/ksql/planner/plan/FinalProjectNode.java b/ksqldb-engine/src/main/java/io/confluent/ksql/planner/plan/FinalProjectNode.java
@@ -72,7 +72,7 @@ public FinalProjectNode(
     this.schema = result.left;
     this.selectExpressions = ImmutableList.copyOf(result.right);
 
-    validate();
+    throwOnEmptyValueOrUnknownColumns();
   }
 
   @Override
@@ -107,7 +107,7 @@ private Pair<LogicalSchema, List<SelectExpression>> build(final MetaStore metaSt
         SelectionUtil.buildProjectionSchema(parentSchema, selectExpressions, metaStore);
 
     if (into.isPresent()) {
-      // Persistent queries have key columns as key columns - so final projection can exclude them:
+      // Persistent queries have key columns as value columns - final projection can exclude them:
       final Map<ColumnName, Set<ColumnName>> seenKeyColumns = new HashMap<>();
       selectExpressions.removeIf(se -> {
         if (se.getExpression() instanceof UnqualifiedColumnReferenceExp) {
@@ -162,7 +162,7 @@ private Pair<LogicalSchema, List<SelectExpression>> build(final MetaStore metaSt
     return Pair.of(nodeSchema, selectExpressions);
   }
 
-  private void validate() {
+  private void throwOnEmptyValueOrUnknownColumns() {
     final LogicalSchema schema = getSchema();
 
     if (schema.value().isEmpty()) {

diff --git a/ksqldb-functional-tests/src/test/resources/query-validation-tests/multi-col-keys.json b/ksqldb-functional-tests/src/test/resources/query-validation-tests/multi-col-keys.json
@@ -303,7 +303,7 @@
       }
     },
     {
-      "name": "nested struct key",
+      "name": "struct as column in multi-column key",
       "properties": {
         "ksql.key.format.enabled": true
       },
@@ -366,6 +366,20 @@
         "type": "io.confluent.ksql.util.KsqlStatementException",
         "message": "Cannot repartition a TABLE source. If this is a join, joins on tables with multiple columns is not yet supported."
       }
+    },
+    {
+      "name": "multi-column partition",
+      "properties": {
+        "ksql.key.format.enabled": true
+      },
+      "statements": [
+        "CREATE STREAM S (K STRING KEY, ID VARCHAR) WITH (kafka_topic='S', format='JSON');",
+        "CREATE STREAM OUTPUT as SELECT * FROM S PARTITION BY K, ID;"
+      ],
+      "expectedException": {
+        "type": "io.confluent.ksql.parser.exception.ParseFailedException",
+        "message": "mismatched input ',' expecting ';'"
+      }
     }
   ]
 }
diff --git a/ksqldb-streams/src/test/java/io/confluent/ksql/execution/streams/SourceBuilderTest.java b/ksqldb-streams/src/test/java/io/confluent/ksql/execution/streams/SourceBuilderTest.java
@@ -560,7 +560,7 @@ public void shouldHandleEmptyKey() {
   }
 
   @Test
-  public void shouldHandleMultiField() {
+  public void shouldHandleMultiKeyField() {
     // Given:
     givenMultiColumnSourceStream();
     final ValueTransformerWithKey<Struct, GenericRow, GenericRow> transformer =
@@ -576,7 +576,7 @@ public void shouldHandleMultiField() {
   }
 
   @Test
-  public void shouldHandleMultiFieldWithNullCol() {
+  public void shouldHandleMultiKeyFieldWithNullCol() {
     // Given:
     givenMultiColumnSourceStream();
     final ValueTransformerWithKey<Struct, GenericRow, GenericRow> transformer =
@@ -592,7 +592,7 @@ public void shouldHandleMultiFieldWithNullCol() {
   }
 
   @Test
-  public void shouldHandleMultiFieldEmptyStruct() {
+  public void shouldHandleMultiKeyFieldEmptyStruct() {
     // Given:
     givenMultiColumnSourceStream();
     final ValueTransformerWithKey<Struct, GenericRow, GenericRow> transformer =
@@ -608,7 +608,7 @@ public void shouldHandleMultiFieldEmptyStruct() {
   }
 
   @Test
-  public void shouldHandleMultiFieldEntirelyNull() {
+  public void shouldHandleMultiKeyFieldEntirelyNull() {
     // Given:
     givenMultiColumnSourceStream();
     final ValueTransformerWithKey<Struct, GenericRow, GenericRow> transformer =
@@ -849,20 +849,6 @@ private void givenWindowedSourceTable() {
     );
   }
 
-  private void givenWindowedMultiKeySourceTable() {
-    when(queryBuilder.buildKeySerde(any(), any(), any(), any())).thenReturn(windowedKeySerde);
-    givenConsumed(consumedWindowed, windowedKeySerde);
-    givenConsumed(consumedWindowed, windowedKeySerde);
-    windowedTableSource = new WindowedTableSource(
-        new ExecutionStepPropertiesV1(ctx),
-        TOPIC_NAME,
-        Formats.of(keyFormatInfo, valueFormatInfo, KEY_FEATURES, VALUE_FEATURES),
-        windowInfo,
-        TIMESTAMP_COLUMN,
-        MULTI_COL_SOURCE_SCHEMA
-    );
-  }
-
   private void givenUnwindowedSourceTable(final Boolean forceChangelog) {
     when(queryBuilder.buildKeySerde(any(), any(), any())).thenReturn(keySerde);
     givenConsumed(consumed, keySerde);