[calcite] branch master updated: [CALCITE-4217] Unlock RelCrossType#getFieldCount()

[vladimirsitnikov]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/master by this push:
     new 86b42f3  [CALCITE-4217] Unlock RelCrossType#getFieldCount()
86b42f3 is described below

commit 86b42f34e64e63ef923c842bf5089b6e2733ba2d
Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com>
AuthorDate: Wed Sep 2 23:03:45 2020 +0300

    [CALCITE-4217] Unlock RelCrossType#getFieldCount()
---
 core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java    | 4 ----
 core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java | 5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java 
b/core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java
index 8e22fde..6af0d96 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelCrossType.java
@@ -57,10 +57,6 @@ public class RelCrossType extends RelDataTypeImpl {
     return false;
   }
 
-  @Override public List<RelDataTypeField> getFieldList() {
-    return fieldList;
-  }
-
   protected void generateTypeString(StringBuilder sb, boolean withDetail) {
     sb.append("CrossType(");
     for (Ord<RelDataType> type : Ord.zip(types)) {
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
index 5e33d3e..1fb29b8 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java
@@ -143,16 +143,17 @@ public abstract class RelDataTypeImpl
   }
 
   public List<RelDataTypeField> getFieldList() {
-    assert isStruct();
+    assert fieldList != null : "fieldList must not be null, type = " + this;
     return fieldList;
   }
 
   public List<String> getFieldNames() {
+    assert fieldList != null : "fieldList must not be null, type = " + this;
     return Pair.left(fieldList);
   }
 
   public int getFieldCount() {
-    assert isStruct() : this;
+    assert fieldList != null : "fieldList must not be null, type = " + this;
     return fieldList.size();
   }