commit 6b9947a23e7f03e8b3e7e051fd12063fed1e2cfc
author Timo Walther <twalthr@apache.org> Fri Apr 08 18:08:51 2022 +0200
committer Sergey Nuyanzin <snuyanzin@gmail.com> Fri Dec 08 15:58:35 2023 +0100
tree f12bd3268ce88c1ce0bbb0ff882ed3562931caa8
parent 8229e219e91b8f3cb1a2822656d3b50f6c036717

[hotfix][table-planner] Simplify PlannerContext signatures related to CatalogManager

flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParser.java

diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParser.java b/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParser.java
index 81cb5e4..3a547e0 100644
--- a/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParser.java
+++ b/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParser.java
@@ -171,11 +171,7 @@
                 calciteParserSupplier,
                 plannerContext.getSqlExprToRexConverterFactory());
         this.plannerContext = plannerContext;
-        this.catalogReader =
-                plannerContext.createCatalogReader(
-                        false,
-                        catalogManager.getCurrentCatalog(),
-                        catalogManager.getCurrentDatabase());
+        this.catalogReader = plannerContext.createCatalogReader(false);
         this.frameworkConfig = plannerContext.createFrameworkConfig();
         this.funcConverter =
                 new SqlFunctionConverter(

flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java

diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java b/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java
index ecc4e34..4411b08 100644
--- a/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java
+++ b/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserCalcitePlanner.java
@@ -209,9 +209,7 @@
             throws SemanticException {
         this.catalogManager = catalogManager;
         this.catalogReader = catalogReader;
-        flinkPlanner =
-                plannerContext.createFlinkPlanner(
-                        catalogManager.getCurrentCatalog(), catalogManager.getCurrentDatabase());
+        flinkPlanner = plannerContext.createFlinkPlanner();
         this.plannerContext = plannerContext;
         this.frameworkConfig = frameworkConfig;
         this.semanticAnalyzer =
@@ -2570,9 +2568,7 @@
         if (correlUse == null) {
             correlRel =
                     plannerContext
-                            .createRelBuilder(
-                                    catalogManager.getCurrentCatalog(),
-                                    catalogManager.getCurrentDatabase())
+                            .createRelBuilder()
                             .push(input)
                             .push(tableFunctionScan)
                             .join(

flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserFactory.java

diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserFactory.java b/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserFactory.java
index 808d509..92dce59 100644
--- a/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserFactory.java
+++ b/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/HiveParserFactory.java
@@ -48,11 +48,7 @@
     public Parser create(Context context) {
         return new HiveParser(
                 context.getCatalogManager(),
-                () ->
-                        context.getPlannerContext()
-                                .createFlinkPlanner(
-                                        context.getCatalogManager().getCurrentCatalog(),
-                                        context.getCatalogManager().getCurrentDatabase()),
+                context.getPlannerContext()::createFlinkPlanner,
                 context.getPlannerContext()::createCalciteParser,
                 context.getPlannerContext());
     }