This is an automated email from the ASF dual-hosted git repository.
ron 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 e453504b23a [FLINK-36496][table-common] Remove deprecated method
CatalogFunction#isGeneric (#25981)
e453504b23a is described below
commit e453504b23a6480e21cf6bda61485f0e0df3e685
Author: Xuyang <xyzhong...@163.com>
AuthorDate: Wed Jan 15 10:57:35 2025 +0800
[FLINK-36496][table-common] Remove deprecated method
CatalogFunction#isGeneric (#25981)
Co-authored-by: RanJinh <ranji...@gmail.com>
---
flink-python/docs/reference/pyflink.table/catalog.rst | 1 -
flink-python/pyflink/table/catalog.py | 10 ----------
flink-python/pyflink/table/tests/test_catalog.py | 1 -
.../flink/table/catalog/CatalogFunctionImpl.java | 18 ------------------
.../apache/flink/table/catalog/FunctionCatalog.java | 6 ------
.../apache/flink/table/catalog/CatalogFunction.java | 10 ----------
.../org/apache/flink/table/catalog/CatalogTest.java | 1 -
.../table/functions/UserDefinedFunctionHelperTest.java | 5 -----
8 files changed, 52 deletions(-)
diff --git a/flink-python/docs/reference/pyflink.table/catalog.rst
b/flink-python/docs/reference/pyflink.table/catalog.rst
index 5abedac4945..016ec0b3d51 100644
--- a/flink-python/docs/reference/pyflink.table/catalog.rst
+++ b/flink-python/docs/reference/pyflink.table/catalog.rst
@@ -142,7 +142,6 @@ Represents a partition object in catalog.
CatalogFunction.copy
CatalogFunction.get_description
CatalogFunction.get_detailed_description
- CatalogFunction.is_generic
CatalogFunction.get_function_language
diff --git a/flink-python/pyflink/table/catalog.py
b/flink-python/pyflink/table/catalog.py
index 4046650025b..86b70c46008 100644
--- a/flink-python/pyflink/table/catalog.py
+++ b/flink-python/pyflink/table/catalog.py
@@ -1093,16 +1093,6 @@ class CatalogFunction(object):
else:
return None
- def is_generic(self) -> bool:
- """
- Whether or not is the function a flink UDF.
-
- :return: Whether is the function a flink UDF.
-
- .. versionadded:: 1.10.0
- """
- return self._j_catalog_function.isGeneric()
-
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 d6644b62ca3..aaeb86ad514 100644
--- a/flink-python/pyflink/table/tests/test_catalog.py
+++ b/flink-python/pyflink/table/tests/test_catalog.py
@@ -74,7 +74,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.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/catalog/CatalogFunctionImpl.java
b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogFunctionImpl.java
index c97024e6c36..d8ad6932580 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
@@ -19,7 +19,6 @@
package org.apache.flink.table.catalog;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.table.functions.UserDefinedFunction;
import org.apache.flink.table.resource.ResourceUri;
import org.apache.flink.util.StringUtils;
@@ -77,23 +76,6 @@ public class CatalogFunctionImpl implements CatalogFunction {
return Optional.of("This is a user-defined function");
}
- @Override
- public boolean isGeneric() {
- if (functionLanguage == FunctionLanguage.PYTHON) {
- return true;
- }
- try {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- Class c = Class.forName(className, true, cl);
- if (UserDefinedFunction.class.isAssignableFrom(c)) {
- return true;
- }
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(String.format("Can't resolve udf class
%s", className), e);
- }
- return false;
- }
-
@Override
public FunctionLanguage getFunctionLanguage() {
return functionLanguage;
diff --git
a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/FunctionCatalog.java
b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/FunctionCatalog.java
index de4b24114dc..058e87a36b6 100644
---
a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/FunctionCatalog.java
+++
b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/FunctionCatalog.java
@@ -875,12 +875,6 @@ public final class FunctionCatalog {
return Optional.empty();
}
- @Override
- public boolean isGeneric() {
- throw new UnsupportedOperationException(
- "This CatalogFunction is a InlineCatalogFunction. This
method should not be called.");
- }
-
@Override
public FunctionLanguage getFunctionLanguage() {
return FunctionLanguage.JAVA;
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 9e812020f3b..090c699e33f 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
@@ -56,16 +56,6 @@ public interface CatalogFunction {
*/
Optional<String> getDetailedDescription();
- /**
- * Distinguish if the function is a generic function.
- *
- * @return whether the function is a generic function
- * @deprecated There is no replacement for this function, as now functions
have type inference
- * strategies
- */
- @Deprecated
- boolean isGeneric();
-
/**
* Get the language used for the definition of function.
*
diff --git
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/catalog/CatalogTest.java
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/catalog/CatalogTest.java
index f81af1ae202..aa6dae3f874 100644
---
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/catalog/CatalogTest.java
+++
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/catalog/CatalogTest.java
@@ -1739,7 +1739,6 @@ public abstract class CatalogTest {
protected void checkEquals(CatalogFunction f1, CatalogFunction f2) {
assertThat(f2.getClassName()).isEqualTo(f1.getClassName());
- assertThat(f2.isGeneric()).isEqualTo(f1.isGeneric());
assertThat(f2.getFunctionLanguage()).isEqualTo(f1.getFunctionLanguage());
}
diff --git
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/functions/UserDefinedFunctionHelperTest.java
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/functions/UserDefinedFunctionHelperTest.java
index 50a9c01b574..2aa2d3a938b 100644
---
a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/functions/UserDefinedFunctionHelperTest.java
+++
b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/functions/UserDefinedFunctionHelperTest.java
@@ -250,11 +250,6 @@ class UserDefinedFunctionHelperTest {
return Optional.empty();
}
- @Override
- public boolean isGeneric() {
- return false;
- }
-
@Override
public FunctionLanguage getFunctionLanguage() {
return FunctionLanguage.JAVA;
