ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-34299][SQL] Clean up ResolveSessionCatalog's isTempView and isTempFunction

Browse source 
### What changes were proposed in this pull request?

`ResolveSessionCatalog`'s `isTempView` and `isTempFunction` are not being used anymore since the resolution of temp view/function has moved to `Analyzer`.

This PR proposes to remove `isTempView` and `isTempFunction` from `ResolveSessionCatalog`.

### Why are the changes needed?

To clean up unused variables.

### Does this PR introduce _any_ user-facing change?

No

### How was this patch tested?

Existing tests should cover as this PR just removes the unused variables.

Closes #31400 from imback82/cleanup_resolve_session_catalog.

Authored-by: Terry Kim <yuminkim@gmail.com>
Signed-off-by: HyukjinKwon <gurwls223@apache.org>
This commit is contained in:
Terry Kim 2021-01-31 13:03:30 +09:00 committed by HyukjinKwon
parent bec88a66bd
commit a8eb443bf8
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala
View file

@ -39,10 +39,7 @@ import org.apache.spark.sql.types.{MetadataBuilder, StructField, StructType}
*
* We can remove this rule once we implement all the catalog functionality in `V2SessionCatalog`.
*/
class ResolveSessionCatalog(
val catalogManager: CatalogManager,
isTempView: Seq[String] => Boolean,
isTempFunction: String => Boolean)
class ResolveSessionCatalog(val catalogManager: CatalogManager)
extends Rule[LogicalPlan] with LookupCatalog {
import org.apache.spark.sql.connector.catalog.CatalogV2Implicits._
import org.apache.spark.sql.connector.catalog.CatalogV2Util._

3
sql/core/src/main/scala/org/apache/spark/sql/internal/BaseSessionStateBuilder.scala
View file

@ -170,8 +170,7 @@ abstract class BaseSessionStateBuilder(
new ResolveSQLOnFile(session) +:
new FallBackFileSourceV2(session) +:
ResolveEncodersInScalaAgg +:
new ResolveSessionCatalog(
catalogManager, catalog.isTempView, catalog.isTempFunction) +:
new ResolveSessionCatalog(catalogManager) +:
customResolutionRules
override val postHocResolutionRules: Seq[Rule[LogicalPlan]] =

2
sql/core/src/test/scala/org/apache/spark/sql/execution/command/PlanResolutionSuite.scala
View file

@ -168,7 +168,7 @@ class PlanResolutionSuite extends AnalysisTest {
}
val analyzer = new Analyzer(catalogManager) {
override val extendedResolutionRules: Seq[Rule[LogicalPlan]] = Seq(
new ResolveSessionCatalog(catalogManager, _ == Seq("v"), _ => false))
new ResolveSessionCatalog(catalogManager))
}
// We don't check analysis here by default, as we expect the plan to be unresolved
// such as `CreateTable`.

3
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionStateBuilder.scala
View file

@ -79,8 +79,7 @@ class HiveSessionStateBuilder(
new ResolveSQLOnFile(session) +:
new FallBackFileSourceV2(session) +:
ResolveEncodersInScalaAgg +:
new ResolveSessionCatalog(
catalogManager, catalog.isTempView, catalog.isTempFunction) +:
new ResolveSessionCatalog(catalogManager) +:
customResolutionRules
override val postHocResolutionRules: Seq[Rule[LogicalPlan]] =