diff options
author | Reynold Xin <rxin@databricks.com> | 2015-01-13 13:30:35 -0800 |
---|---|---|
committer | Michael Armbrust <michael@databricks.com> | 2015-01-13 13:30:35 -0800 |
commit | 14e3f114efb906937b2d7b7ac04484b2814a3b48 (patch) | |
tree | 5f20050f930c68d7f9a52a5ee696b0f633fc4ea9 /sql/hive/compatibility/src/test/scala/org | |
parent | 6463e0b9e8067cce70602c5c9006a2546856a9d6 (diff) | |
download | spark-14e3f114efb906937b2d7b7ac04484b2814a3b48.tar.gz spark-14e3f114efb906937b2d7b7ac04484b2814a3b48.tar.bz2 spark-14e3f114efb906937b2d7b7ac04484b2814a3b48.zip |
[SPARK-5168] Make SQLConf a field rather than mixin in SQLContext
This change should be binary and source backward compatible since we didn't change any user facing APIs.
Author: Reynold Xin <rxin@databricks.com>
Closes #3965 from rxin/SPARK-5168-sqlconf and squashes the following commits:
42eec09 [Reynold Xin] Fix default conf value.
0ef86cc [Reynold Xin] Fix constructor ordering.
4d7f910 [Reynold Xin] Properly override config.
ccc8e6a [Reynold Xin] [SPARK-5168] Make SQLConf a field rather than mixin in SQLContext
Diffstat (limited to 'sql/hive/compatibility/src/test/scala/org')
-rw-r--r-- | sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala index 23283fd3fe..0d934620ac 100644 --- a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala +++ b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala @@ -36,8 +36,8 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter { private val originalTimeZone = TimeZone.getDefault private val originalLocale = Locale.getDefault - private val originalColumnBatchSize = TestHive.columnBatchSize - private val originalInMemoryPartitionPruning = TestHive.inMemoryPartitionPruning + private val originalColumnBatchSize = TestHive.conf.columnBatchSize + private val originalInMemoryPartitionPruning = TestHive.conf.inMemoryPartitionPruning def testCases = hiveQueryDir.listFiles.map(f => f.getName.stripSuffix(".q") -> f) |