-
Notifications
You must be signed in to change notification settings - Fork 29k
[TEST] Load test table based on case sensitivity #18504
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.
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ | |
| package org.apache.spark.sql.hive.test | ||
|
|
||
| import java.io.File | ||
| import java.util.{Set => JavaSet} | ||
| import java.util.{Locale, Set => JavaSet} | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
| import scala.collection.mutable | ||
|
|
@@ -449,6 +449,8 @@ private[hive] class TestHiveSparkSession( | |
|
|
||
| private val loadedTables = new collection.mutable.HashSet[String] | ||
|
|
||
| def getLoadedTables: collection.mutable.HashSet[String] = loadedTables | ||
|
|
||
| def loadTestTable(name: String) { | ||
| if (!(loadedTables contains name)) { | ||
| // Marks the table as loaded first to prevent infinite mutually recursive table loading. | ||
|
|
@@ -553,7 +555,10 @@ private[hive] class TestHiveQueryExecution( | |
| val referencedTables = | ||
| describedTables ++ | ||
| logical.collect { case UnresolvedRelation(tableIdent, _) => tableIdent.table } | ||
| val referencedTestTables = referencedTables.filter(sparkSession.testTables.contains) | ||
| val formattedRefTables = referencedTables.map { t => | ||
| if (sparkSession.sessionState.conf.caseSensitiveAnalysis) t else t.toLowerCase(Locale.ROOT) | ||
| } | ||
| val referencedTestTables = formattedRefTables.filter(sparkSession.testTables.contains) | ||
|
||
| logDebug(s"Query references test tables: ${referencedTestTables.mkString(", ")}") | ||
| referencedTestTables.foreach(sparkSession.loadTestTable) | ||
| // Proceed with analysis. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * 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.hive | ||
|
|
||
| import org.apache.spark.sql.AnalysisException | ||
| import org.apache.spark.sql.hive.test.{TestHiveSingleton, TestHiveSparkSession} | ||
| import org.apache.spark.sql.internal.SQLConf | ||
| import org.apache.spark.sql.test.SQLTestUtils | ||
|
|
||
|
|
||
| class TestHiveSuite extends TestHiveSingleton with SQLTestUtils { | ||
| test("load test table based on case sensitivity") { | ||
|
|
||
| withSQLConf(SQLConf.CASE_SENSITIVE.key -> "false") { | ||
| sql("SELECT * FROM SRC").queryExecution.analyzed | ||
| assert(spark.asInstanceOf[TestHiveSparkSession].getLoadedTables.contains("src")) | ||
| } | ||
| spark.asInstanceOf[TestHiveSparkSession].reset() | ||
|
|
||
| withSQLConf(SQLConf.CASE_SENSITIVE.key -> "true") { | ||
| val err = intercept[AnalysisException] { | ||
| sql("SELECT * FROM SRC").queryExecution.analyzed | ||
| } | ||
| assert(err.message.contains("Table or view not found")) | ||
| } | ||
| spark.asInstanceOf[TestHiveSparkSession].reset() | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not needed.