You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by bl...@apache.org on 2020/01/14 23:41:40 UTC
[flink] branch release-1.10 updated: [FLINK-15576] remove
isTemporary property from CatalogFunction API
This is an automated email from the ASF dual-hosted git repository.
bli pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.10 by this push:
new 7667d43 [FLINK-15576] remove isTemporary property from CatalogFunction API
7667d43 is described below
commit 7667d43cf216184818dac56d2c243c0c56f31ef1
Author: bowen.li <bo...@gmail.com>
AuthorDate: Mon Jan 13 13:28:00 2020 -0800
[FLINK-15576] remove isTemporary property from CatalogFunction API
according to FLIP-79, CatalogFunction shouldn't have "isTemporary" property. Moving that from CatalogFunction to Create/AlterCatalogFunctionOperation
closes #10846.
---
flink-python/pyflink/table/catalog.py | 7 -------
flink-python/pyflink/table/tests/test_catalog.py | 1 -
.../flink/table/api/internal/TableEnvironmentImpl.java | 4 ++--
.../apache/flink/table/catalog/CatalogFunctionImpl.java | 17 ++++-------------
.../table/operations/ddl/AlterFunctionOperation.java | 10 +++++++++-
.../table/operations/ddl/CreateFunctionOperation.java | 10 +++++++++-
.../flink/table/catalog/GenericInMemoryCatalogTest.java | 2 +-
.../org/apache/flink/table/catalog/CatalogFunction.java | 7 -------
.../planner/operations/SqlToOperationConverter.java | 12 ++++++------
.../planner/runtime/stream/sql/FunctionITCase.java | 2 +-
.../flink/table/sqlexec/SqlToOperationConverter.java | 17 ++++++++---------
.../apache/flink/table/api/internal/TableEnvImpl.scala | 4 ++--
.../flink/table/runtime/stream/sql/FunctionITCase.java | 2 +-
13 files changed, 43 insertions(+), 52 deletions(-)
diff --git a/flink-python/pyflink/table/catalog.py b/flink-python/pyflink/table/catalog.py
index 532c132..aac8dcc 100644
--- a/flink-python/pyflink/table/catalog.py
+++ b/flink-python/pyflink/table/catalog.py
@@ -797,13 +797,6 @@ class CatalogFunction(object):
"""
return self._j_catalog_function.isGeneric()
- def is_temporary(self):
- """
- Wheter or not the function is a temporary function.
- :return: Wheter is a temporary function.
- """
- return self._j_catalog_function.isTemporary()
-
def get_function_language(self):
"""
Get the language used for the function definition.
diff --git a/flink-python/pyflink/table/tests/test_catalog.py b/flink-python/pyflink/table/tests/test_catalog.py
index 638f1bf..ed0164b 100644
--- a/flink-python/pyflink/table/tests/test_catalog.py
+++ b/flink-python/pyflink/table/tests/test_catalog.py
@@ -68,7 +68,6 @@ class CatalogTestBase(PyFlinkTestCase):
def check_catalog_function_equals(self, f1, f2):
self.assertEqual(f1.get_class_name(), f2.get_class_name())
self.assertEqual(f1.is_generic(), f2.is_generic())
- self.assertEqual(f1.is_temporary(), f2.is_temporary())
self.assertEqual(f1.get_function_language(), f2.get_function_language())
def check_catalog_partition_equals(self, p1, p2):
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java
index 748c339..6ca0553 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/api/internal/TableEnvironmentImpl.java
@@ -753,7 +753,7 @@ public class TableEnvironmentImpl implements TableEnvironment {
String exMsg = getDDLOpExecuteErrorMsg(createFunctionOperation.asSummaryString());
try {
CatalogFunction function = createFunctionOperation.getCatalogFunction();
- if (function.isTemporary()) {
+ if (createFunctionOperation.isTemporary()) {
boolean exist = functionCatalog.hasTemporaryCatalogFunction(
createFunctionOperation.getFunctionIdentifier());
if (!exist) {
@@ -787,7 +787,7 @@ public class TableEnvironmentImpl implements TableEnvironment {
String exMsg = getDDLOpExecuteErrorMsg(alterFunctionOperation.asSummaryString());
try {
CatalogFunction function = alterFunctionOperation.getCatalogFunction();
- if (function.isTemporary()) {
+ if (alterFunctionOperation.isTemporary()) {
throw new ValidationException(
"Alter temporary catalog function is not supported");
} else {
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogFunctionImpl.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogFunctionImpl.java
index 54acead..0421e1e 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogFunctionImpl.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogFunctionImpl.java
@@ -32,20 +32,17 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
public class CatalogFunctionImpl implements CatalogFunction {
private final String className; // Fully qualified class name of the function
private final FunctionLanguage functionLanguage;
- private final boolean isTemporary;
public CatalogFunctionImpl(String className) {
- this(className, FunctionLanguage.JAVA, false);
+ this(className, FunctionLanguage.JAVA);
}
public CatalogFunctionImpl(
String className,
- FunctionLanguage functionLanguage,
- boolean isTemporary) {
+ FunctionLanguage functionLanguage) {
checkArgument(!StringUtils.isNullOrWhitespaceOnly(className), "className cannot be null or empty");
this.className = className;
this.functionLanguage = checkNotNull(functionLanguage, "functionLanguage cannot be null");
- this.isTemporary = isTemporary;
}
@Override
@@ -55,7 +52,7 @@ public class CatalogFunctionImpl implements CatalogFunction {
@Override
public CatalogFunction copy() {
- return new CatalogFunctionImpl(getClassName(), functionLanguage, isTemporary);
+ return new CatalogFunctionImpl(getClassName(), functionLanguage);
}
@Override
@@ -82,11 +79,6 @@ public class CatalogFunctionImpl implements CatalogFunction {
}
@Override
- public boolean isTemporary() {
- return isTemporary;
- }
-
- @Override
public FunctionLanguage getFunctionLanguage() {
return functionLanguage;
}
@@ -96,8 +88,7 @@ public class CatalogFunctionImpl implements CatalogFunction {
return "CatalogFunctionImpl{" +
"className='" + getClassName() + "', " +
"functionLanguage='" + getFunctionLanguage() + "', " +
- "isGeneric='" + isGeneric() + "', " +
- "isTemporary='" + isTemporary() +
+ "isGeneric='" + isGeneric() +
"'}";
}
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ddl/AlterFunctionOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ddl/AlterFunctionOperation.java
index fab7e54..29f1b9f 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ddl/AlterFunctionOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ddl/AlterFunctionOperation.java
@@ -34,14 +34,17 @@ public class AlterFunctionOperation implements AlterOperation {
private final ObjectIdentifier functionIdentifier;
private CatalogFunction catalogFunction;
private boolean ifExists;
+ private boolean isTemporary;
public AlterFunctionOperation(
ObjectIdentifier functionIdentifier,
CatalogFunction catalogFunction,
- boolean ifExists) {
+ boolean ifExists,
+ boolean isTemporary) {
this.functionIdentifier = functionIdentifier;
this.catalogFunction = catalogFunction;
this.ifExists = ifExists;
+ this.isTemporary = isTemporary;
}
public CatalogFunction getCatalogFunction() {
@@ -56,12 +59,17 @@ public class AlterFunctionOperation implements AlterOperation {
return this.ifExists;
}
+ public boolean isTemporary() {
+ return isTemporary;
+ }
+
@Override
public String asSummaryString() {
Map<String, Object> params = new LinkedHashMap<>();
params.put("catalogFunction", catalogFunction.getDetailedDescription());
params.put("identifier", functionIdentifier);
params.put("ifExists", ifExists);
+ params.put("isTemporary", isTemporary);
return OperationUtils.formatWithChildren(
"ALTER FUNCTION",
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ddl/CreateFunctionOperation.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ddl/CreateFunctionOperation.java
index cc8e281..77233b4 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ddl/CreateFunctionOperation.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/operations/ddl/CreateFunctionOperation.java
@@ -34,14 +34,17 @@ public class CreateFunctionOperation implements CreateOperation {
private final ObjectIdentifier functionIdentifier;
private CatalogFunction catalogFunction;
private boolean ignoreIfExists;
+ private boolean isTemporary;
public CreateFunctionOperation(
ObjectIdentifier functionIdentifier,
CatalogFunction catalogFunction,
- boolean ignoreIfExists) {
+ boolean ignoreIfExists,
+ boolean isTemporary) {
this.functionIdentifier = functionIdentifier;
this.catalogFunction = catalogFunction;
this.ignoreIfExists = ignoreIfExists;
+ this.isTemporary = isTemporary;
}
public CatalogFunction getCatalogFunction() {
@@ -56,12 +59,17 @@ public class CreateFunctionOperation implements CreateOperation {
return this.ignoreIfExists;
}
+ public boolean isTemporary() {
+ return isTemporary;
+ }
+
@Override
public String asSummaryString() {
Map<String, Object> params = new LinkedHashMap<>();
params.put("catalogFunction", catalogFunction.getDetailedDescription());
params.put("identifier", functionIdentifier);
params.put("ignoreIfExists", ignoreIfExists);
+ params.put("isTemporary", isTemporary);
return OperationUtils.formatWithChildren(
"CREATE CATALOG FUNCTION",
diff --git a/flink-table/flink-table-api-java/src/test/java/org/apache/flink/table/catalog/GenericInMemoryCatalogTest.java b/flink-table/flink-table-api-java/src/test/java/org/apache/flink/table/catalog/GenericInMemoryCatalogTest.java
index e5958f8..3804384 100644
--- a/flink-table/flink-table-api-java/src/test/java/org/apache/flink/table/catalog/GenericInMemoryCatalogTest.java
+++ b/flink-table/flink-table-api-java/src/test/java/org/apache/flink/table/catalog/GenericInMemoryCatalogTest.java
@@ -162,6 +162,6 @@ public class GenericInMemoryCatalogTest extends CatalogTestBase {
@Override
protected CatalogFunction createAnotherFunction() {
- return new CatalogFunctionImpl(TestSimpleUDF.class.getCanonicalName(), FunctionLanguage.SCALA, false);
+ return new CatalogFunctionImpl(TestSimpleUDF.class.getCanonicalName(), FunctionLanguage.SCALA);
}
}
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/CatalogFunction.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/CatalogFunction.java
index 441aee0..560d3f8 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/CatalogFunction.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/CatalogFunction.java
@@ -61,13 +61,6 @@ public interface CatalogFunction {
boolean isGeneric();
/**
- * Distinguish if the function is a temporary function.
- *
- * @return whether the function is a generic function
- */
- boolean isTemporary();
-
- /**
* Get the language used for the definition of function.
*
* @return the language type of the function definition
diff --git a/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/operations/SqlToOperationConverter.java b/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/operations/SqlToOperationConverter.java
index a359c71..237c2b7 100644
--- a/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/operations/SqlToOperationConverter.java
+++ b/flink-table/flink-table-planner-blink/src/main/java/org/apache/flink/table/planner/operations/SqlToOperationConverter.java
@@ -252,14 +252,14 @@ public class SqlToOperationConverter {
FunctionLanguage language = parseLanguage(sqlCreateFunction.getFunctionLanguage());
CatalogFunction catalogFunction = new CatalogFunctionImpl(
sqlCreateFunction.getFunctionClassName().getValueAs(String.class),
- language,
- sqlCreateFunction.isTemporary());
+ language);
ObjectIdentifier identifier = catalogManager.qualifyIdentifier(unresolvedIdentifier);
return new CreateFunctionOperation(
identifier,
catalogFunction,
- sqlCreateFunction.isIfNotExists()
+ sqlCreateFunction.isIfNotExists(),
+ sqlCreateFunction.isTemporary()
);
}
}
@@ -273,15 +273,15 @@ public class SqlToOperationConverter {
FunctionLanguage language = parseLanguage(sqlAlterFunction.getFunctionLanguage());
CatalogFunction catalogFunction = new CatalogFunctionImpl(
sqlAlterFunction.getFunctionClassName().getValueAs(String.class),
- language,
- sqlAlterFunction.isTemporary());
+ language);
UnresolvedIdentifier unresolvedIdentifier = UnresolvedIdentifier.of(sqlAlterFunction.getFunctionIdentifier());
ObjectIdentifier identifier = catalogManager.qualifyIdentifier(unresolvedIdentifier);
return new AlterFunctionOperation(
identifier,
catalogFunction,
- sqlAlterFunction.isIfExists()
+ sqlAlterFunction.isIfExists(),
+ sqlAlterFunction.isTemporary()
);
}
diff --git a/flink-table/flink-table-planner-blink/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/FunctionITCase.java b/flink-table/flink-table-planner-blink/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/FunctionITCase.java
index 310647a..8acd614 100644
--- a/flink-table/flink-table-planner-blink/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/FunctionITCase.java
+++ b/flink-table/flink-table-planner-blink/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/FunctionITCase.java
@@ -99,7 +99,7 @@ public class FunctionITCase extends StreamingTestBase {
} catch (Exception e){
assertEquals(e.getMessage(), "Could not execute CREATE CATALOG FUNCTION:" +
" (catalogFunction: [Optional[This is a user-defined function]], identifier:" +
- " [`default_catalog`.`database1`.`f3`], ignoreIfExists: [false])");
+ " [`default_catalog`.`database1`.`f3`], ignoreIfExists: [false], isTemporary: [false])");
}
}
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/sqlexec/SqlToOperationConverter.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/sqlexec/SqlToOperationConverter.java
index a87c80d..7d2b3bd 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/sqlexec/SqlToOperationConverter.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/sqlexec/SqlToOperationConverter.java
@@ -257,15 +257,15 @@ public class SqlToOperationConverter {
FunctionLanguage language = parseLanguage(sqlCreateFunction.getFunctionLanguage());
CatalogFunction catalogFunction = new CatalogFunctionImpl(
sqlCreateFunction.getFunctionClassName().getValueAs(String.class),
- language,
- sqlCreateFunction.isTemporary());
+ language);
ObjectIdentifier identifier = catalogManager.qualifyIdentifier(unresolvedIdentifier);
return new CreateFunctionOperation(
identifier,
catalogFunction,
- sqlCreateFunction.isIfNotExists()
+ sqlCreateFunction.isIfNotExists(),
+ sqlCreateFunction.isTemporary()
);
}
}
@@ -279,15 +279,15 @@ public class SqlToOperationConverter {
FunctionLanguage language = parseLanguage(sqlAlterFunction.getFunctionLanguage());
CatalogFunction catalogFunction = new CatalogFunctionImpl(
sqlAlterFunction.getFunctionClassName().getValueAs(String.class),
- language,
- sqlAlterFunction.isTemporary());
+ language);
UnresolvedIdentifier unresolvedIdentifier = UnresolvedIdentifier.of(sqlAlterFunction.getFunctionIdentifier());
ObjectIdentifier identifier = catalogManager.qualifyIdentifier(unresolvedIdentifier);
return new AlterFunctionOperation(
identifier,
catalogFunction,
- sqlAlterFunction.isIfExists()
+ sqlAlterFunction.isIfExists(),
+ sqlAlterFunction.isTemporary()
);
}
@@ -304,9 +304,8 @@ public class SqlToOperationConverter {
return new DropFunctionOperation(
identifier,
- sqlDropFunction.isTemporary(),
- sqlDropFunction.isSystemFunction(),
- sqlDropFunction.getIfExists()
+ sqlDropFunction.getIfExists(),
+ sqlDropFunction.isTemporary()
);
}
}
diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/internal/TableEnvImpl.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/internal/TableEnvImpl.scala
index 82f5091..128421a 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/internal/TableEnvImpl.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/api/internal/TableEnvImpl.scala
@@ -704,7 +704,7 @@ abstract class TableEnvImpl(
val exMsg = getDDLOpExecuteErrorMsg(createFunctionOperation.asSummaryString)
try {
val function = createFunctionOperation.getCatalogFunction
- if (function.isTemporary) {
+ if (createFunctionOperation.isTemporary) {
val exist = functionCatalog.hasTemporaryCatalogFunction(
createFunctionOperation.getFunctionIdentifier);
if (!exist) {
@@ -737,7 +737,7 @@ abstract class TableEnvImpl(
val exMsg = getDDLOpExecuteErrorMsg(alterFunctionOperation.asSummaryString)
try {
val function = alterFunctionOperation.getCatalogFunction
- if (function.isTemporary) {
+ if (alterFunctionOperation.isTemporary) {
throw new ValidationException("Alter temporary catalog function is not supported")
} else {
val catalog = getCatalogOrThrowException(
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/stream/sql/FunctionITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/stream/sql/FunctionITCase.java
index 6ccfc02..5234483 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/stream/sql/FunctionITCase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/runtime/stream/sql/FunctionITCase.java
@@ -106,7 +106,7 @@ public class FunctionITCase extends AbstractTestBase {
} catch (Exception e){
assertEquals(e.getMessage(), "Could not execute CREATE CATALOG FUNCTION:" +
" (catalogFunction: [Optional[This is a user-defined function]], identifier:" +
- " [`default_catalog`.`database1`.`f3`], ignoreIfExists: [false])");
+ " [`default_catalog`.`database1`.`f3`], ignoreIfExists: [false], isTemporary: [false])");
}
}