This is an automated email from the ASF dual-hosted git repository.
lincoln pushed a commit to branch release-1.18
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.18 by this push:
new e9566267639 [FLINK-32824][table] Port CALCITE-1898 to fix the sql LIKE
operator which must match '.' (period) literally
e9566267639 is described below
commit e9566267639a33adfd6ced6df0c44d19f435366d
Author: XuShuai <[email protected]>
AuthorDate: Tue Aug 29 11:52:45 2023 +0800
[FLINK-32824][table] Port CALCITE-1898 to fix the sql LIKE operator which
must match '.' (period) literally
This closes #23312
---
.../apache/flink/table/functions/SqlLikeUtils.java | 2 +-
.../planner/calcite/FlinkSqlLikeUtilsTest.java | 40 ++++++++++++++++++++++
.../flink/table/api/TableEnvironmentTest.scala | 30 ++++++++++++++++
.../planner/runtime/batch/sql/CalcITCase.scala | 35 +++++++++++++++++++
4 files changed, 106 insertions(+), 1 deletion(-)
diff --git
a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/functions/SqlLikeUtils.java
b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/functions/SqlLikeUtils.java
index 999704973d9..1860dd0c59d 100644
---
a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/functions/SqlLikeUtils.java
+++
b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/functions/SqlLikeUtils.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
* <p>Note: THIS IS COPIED FROM CALCITE to EXPOSE SOME PRIVATE METHOD
*/
public class SqlLikeUtils {
- private static final String JAVA_REGEX_SPECIALS = "[]()|^-+*?{}$\\";
+ private static final String JAVA_REGEX_SPECIALS = "[]()|^-+*?{}$\\.";
private static final String SQL_SIMILAR_SPECIALS = "[]()|^-+*_%?{}";
private static final String[] REG_CHAR_CLASSES = {
"[:ALPHA:]", "\\p{Alpha}",
diff --git
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/calcite/FlinkSqlLikeUtilsTest.java
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/calcite/FlinkSqlLikeUtilsTest.java
new file mode 100644
index 00000000000..39772813043
--- /dev/null
+++
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/calcite/FlinkSqlLikeUtilsTest.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.table.planner.calcite;
+
+import org.apache.flink.table.functions.SqlLikeUtils;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Test for the SqlLikeUtils. */
+public class FlinkSqlLikeUtilsTest {
+ @Test
+ public void testSqlLike() {
+ assertThat(SqlLikeUtils.like("abc", "a.c", "\\")).isEqualTo(false);
+ assertThat(SqlLikeUtils.like("a.c", "a.c", "\\")).isEqualTo(true);
+ assertThat(SqlLikeUtils.like("abcd", "a.*d", "\\")).isEqualTo(false);
+ assertThat(SqlLikeUtils.like("abcde", "%c.e", "\\")).isEqualTo(false);
+
+ assertThat(SqlLikeUtils.similar("abc", "a.c", "\\")).isEqualTo(true);
+ assertThat(SqlLikeUtils.similar("a.c", "a.c", "\\")).isEqualTo(true);
+ assertThat(SqlLikeUtils.similar("abcd", "a.*d", "\\")).isEqualTo(true);
+ }
+}
diff --git
a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
index 92d247e9a0f..76fbbe8c3fd 100644
---
a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
+++
b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/TableEnvironmentTest.scala
@@ -2859,6 +2859,36 @@ class TableEnvironmentTest {
checkData(expectedResult.iterator(), tableResult.collect())
}
+ @Test
+ def testShowColumnsWithLike(): Unit = {
+ val createTableStmt =
+ """
+ |CREATE TABLE TestTb1 (
+ | abc bigint,
+ | b int,
+ | c varchar
+ |) with (
+ | 'connector' = 'COLLECTION',
+ | 'is-bounded' = 'false'
+ |)
+ """.stripMargin
+ tableEnv.executeSql(createTableStmt)
+
+ var sql = "SHOW COLUMNS from TestTb1 LIKE 'abc'"
+ var tableResult = tableEnv.executeSql(sql)
+
+ val expectedResult = util.Arrays.asList(
+ Row.of("abc", "BIGINT", Boolean.box(true), null, null, null)
+ )
+
+ checkData(expectedResult.iterator(), tableResult.collect())
+
+ sql = "SHOW COLUMNS from TestTb1 LIKE 'a.c'"
+ tableResult = tableEnv.executeSql(sql)
+
+ checkData(Collections.emptyList().iterator(), tableResult.collect());
+ }
+
private def checkData(expected: util.Iterator[Row], actual:
util.Iterator[Row]): Unit = {
while (expected.hasNext && actual.hasNext) {
assertEquals(expected.next(), actual.next())
diff --git
a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/CalcITCase.scala
b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/CalcITCase.scala
index ddfc2afa61b..78ce1240b5d 100644
---
a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/CalcITCase.scala
+++
b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/CalcITCase.scala
@@ -416,6 +416,41 @@ class CalcITCase extends BatchTestBase {
row(3, 2L, "Hello world"),
row(4, 3L, "Hello world, how are you?")
))
+
+ val rows = Seq(row(3, "H.llo"), row(3, "Hello"))
+ val dataId = TestValuesTableFactory.registerData(rows)
+
+ val ddl =
+ s"""
+ |CREATE TABLE MyTable (
+ | a int,
+ | c string
+ |) WITH (
+ | 'connector' = 'values',
+ | 'data-id' = '$dataId',
+ | 'bounded' = 'true'
+ |)
+ |""".stripMargin
+ tEnv.executeSql(ddl)
+
+ checkResult(
+ s"""
+ |SELECT c FROM MyTable
+ | WHERE c LIKE 'H.llo'
+ |""".stripMargin,
+ Seq(row("H.llo"))
+ )
+ checkResult(
+ s"""
+ |SELECT c FROM MyTable
+ | WHERE c SIMILAR TO 'H.llo'
+ |""".stripMargin,
+ Seq(row("H.llo"), row("Hello"))
+ )
+ checkEmptyResult(s"""
+ |SELECT c FROM MyTable
+ | WHERE c NOT SIMILAR TO 'H.llo'
+ |""".stripMargin)
}
@Test
