[flink] branch master updated: [FLINK-25474][table-planner] Fix Idea Scala plugin can not compile RexExplainUtil

[go...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new bd11bbc  [FLINK-25474][table-planner] Fix Idea Scala plugin can not compile RexExplainUtil
bd11bbc is described below

commit bd11bbc8073ac3a8decc6f4cb171b27855d821e5
Author: godfrey he <go...@163.com>
AuthorDate: Wed Dec 29 21:44:59 2021 +0800

    [FLINK-25474][table-planner] Fix Idea Scala plugin can not compile RexExplainUtil
    
    This closes #18226
---
 .../org/apache/flink/table/planner/plan/utils/FlinkRexUtil.scala | 6 ++++--
 .../apache/flink/table/planner/plan/utils/RelExplainUtil.scala   | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/FlinkRexUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/FlinkRexUtil.scala
index 8829282..5248bce 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/FlinkRexUtil.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/FlinkRexUtil.scala
@@ -21,8 +21,9 @@ import org.apache.flink.annotation.Experimental
 import org.apache.flink.configuration.ConfigOption
 import org.apache.flink.configuration.ConfigOptions.key
 import org.apache.flink.table.planner.JList
-import org.apache.flink.table.planner.plan.utils.ExpressionFormat.ExpressionFormat
 import org.apache.flink.table.planner.plan.utils.ExpressionDetail.ExpressionDetail
+import org.apache.flink.table.planner.plan.utils.ExpressionFormat.ExpressionFormat
+
 import com.google.common.base.Function
 import com.google.common.collect.{ImmutableList, Lists}
 import org.apache.calcite.avatica.util.ByteString
@@ -30,8 +31,8 @@ import org.apache.calcite.plan.{RelOptPredicateList, RelOptUtil}
 import org.apache.calcite.rel.`type`.RelDataType
 import org.apache.calcite.rex._
 import org.apache.calcite.sql.`type`.SqlTypeName
-import org.apache.calcite.sql.fun.{SqlCastFunction, SqlStdOperatorTable}
 import org.apache.calcite.sql.fun.SqlStdOperatorTable._
+import org.apache.calcite.sql.fun.{SqlCastFunction, SqlStdOperatorTable}
 import org.apache.calcite.sql.{SqlAsOperator, SqlKind, SqlOperator}
 import org.apache.calcite.util.{ControlFlowException, DateString, ImmutableBitSet, NlsString, Sarg, TimeString, TimestampString, Util}
 
@@ -39,6 +40,7 @@ import java.lang.{Iterable => JIterable}
 import java.math.BigDecimal
 import java.util
 import java.util.function.Predicate
+
 import scala.collection.JavaConversions._
 import scala.collection.mutable
 
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/RelExplainUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/RelExplainUtil.scala
index c1b0f97..2877360 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/RelExplainUtil.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/RelExplainUtil.scala
@@ -21,8 +21,8 @@ import org.apache.flink.table.api.TableException
 import org.apache.flink.table.functions.{AggregateFunction, UserDefinedFunction}
 import org.apache.flink.table.planner.CalcitePair
 import org.apache.flink.table.planner.functions.aggfunctions.DeclarativeAggregateFunction
-import org.apache.flink.table.planner.plan.utils.ExpressionFormat.ExpressionFormat
 import org.apache.flink.table.planner.plan.utils.ExpressionDetail.ExpressionDetail
+import org.apache.flink.table.planner.plan.utils.ExpressionFormat.ExpressionFormat
 import org.apache.flink.table.runtime.groupwindow.NamedWindowProperty
 
 import com.google.common.collect.ImmutableMap
@@ -32,8 +32,8 @@ import org.apache.calcite.rel.core.{AggregateCall, Window}
 import org.apache.calcite.rel.hint.RelHint
 import org.apache.calcite.rel.{RelCollation, RelWriter}
 import org.apache.calcite.rex._
-import org.apache.calcite.sql.{SqlExplainLevel, SqlKind}
 import org.apache.calcite.sql.SqlMatchRecognize.AfterOption
+import org.apache.calcite.sql.{SqlExplainLevel, SqlKind}
 
 import java.util
 import java.util.{SortedSet => JSortedSet}
@@ -510,7 +510,7 @@ object RelExplainUtil {
     val outputFieldNames = outputRowType.getFieldNames
 
     val aggStrings = namedAggregates.map(_.getKey).map(
-      a => s"${a.getAggregation}(${
+      a => s"""${a.getAggregation}(${
         val prefix = if (a.isDistinct) {
           "DISTINCT "
         } else {
@@ -530,7 +530,8 @@ object RelExplainUtil {
         } else {
           "*"
         })
-      })")
+      })""".stripMargin
+    )
 
     val output = if (outputInputName) inputFieldNames ++ aggStrings else aggStrings
     output.zip(outputFieldNames.drop(rowTypeOffset)).map {