Port Calcite-5965

snuyanzin · Sep 11, 2024 · 613c448 · 613c448
1 parent 63e596f
commit 613c448
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/calcite/rex/RexFieldAccess.java b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/rex/RexFieldAccess.java
@@ -49,6 +49,12 @@
  *     AND gender = 'F')</pre>
  *
  * </blockquote>
+ *
+ * <p>FLINK modifications are at lines
+ *
+ * <ol>
+ *   <li>Should be removed after fixing CALCITE-6342 (Calcite 1.36.0): Lines 84-89
+ * </ol>
  */
 public class RexFieldAccess extends RexNode {
     // ~ Instance fields --------------------------------------------------------
@@ -74,7 +80,11 @@ private static void checkValid(RexNode expr, RelDataTypeField field) {
                 fieldIdx >= 0
                         && fieldIdx < exprType.getFieldList().size()
                         && exprType.getFieldList().get(fieldIdx).equals(field),
-                "Field " + field + " does not exist for expression " + expr);
+                // FLINK MODIFICATION BEGIN
+                "Field %s does not exist for expression %s",
+                field,
+                expr);
+        // FLINK MODIFICATION END
     }
 
     public RelDataTypeField getField() {