Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-34152][SQL][FOLLOW-UP] Global temp view's identifier should be correctly stored #31783

Closed
wants to merge 3 commits into from
Closed

[SPARK-34152][SQL][FOLLOW-UP] Global temp view's identifier should be correctly stored #31783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b802a48
initial commit
imback82 Mar 9, 2021
e0dcec2
reorder
imback82 Mar 9, 2021
3d2ef7f
Address PR comments
imback82 Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/command/views.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ case class CreateViewCommand(
originalText))
} else {
TemporaryViewRelation(
prepareTemporaryViewFromDataFrame(name, aliasedPlan),
prepareTemporaryViewFromDataFrame(viewIdent, aliasedPlan),
Some(aliasedPlan))
}
catalog.createGlobalTempView(name.table, tableDefinition, overrideIfExists = replace)
Expand Down
31 changes: 28 additions & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/SQLViewTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.sql.execution

import org.apache.spark.sql.{AnalysisException, QueryTest, Row}
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.plans.logical.Repartition
import org.apache.spark.sql.internal.SQLConf._
import org.apache.spark.sql.test.{SharedSparkSession, SQLTestUtils}
Expand All @@ -32,6 +33,7 @@ abstract class SQLViewTestSuite extends QueryTest with SQLTestUtils {

protected def viewTypeString: String
protected def formattedViewName(viewName: String): String
protected def tableIdentifier(viewName: String): TableIdentifier

def createView(
viewName: String,
Expand Down Expand Up @@ -293,22 +295,45 @@ abstract class SQLViewTestSuite extends QueryTest with SQLTestUtils {
}
}
}

test("SPARK-34152: view's identifier should be correctly stored") {
Seq(true, false).foreach { storeAnalyzed =>
withSQLConf(STORE_ANALYZED_PLAN_FOR_VIEW.key -> storeAnalyzed.toString) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has no effect for permanent view, and please let me know if this is not desirable. I can introduce isTempView for each suite and only apply this if the suite is for a local or global temp view.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's ok to have a little waste in the test.

val viewName = createView("v", "SELECT 1")
withView(viewName) {
val tblIdent = tableIdentifier("v")
val metadata = spark.sessionState.catalog.getTempViewOrPermanentTableMetadata(tblIdent)
assert(metadata.identifier == tblIdent)
}
}
}
}
}

class LocalTempViewTestSuite extends SQLViewTestSuite with SharedSparkSession {
override protected def viewTypeString: String = "TEMPORARY VIEW"
override protected def formattedViewName(viewName: String): String = viewName
override protected def tableIdentifier(viewName: String): TableIdentifier = {
TableIdentifier(viewName)
}
}

class GlobalTempViewTestSuite extends SQLViewTestSuite with SharedSparkSession {
private def db: String = spark.sharedState.globalTempViewManager.database
override protected def viewTypeString: String = "GLOBAL TEMPORARY VIEW"
override protected def formattedViewName(viewName: String): String = {
val globalTempDB = spark.sharedState.globalTempViewManager.database
s"$globalTempDB.$viewName"
s"$db.$viewName"
}
override protected def tableIdentifier(viewName: String): TableIdentifier = {
TableIdentifier(viewName, Some(db))
}
}

class PersistedViewTestSuite extends SQLViewTestSuite with SharedSparkSession {
private def db: String = "default"
override protected def viewTypeString: String = "VIEW"
override protected def formattedViewName(viewName: String): String = s"default.$viewName"
override protected def formattedViewName(viewName: String): String = s"$db.$viewName"
override protected def tableIdentifier(viewName: String): TableIdentifier = {
TableIdentifier(viewName, Some(db))
}
}