From f33f2fe85cd08aa6d8934fe8477fbab617903389 Mon Sep 17 00:00:00 2001 From: Jark Wu Date: Fri, 2 Jun 2017 21:15:55 +0800 Subject: [PATCH 1/2] [FLINK-6816] [table] Fix wrong usage of Scala string interpolation in Table API --- .../main/scala/org/apache/flink/table/expressions/call.scala | 2 +- .../table/runtime/aggregate/ProcTimeBoundedRangeOver.scala | 4 ++-- .../table/runtime/aggregate/ProcTimeBoundedRowsOver.scala | 4 ++-- .../aggregate/ProcTimeUnboundedNonPartitionedOver.scala | 4 ++-- .../runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala | 4 ++-- .../table/runtime/aggregate/RowTimeBoundedRangeOver.scala | 4 ++-- .../table/runtime/aggregate/RowTimeBoundedRowsOver.scala | 4 ++-- .../flink/table/runtime/aggregate/RowTimeUnboundedOver.scala | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala index 13f8a11af770e..bd4fa2f5ad22e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/call.scala @@ -67,7 +67,7 @@ case class Call(functionName: String, args: Seq[Expression]) extends Expression case class UnresolvedOverCall(agg: Expression, alias: Expression) extends Expression { override private[flink] def validateInput() = - ValidationFailure("Over window with alias $alias could not be resolved.") + ValidationFailure(s"Over window with alias $alias could not be resolved.") override private[flink] def resultType = agg.resultType diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala index d50912ccf9021..affce25f19bb6 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala @@ -62,8 +62,8 @@ class ProcTimeBoundedRangeOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: $genAggregations.name \n\n " + - s"Code:\n$genAggregations.code") + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, genAggregations.name, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala index e388c93bf6526..0c071b59e7832 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala @@ -67,8 +67,8 @@ class ProcTimeBoundedRowsOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: $genAggregations.name \n\n " + - s"Code:\n$genAggregations.code") + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, genAggregations.name, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala index 2a6c9c85f95ba..2e7154f8a7be7 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala @@ -52,8 +52,8 @@ class ProcTimeUnboundedNonPartitionedOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: $genAggregations.name \n\n " + - s"Code:\n$genAggregations.code") + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, genAggregations.name, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala index 97f0ad78fdc79..c5231130fdf38 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala @@ -48,8 +48,8 @@ class ProcTimeUnboundedPartitionedOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: $genAggregations.name \n\n " + - s"Code:\n$genAggregations.code") + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, genAggregations.name, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala index 65edf6d662fd8..c3243c3d1c019 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala @@ -68,8 +68,8 @@ class RowTimeBoundedRangeOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: $genAggregations.name \n\n " + - s"Code:\n$genAggregations.code") + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, genAggregations.name, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala index 395ae3986076a..ed8504ac99454 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala @@ -73,8 +73,8 @@ class RowTimeBoundedRowsOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: $genAggregations.name \n\n " + - s"Code:\n$genAggregations.code") + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, genAggregations.name, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala index 741d2b48fea53..893b82337ae9b 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala @@ -61,8 +61,8 @@ abstract class RowTimeUnboundedOver( protected var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: $genAggregations.name \n\n " + - s"Code:\n$genAggregations.code") + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, genAggregations.name, From 14ece2fbdcdf6543aea0d8c2ab0f42507b5a6780 Mon Sep 17 00:00:00 2001 From: Jark Wu Date: Sun, 4 Jun 2017 00:02:15 +0800 Subject: [PATCH 2/2] minor fix --- .../table/runtime/aggregate/ProcTimeBoundedRangeOver.scala | 2 +- .../flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala | 2 +- .../runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala | 2 +- .../runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala | 2 +- .../flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala | 2 +- .../flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala | 2 +- .../flink/table/runtime/aggregate/RowTimeUnboundedOver.scala | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala index affce25f19bb6..8f2ec98a51c03 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRangeOver.scala @@ -62,7 +62,7 @@ class ProcTimeBoundedRangeOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n" + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala index 0c071b59e7832..ccc4b461e291e 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeBoundedRowsOver.scala @@ -67,7 +67,7 @@ class ProcTimeBoundedRowsOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n" + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala index 2e7154f8a7be7..f86bed2545ae3 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedNonPartitionedOver.scala @@ -52,7 +52,7 @@ class ProcTimeUnboundedNonPartitionedOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n" + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala index c5231130fdf38..ad43d944e2c8f 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/ProcTimeUnboundedPartitionedOver.scala @@ -48,7 +48,7 @@ class ProcTimeUnboundedPartitionedOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n" + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala index c3243c3d1c019..1a207bbb3a2b5 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRangeOver.scala @@ -68,7 +68,7 @@ class RowTimeBoundedRangeOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n" + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala index ed8504ac99454..a4b1076c514d6 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeBoundedRowsOver.scala @@ -73,7 +73,7 @@ class RowTimeBoundedRowsOver( private var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n" + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader, diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala index 893b82337ae9b..f38ba93794e94 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/RowTimeUnboundedOver.scala @@ -61,7 +61,7 @@ abstract class RowTimeUnboundedOver( protected var function: GeneratedAggregations = _ override def open(config: Configuration) { - LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n " + + LOG.debug(s"Compiling AggregateHelper: ${genAggregations.name} \n\n" + s"Code:\n${genAggregations.code}") val clazz = compile( getRuntimeContext.getUserCodeClassLoader,