dongjoon-hyun commented on a change in pull request #24511: [SPARK-27618][SQL][FOLLOW-UP] Unnecessary access to externalCatalog URL: https://github.com/apache/spark/pull/24511#discussion_r280279321
########## File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisExternalCatalogSuite.scala ########## @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.catalyst.analysis + +import java.net.URI + +import org.mockito.Mockito._ +import org.scalatest.Matchers + +import org.apache.spark.sql.catalyst.{FunctionIdentifier, TableIdentifier} +import org.apache.spark.sql.catalyst.catalog.{CatalogDatabase, CatalogStorageFormat, CatalogTable, CatalogTableType, ExternalCatalog, InMemoryCatalog, SessionCatalog} +import org.apache.spark.sql.catalyst.expressions.{Alias, AttributeReference} +import org.apache.spark.sql.catalyst.plans.logical.{LocalRelation, Project} +import org.apache.spark.sql.internal.SQLConf +import org.apache.spark.sql.types._ + +class AnalysisExternalCatalogSuite extends AnalysisTest with Matchers { + private def getAnalyzer(externCatalog: ExternalCatalog): Analyzer = { + val conf = new SQLConf() + val catalog = new SessionCatalog(externCatalog, FunctionRegistry.builtin, conf) + catalog.createDatabase( + CatalogDatabase("default", "", new URI("loc"), Map.empty), + ignoreIfExists = false) + catalog.createTable( + CatalogTable( + TableIdentifier("t1", Some("default")), + CatalogTableType.MANAGED, + CatalogStorageFormat.empty, + StructType(Seq(StructField("a", IntegerType, nullable = true)))), + ignoreIfExists = false) + new Analyzer(catalog, conf) + } + + test("query builtin functions don't call the external catalog") { + val inMemoryCatalog = new InMemoryCatalog + val catalog = spy(inMemoryCatalog) + val analyzer = getAnalyzer(catalog) + reset(catalog) + val testRelation = LocalRelation(AttributeReference("a", IntegerType, nullable = true)()) + val func = + Alias(UnresolvedFunction("sum", Seq(UnresolvedAttribute("a")), isDistinct = false), "s")() + val plan = Project(Seq(func), testRelation) + analyzer.execute(plan) + verifyZeroInteractions(catalog) + } + + test("check the existence of builtin functions don't call the external catalog") { + val inMemoryCatalog = new InMemoryCatalog + val externCatalog = spy(inMemoryCatalog) + val catalog = new SessionCatalog(externCatalog, FunctionRegistry.builtin, conf) + catalog.createDatabase( + CatalogDatabase("default", "", new URI("loc"), Map.empty), + ignoreIfExists = false) Review comment: The above three line is required to prevent `NoSuchDatabaseException` in the previous code before 181d190c60. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
