update

Co-authored-by: Thomas Chow <[email protected]>

Author: tchow-zlai

cloud_gcp/src/main/scala/ai/chronon/integrations/cloud_gcp/GcpFormatProvider.scala

@@ -47,10 +47,10 @@ class GcpFormatProvider(override val sparkSession: SparkSession) extends Default
     }
   }
 
-  private def getCatalog(tableName: String): String = {
+  private[cloud_gcp] def getCatalog(tableName: String): String = {
     logger.info(s"Retrieving read format for table: ${tableName}")
     val parsed = sparkSession.sessionState.sqlParser.parseMultipartIdentifier(tableName)
-    val parsedCatalog = parsed match {
+    val parsedCatalog = parsed.toList match {
       case catalog :: namespace :: tableName :: Nil => catalog
       case namespace :: tableName :: Nil            => sparkSession.catalog.currentCatalog()
       case tableName :: Nil                         => sparkSession.catalog.currentCatalog()
@@ -59,7 +59,7 @@ class GcpFormatProvider(override val sparkSession: SparkSession) extends Default
     parsedCatalog
   }
 
-  private def isBigQueryCatalog(catalog: String): Boolean = {
+  private[cloud_gcp] def isBigQueryCatalog(catalog: String): Boolean = {
     val cat = sparkSession.sessionState.catalogManager.catalog(catalog)
     cat.isInstanceOf[DelegatingBigQueryMetastoreCatalog] || cat
       .isInstanceOf[BigQueryCatalog] || (cat.isInstanceOf[SparkCatalog] && cat

cloud_gcp/src/test/scala/ai/chronon/integrations/cloud_gcp/BigQueryCatalogTest.scala

@@ -61,6 +61,17 @@ class BigQueryCatalogTest extends AnyFlatSpec with MockitoSugar {
     assertCompiles("classOf[GoogleHadoopFS]")
   }
 
+  it should "test catalog detection" in {
+    val fp = FormatProvider.from(spark).asInstanceOf[GcpFormatProvider]
+    assertEquals("catalogA", fp.getCatalog("catalogA.foo.bar"))
+    assertEquals("catalogA", fp.getCatalog("`catalogA`.foo.bar"))
+    assertEquals("spark_catalog", fp.getCatalog("`catalogA.foo`.bar"))
+    assertEquals("spark_catalog", fp.getCatalog("`catalogA.foo.bar`"))
+    assertEquals("spark_catalog", fp.getCatalog("foo.bar"))
+    assertEquals("spark_catalog", fp.getCatalog("bar"))
+    assertThrows[ParseException](fp.getCatalog(""))
+  }
+
   it should "verify dynamic classloading of GCP providers" in {
     assertEquals("thrift://localhost:9083", spark.sqlContext.getConf("hive.metastore.uris"))
     assertTrue(FormatProvider.from(spark).isInstanceOf[GcpFormatProvider])