pan3793 commented on code in PR #7570:
URL: https://github.com/apache/kyuubi/pull/7570#discussion_r3594175682
##########
externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/util/SparkCatalogUtils.scala:
##########
@@ -44,35 +44,63 @@ object SparkCatalogUtils extends Logging {
// Catalog
//
//
///////////////////////////////////////////////////////////////////////////////////////////////
+ // SPARK-46050 (4.2.0) changed CatalogManager from a class to an interface,
breaking
+ // binary compatibility when compiled against Spark 3.5 and run against
Spark 4.2.
+ // Access catalogManager reflectively to avoid IncompatibleClassChangeError.
+ def catalogManager(spark: SparkSession): AnyRef =
+ invokeAs[AnyRef](spark.sessionState, "catalogManager")
+
+ def setCurrentNamespace(spark: SparkSession, namespace: Array[String]): Unit
= {
+ val mgr = catalogManager(spark)
+ val method = mgr.getClass.getMethod("setCurrentNamespace",
classOf[Array[String]])
+ try {
+ method.invoke(mgr, namespace)
+ } catch {
+ case e: java.lang.reflect.InvocationTargetException => throw e.getCause
+ }
+ }
+
+ def currentCatalog(spark: SparkSession): CatalogPlugin =
+ invokeAs[CatalogPlugin](catalogManager(spark), "currentCatalog")
+
+ def currentNamespace(spark: SparkSession): Array[String] =
+ invokeAs[Array[String]](catalogManager(spark), "currentNamespace")
+
+ def catalog(spark: SparkSession, name: String): CatalogPlugin =
+ invokeAs[CatalogPlugin](catalogManager(spark), "catalog",
(classOf[String], name))
+
+ def isCatalogRegistered(spark: SparkSession, name: String): Boolean =
+ invokeAs[Boolean](catalogManager(spark), "isCatalogRegistered",
(classOf[String], name))
+
/**
* Get all register catalogs in Spark's `CatalogManager`
*/
def getCatalogs(spark: SparkSession): Seq[Row] = {
-
- // A [[CatalogManager]] is session unique
- val catalogMgr = spark.sessionState.catalogManager
+ val catalogMgr = catalogManager(spark)
// get the custom v2 session catalog or default spark_catalog
val sessionCatalog = invokeAs[AnyRef](catalogMgr, "v2SessionCatalog")
- val defaultCatalog = catalogMgr.currentCatalog
+ val defaultCatalog = invokeAs[CatalogPlugin](catalogMgr, "currentCatalog")
Review Comment:
see comments at line 47-49
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
