forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
make caseSensitive configurable in Analyzer
- Loading branch information
Showing
14 changed files
with
243 additions
and
29 deletions.
There are no files selected for viewing
53 changes: 53 additions & 0 deletions
53
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystConf.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import scala.collection.immutable | ||
|
|
||
| private[spark] object CatalystConf{ | ||
| val CASE_SENSITIVE = "spark.sql.caseSensitive" | ||
| } | ||
|
|
||
| private[spark] trait CatalystConf { | ||
| def setConf(key: String, value: String) : Unit | ||
| def getConf(key: String) : String | ||
| def getConf(key: String, defaultValue: String) : String | ||
| def getAllConfs: immutable.Map[String, String] | ||
| } | ||
|
|
||
| /** | ||
| * A trivial conf that is empty. Used for testing when all | ||
| * relations are already filled in and the analyser needs only to resolve attribute references. | ||
| */ | ||
| object EmptyConf extends CatalystConf { | ||
| def setConf(key: String, value: String) : Unit = { | ||
| throw new UnsupportedOperationException | ||
| } | ||
|
|
||
| def getConf(key: String) : String = { | ||
| throw new UnsupportedOperationException | ||
| } | ||
|
|
||
| def getConf(key: String, defaultValue: String) : String = { | ||
| throw new UnsupportedOperationException | ||
| } | ||
|
|
||
| def getAllConfs: immutable.Map[String, String] = { | ||
| throw new UnsupportedOperationException | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/test/SimpleConf.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * 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.test | ||
|
|
||
| import org.apache.spark.sql.catalyst.CatalystConf | ||
|
|
||
| import scala.collection.immutable | ||
| import scala.collection.mutable | ||
|
|
||
| /** A CatalystConf that can be used for local testing. */ | ||
| class SimpleConf extends CatalystConf{ | ||
| val map = mutable.Map[String, String]() | ||
|
|
||
| def setConf(key: String, value: String) : Unit = { | ||
| map.put(key, value) | ||
| } | ||
| def getConf(key: String) : String ={ | ||
| map.get(key).get | ||
| } | ||
| def getConf(key: String, defaultValue: String) : String = { | ||
| map.getOrElse(key, defaultValue) | ||
| } | ||
| def getAllConfs: immutable.Map[String, String] = { | ||
| map.toMap | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
sql/core/src/main/scala/org/apache/spark/sql/test/TestCaseInsensitiveSQLContext.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * 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.test | ||
|
|
||
| import org.apache.spark.sql.{SQLConf, SQLContext} | ||
| import org.apache.spark.{SparkConf, SparkContext} | ||
| import org.apache.spark.sql.catalyst.CatalystConf | ||
|
|
||
| /** A case insensitive SQLContext that can be used for local testing. */ | ||
| object TestCaseInsensitiveSQLContext | ||
| extends SQLContext( | ||
| new SparkContext( | ||
| "local[2]", | ||
| "CaseInsensitiveSQLContext", | ||
| new SparkConf())) { | ||
|
|
||
| this.setConf(CatalystConf.CASE_SENSITIVE, "false") | ||
|
|
||
| /** Fewer partitions to speed up testing. */ | ||
| override private[spark] def numShufflePartitions: Int = | ||
| getConf(SQLConf.SHUFFLE_PARTITIONS, "5").toInt | ||
| } | ||
|
|
55 changes: 55 additions & 0 deletions
55
sql/core/src/test/scala/org/apache/spark/sql/SQLQueryCaseInsensitiveSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import java.util.TimeZone | ||
|
|
||
| import org.apache.spark.sql.test.TestCaseInsensitiveSQLContext | ||
| import org.scalatest.BeforeAndAfterAll | ||
| import org.apache.spark.sql.catalyst.CatalystConf | ||
|
|
||
| /* Implicits */ | ||
|
|
||
| import org.apache.spark.sql.test.TestCaseInsensitiveSQLContext._ | ||
|
|
||
| object CaseInsensitiveTestData{ | ||
| case class StringData(s: String) | ||
| val table = TestCaseInsensitiveSQLContext.sparkContext.parallelize(StringData("test") :: Nil) | ||
| table.registerTempTable("caseInsensitiveTable") | ||
| } | ||
|
|
||
| class SQLQueryCaseInsensitiveSuite extends QueryTest with BeforeAndAfterAll { | ||
| CaseInsensitiveTestData | ||
|
|
||
| var origZone: TimeZone = _ | ||
|
|
||
| override protected def beforeAll() { | ||
| origZone = TimeZone.getDefault | ||
| TimeZone.setDefault(TimeZone.getTimeZone("UTC")) | ||
| } | ||
|
|
||
| override protected def afterAll() { | ||
| TimeZone.setDefault(origZone) | ||
| } | ||
|
|
||
| test("SPARK-4699 case sensitivity SQL query") { | ||
| setConf(CatalystConf.CASE_SENSITIVE, "false") | ||
| checkAnswer(sql("SELECT S FROM CASEINSENSITIVETABLE"), "test") | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.