[CALCITE-4409] Improve exception when RelBuilder tries to create a fi…

…eld on a non-struct expression
apache · Nov 25, 2020 · 0ad1bc4 · 0ad1bc4
1 parent 367181d
commit 0ad1bc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java
@@ -80,8 +80,8 @@ protected RelDataTypeImpl() {
   @Override public RelDataTypeField getField(String fieldName, boolean caseSensitive,
       boolean elideRecord) {
     if (fieldList == null) {
-      throw new IllegalStateException("The current type " + this
-          + " does not support named field lookup, so field " + fieldName + " cannot be located");
+      throw new IllegalStateException("Trying to access field " + fieldName
+          + " in a type with no fields: " + this);
     }
     for (RelDataTypeField field : fieldList) {
       if (Util.matches(caseSensitive, field.getName(), fieldName)) {

diff --git a/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java b/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
@@ -2589,8 +2589,8 @@ private RelNode buildRelWithDuplicateAggregates(
           .build();
     }, "Field should fail since we are trying access a field on expression with non-struct type");
     assertThat(ex.getMessage(),
-        allOf(containsString("The current type"),
-            containsString("does not support named field lookup")));
+        allOf(containsString("Trying to access field"),
+            containsString("in a type with no fields")));
   }
 
   @Test void testMultiLevelAlias() {