Revert CALCITE-5423

JiajunBernoulli · Dec 3, 2023 · a214fe7 · a214fe7
1 parent 3e4a65b
commit a214fe7
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/core/src/main/java/org/apache/calcite/sql2rel/StandardConvertletTable.java b/core/src/main/java/org/apache/calcite/sql2rel/StandardConvertletTable.java
@@ -1992,26 +1992,12 @@ private static class TimestampAddConvertlet implements SqlRexConvertlet {
       //  => timestamp + interval
       // "timestamp" may be of type TIMESTAMP or TIMESTAMP WITH LOCAL TIME ZONE.
       final RexBuilder rexBuilder = cx.getRexBuilder();
-      SqlIntervalQualifier qualifier;
-      final RexNode op1;
-      final RexNode op2;
-      switch (call.operandCount()) {
-      case 2:
-        // BigQuery-style 'TIMESTAMP_ADD(timestamp, interval)'
-        final SqlBasicCall operandCall = call.operand(1);
-        qualifier  = operandCall.operand(1);
-        op1 = cx.convertExpression(operandCall.operand(0));
-        op2 = cx.convertExpression(call.operand(0));
-        break;
-      default:
-        // JDBC-style 'TIMESTAMPADD(unit, count, timestamp)'
-        qualifier = call.operand(0);
-        op1 = cx.convertExpression(call.operand(1));
-        op2 = cx.convertExpression(call.operand(2));
-      }
+      SqlIntervalQualifier qualifier = call.operand(0);
 
       final TimeFrame timeFrame = cx.getValidator().validateTimeFrame(qualifier);
       final TimeUnit unit = first(timeFrame.unit(), TimeUnit.EPOCH);
+      final RexNode op1 = cx.convertExpression(call.operand(1));
+      final RexNode op2 = cx.convertExpression(call.operand(2));
       final RelDataType type = cx.getValidator().getValidatedNodeType(call);
       if (unit == TimeUnit.EPOCH && qualifier.timeFrameName != null) {
         // Custom time frames have a different path. They are kept as names,