fix: andys comments

confluentinc · Jan 17, 2020 · 79dff2f · 79dff2f
1 parent 911761a
commit 79dff2f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/ksql-execution/src/main/java/io/confluent/ksql/execution/util/ExpressionTypeManager.java b/ksql-execution/src/main/java/io/confluent/ksql/execution/util/ExpressionTypeManager.java
@@ -358,7 +358,7 @@ public Void visitCreateArrayExpression(
       if (sqlTypes.size() == 0) {
         throw new KsqlException("Cannot construct an array with all NULL elements "
             + "(see https://github.com/confluentinc/ksql/issues/4239). As a workaround, you may "
-            + "cast the NULL value to a desired type.");
+            + "cast a NULL value to the desired type.");
       }
 
       if (new HashSet<>(sqlTypes).size() != 1) {
@@ -383,7 +383,7 @@ public Void visitCreateMapExpression(
             + "value pair (see https://github.com/confluentinc/ksql/issues/4239).");
       }
 
-      final List<SqlType> gkeyTypes = exp.getMap()
+      final List<SqlType> keyTypes = exp.getMap()
           .keySet()
           .stream()
           .map(key -> {
@@ -392,11 +392,11 @@ public Void visitCreateMapExpression(
           })
           .collect(Collectors.toList());
 
-      if (gkeyTypes.stream().anyMatch(type -> !SqlTypes.STRING.equals(type))) {
-        throw new KsqlException("Only STRING keys are supported in maps but got: " + gkeyTypes);
+      if (keyTypes.stream().anyMatch(type -> !SqlTypes.STRING.equals(type))) {
+        throw new KsqlException("Only STRING keys are supported in maps but got: " + keyTypes);
       }
 
-      final List<SqlType> sqlTypes = exp.getMap()
+      final List<SqlType> valueTypes = exp.getMap()
           .values()
           .stream()
           .map(val -> {
@@ -406,19 +406,20 @@ public Void visitCreateMapExpression(
           .distinct()
           .collect(Collectors.toList());
 
-      if (sqlTypes.size() != 1) {
+      if (valueTypes.size() != 1) {
         throw new KsqlException(
             String.format(
                 "Cannot construct a map with mismatching value types (%s) from expression %s.",
-                sqlTypes,
+                valueTypes,
                 exp));
       }
 
-      if (sqlTypes.get(0) == null) {
-        throw new KsqlException("Cannot construct a map with NULL values.");
+      if (valueTypes.get(0) == null) {
+        throw new KsqlException("Cannot construct MAP with NULL values. As a workaround, you "
+            + "may cast a NULL value to the desired type.");
       }
 
-      context.setSqlType(SqlMap.of(sqlTypes.get(0)));
+      context.setSqlType(SqlMap.of(valueTypes.get(0)));
       return null;
     }
 

diff --git a/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ExpressionTypeManagerTest.java b/ksql-execution/src/test/java/io/confluent/ksql/execution/util/ExpressionTypeManagerTest.java
@@ -455,7 +455,7 @@ public void shouldThrowOnMapOfNullValues() {
 
     // Expect
     expectedException.expect(KsqlException.class);
-    expectedException.expectMessage("Cannot construct a map with NULL values");
+    expectedException.expectMessage("Cannot construct MAP with NULL values");
 
     // When:
     expressionTypeManager.getExpressionSqlType(expression);

diff --git a/...urces/query-validation-tests/asarray.json → .../query-validation-tests/create_array.json b/...urces/query-validation-tests/asarray.json → .../query-validation-tests/create_array.json
@@ -50,7 +50,7 @@
       ],
       "expectedException": {
         "type": "io.confluent.ksql.util.KsqlException",
-        "message": "Cannot construct an array with all NULL elements (see https://github.com/confluentinc/ksql/issues/4239). As a workaround, you may cast the NULL value to a desired type."
+        "message": "Cannot construct an array with all NULL elements (see https://github.com/confluentinc/ksql/issues/4239). As a workaround, you may cast a NULL value to the desired type."
       }
     },
     {

diff --git a/...sources/query-validation-tests/asmap.json → ...es/query-validation-tests/create_map.json b/...sources/query-validation-tests/asmap.json → ...es/query-validation-tests/create_map.json
diff --git a/ksql-functional-tests/src/test/resources/rest-query-validation-tests/insert-values.json b/ksql-functional-tests/src/test/resources/rest-query-validation-tests/insert-values.json
@@ -237,7 +237,7 @@
     {
       "name": "should handle arbitrary nested expressions",
       "statements": [
-        "CREATE STREAM TEST (I INT, A ARRAY<ARRAY<INT>>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE STREAM TEST (I INT, A ARRAY<ARRAY<BIGINT>>) WITH (kafka_topic='test_topic', value_format='JSON');",
         "INSERT INTO TEST (I, A) VALUES (-1, ARRAY[ARRAY[1]]);"
       ],
       "inputs": [
@@ -249,7 +249,7 @@
     {
       "name": "should handle map expressions",
       "statements": [
-        "CREATE STREAM TEST (I INT, A MAP<VARCHAR, INT>) WITH (kafka_topic='test_topic', value_format='JSON');",
+        "CREATE STREAM TEST (I INT, A MAP<VARCHAR, BIGINT>) WITH (kafka_topic='test_topic', value_format='JSON');",
         "INSERT INTO TEST (I, A) VALUES (-1, MAP('a':=0, 'b':=1));"
       ],
       "inputs": [