[GitHub] twalthr closed pull request #6099: [FLINK-9473] [table] Added new methods into ExternalCatalogSchema based on interface Schema changes in Calcite

[GitBox <gi...@apache.org>]

twalthr closed pull request #6099: [FLINK-9473] [table] Added new methods into ExternalCatalogSchema based on interface Schema changes in Calcite
URL: https://github.com/apache/flink/pull/6099
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml
index d993f23c9ae..697b553d2a3 100644
--- a/flink-libraries/flink-table/pom.xml
+++ b/flink-libraries/flink-table/pom.xml
@@ -113,7 +113,7 @@ under the License.
 			<groupId>org.apache.calcite</groupId>
 			<artifactId>calcite-core</artifactId>
 			<!-- When updating the Calcite version, make sure to update the dependency exclusions -->
-			<version>1.16.0</version>
+			<version>1.17.0-SNAPSHOT</version>
 			<exclusions>
 				<!-- Dependencies that are not needed for how we use Calcite right now -->
 				<exclusion>
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogSchema.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogSchema.scala
index 776ddee21f7..eed2e55b524 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogSchema.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/catalog/ExternalCatalogSchema.scala
@@ -18,9 +18,11 @@
 
 package org.apache.flink.table.catalog
 
+import java.util
 import java.util.{Collection => JCollection, Collections => JCollections, LinkedHashSet => JLinkedHashSet, Set => JSet}
 
 import org.apache.calcite.linq4j.tree.Expression
+import org.apache.calcite.rel.`type`.RelProtoDataType
 import org.apache.calcite.schema._
 import org.apache.flink.table.api.{CatalogNotExistException, TableEnvironment, TableNotExistException}
 import org.apache.flink.table.util.Logging
@@ -60,6 +62,14 @@ class ExternalCatalogSchema(
     }
   }
 
+  protected def getTypeMap: util.Map[String, RelProtoDataType] = {
+    JCollections.emptyMap()
+  }
+
+  override def getType(name: String): RelProtoDataType = getTypeMap.get(name)
+
+  override def getTypeNames: JSet[String] = JCollections.emptySet[String]
+
   /**
     * Lists the sub-schemas of the external catalog.
     * Returns a list of names of this schema's sub-schemas.


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services