You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ja...@apache.org on 2019/07/25 08:51:40 UTC
[flink] branch master updated: [FLINK-13353][table-planner] Remove
2 args constructor in REPLACE expression
This is an automated email from the ASF dual-hosted git repository.
jark 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 817da8a [FLINK-13353][table-planner] Remove 2 args constructor in REPLACE expression
817da8a is described below
commit 817da8a87b8d6171666b3cbfa5f2d68965765bb2
Author: LouisXu <xu...@163.com>
AuthorDate: Wed Jul 24 19:46:11 2019 +0800
[FLINK-13353][table-planner] Remove 2 args constructor in REPLACE expression
This closes #9218
---
.../table/planner/expressions/PlannerExpressionConverter.scala | 8 ++------
.../flink/table/planner/expressions/stringExpressions.scala | 2 --
.../flink/table/expressions/PlannerExpressionConverter.scala | 8 ++------
.../org/apache/flink/table/expressions/stringExpressions.scala | 2 --
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/expressions/PlannerExpressionConverter.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/expressions/PlannerExpressionConverter.scala
index 020e5cd..9b9fd36 100644
--- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/expressions/PlannerExpressionConverter.scala
+++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/expressions/PlannerExpressionConverter.scala
@@ -304,12 +304,8 @@ class PlannerExpressionConverter private extends ApiExpressionVisitor[PlannerExp
}
case REPLACE =>
- assert(args.size == 2 || args.size == 3)
- if (args.size == 2) {
- new Replace(args.head, args.last)
- } else {
- Replace(args.head, args(1), args.last)
- }
+ assert(args.size == 3)
+ Replace(args.head, args(1), args.last)
case TRIM =>
assert(args.size == 4)
diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/expressions/stringExpressions.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/expressions/stringExpressions.scala
index a24e2d8..a1d3b31 100644
--- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/expressions/stringExpressions.scala
+++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/planner/expressions/stringExpressions.scala
@@ -476,8 +476,6 @@ case class Replace(
search: PlannerExpression,
replacement: PlannerExpression) extends PlannerExpression with InputTypeSpec {
- def this(str: PlannerExpression, begin: PlannerExpression) = this(str, begin, CharLength(str))
-
override private[flink] def children: Seq[PlannerExpression] = str :: search :: replacement :: Nil
override private[flink] def resultType: TypeInformation[_] = STRING_TYPE_INFO
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/PlannerExpressionConverter.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/PlannerExpressionConverter.scala
index 5684594..5d89de9 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/PlannerExpressionConverter.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/PlannerExpressionConverter.scala
@@ -285,12 +285,8 @@ class PlannerExpressionConverter private extends ApiExpressionVisitor[PlannerExp
}
case REPLACE =>
- assert(args.size == 2 || args.size == 3)
- if (args.size == 2) {
- new Replace(args.head, args.last)
- } else {
- Replace(args.head, args(1), args.last)
- }
+ assert(args.size == 3)
+ Replace(args.head, args(1), args.last)
case TRIM =>
assert(args.size == 4)
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala
index d5e3232..81983a4 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/expressions/stringExpressions.scala
@@ -569,8 +569,6 @@ case class Replace(
search: PlannerExpression,
replacement: PlannerExpression) extends PlannerExpression with InputTypeSpec {
- def this(str: PlannerExpression, begin: PlannerExpression) = this(str, begin, CharLength(str))
-
override private[flink] def children: Seq[PlannerExpression] = str :: search :: replacement :: Nil
override private[flink] def resultType: TypeInformation[_] = STRING_TYPE_INFO