vlsi commented on a change in pull request #2224:
URL: https://github.com/apache/calcite/pull/2224#discussion_r507519887
##########
File path: core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
##########
@@ -2199,13 +2199,49 @@ public static boolean equal(
RelDataType type2,
Litmus litmus) {
if (!areRowTypesEqual(type1, type2, false)) {
- return litmus.fail("Type mismatch:\n{}:\n{}\n{}:\n{}",
+ return litmus.fail("Type mismatch:\n{}:\n{}\n{}:\n{}\ndifference:\n{}",
desc1, type1.getFullTypeString(),
- desc2, type2.getFullTypeString());
+ desc2, type2.getFullTypeString(),
+ getFullTypeDifferenceString(type1, type2));
}
return litmus.succeed();
}
+ public static String getFullTypeDifferenceString(RelDataType other,
+ RelDataType another) {
+ if (other == another) {
+ return "";
+ }
+
+ if (other.getFieldCount() != another.getFieldCount()) {
+ return "Type mismatch: the field size is not equal,"
+ + " one is " + other.getFieldCount()
+ + ", another one is " + another.getFieldCount();
+ }
+
+ final StringBuilder stringBuilder = new StringBuilder("Type mismatch: \n");
+ final List<RelDataTypeField> f1 = other.getFieldList();
+ final List<RelDataTypeField> f2 = another.getFieldList();
+ for (Pair<RelDataTypeField, RelDataTypeField> pair : Pair.zip(f1, f2)) {
+ final RelDataType type1 = pair.left.getType();
+ final RelDataType type2 = pair.right.getType();
+ // If one of the types is ANY comparison should succeed
+ if (type1.getSqlTypeName() == SqlTypeName.ANY
+ || type2.getSqlTypeName() == SqlTypeName.ANY) {
Review comment:
Do you think the method could take a lambda for the equivalence rather
than baking the logic here?
I think we should use reuse the comparison rather than duplicate logic.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
