Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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)
}
Copy link
Member

Choose a reason for hiding this comment

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

This is not needed.

val referencedTestTables = formattedRefTables.filter(sparkSession.testTables.contains)
Copy link
Member

Choose a reason for hiding this comment

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

This assumes all the testTables are lower case. We should not call contains

Copy link
Member

Choose a reason for hiding this comment

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

Try sparkSession.sessionState.conf.resolver

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It would be an O(N^2) operation, but since the number of referenced tables should be small, I think that's ok.

logDebug(s"Query references test tables: ${referencedTestTables.mkString(", ")}")
referencedTestTables.foreach(sparkSession.loadTestTable)
// Proceed with analysis.
Expand Down
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()
}
}