(paimon) branch master updated: [flink] Fix FlinkGenericCatalog can not get procedure (#4321)

[lzljs3620320]

This is an automated email from the ASF dual-hosted git repository.

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new eaa4a2487 [flink] Fix FlinkGenericCatalog can not get procedure (#4321)
eaa4a2487 is described below

commit eaa4a2487358c65fc70bb18359f26f8be9d056cd
Author: WenjunMin <ait...@apache.org>
AuthorDate: Mon Oct 14 20:43:55 2024 +0800

    [flink] Fix FlinkGenericCatalog can not get procedure (#4321)
---
 .../org/apache/paimon/flink/FlinkGenericCatalog.java     |  8 ++++++--
 .../apache/paimon/hive/FlinkGenericCatalogITCase.java    | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git 
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/FlinkGenericCatalog.java
 
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/FlinkGenericCatalog.java
index f6c206a7f..37bed2d04 100644
--- 
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/FlinkGenericCatalog.java
+++ 
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/FlinkGenericCatalog.java
@@ -498,7 +498,11 @@ public class FlinkGenericCatalog extends AbstractCatalog {
      */
     public Procedure getProcedure(ObjectPath procedurePath)
             throws ProcedureNotExistException, CatalogException {
-        return ProcedureUtil.getProcedure(paimon.catalog(), procedurePath)
-                .orElse(flink.getProcedure(procedurePath));
+        Optional<Procedure> procedure = 
ProcedureUtil.getProcedure(paimon.catalog(), procedurePath);
+        if (procedure.isPresent()) {
+            return procedure.get();
+        } else {
+            return flink.getProcedure(procedurePath);
+        }
     }
 }
diff --git 
a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FlinkGenericCatalogITCase.java
 
b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FlinkGenericCatalogITCase.java
index f2ae89205..8507c4c21 100644
--- 
a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FlinkGenericCatalogITCase.java
+++ 
b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FlinkGenericCatalogITCase.java
@@ -201,4 +201,20 @@ public class FlinkGenericCatalogITCase extends 
AbstractTestBaseJUnit4 {
         assertThat(result)
                 .contains(Row.of("compact"), Row.of("merge_into"), 
Row.of("migrate_table"));
     }
+
+    @Test
+    public void testCreateTag() {
+        sql(
+                "CREATE TABLE paimon_t ( "
+                        + "f0 INT, "
+                        + "f1 INT "
+                        + ") WITH ('connector'='paimon', 'file.format' = 
'avro' )");
+        sql("INSERT INTO paimon_t VALUES (1, 1), (2, 2)");
+        assertThat(sql("SELECT * FROM paimon_t"))
+                .containsExactlyInAnyOrder(Row.of(1, 1), Row.of(2, 2));
+        sql("CALL sys.create_tag('test_db.paimon_t', 'tag_1')");
+
+        List<Row> result = sql("SELECT tag_name FROM paimon_t$tags");
+        assertThat(result).contains(Row.of("tag_1"));
+    }
 }