hive git commit: HIVE-12685: Remove redundant hive-site.xml under common/src/test/resources/ (Wei Zheng, reviewed by Ashutosh Chauhan, Mohit Sabharwal)

[da...@apache.org]

Repository: hive
Updated Branches:
  refs/heads/master 7eb14afc9 -> f1ecce036


HIVE-12685: Remove redundant hive-site.xml under common/src/test/resources/ (Wei Zheng, reviewed by Ashutosh Chauhan, Mohit Sabharwal)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f1ecce03
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f1ecce03
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f1ecce03

Branch: refs/heads/master
Commit: f1ecce036369098922393c8af03ee74d8bb60b44
Parents: 7eb14af
Author: Daniel Dai <da...@hortonworks.com>
Authored: Fri Dec 18 17:51:40 2015 -0800
Committer: Daniel Dai <da...@hortonworks.com>
Committed: Fri Dec 18 17:51:40 2015 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hive/conf/TestHiveConf.java   |  8 ++--
 common/src/test/resources/hive-site.xml         | 42 --------------------
 data/conf/hive-site.xml                         | 17 ++++++++
 3 files changed, 21 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/f1ecce03/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java b/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
index cd472c7..365d500 100644
--- a/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
+++ b/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
@@ -80,13 +80,13 @@ public class TestHiveConf {
     checkHiveConf(ConfVars.HIVESKEWJOINKEY.varname, "100000");
 
     // ConfVar overridden in in hive-site.xml
-    checkHadoopConf(ConfVars.METASTORE_CONNECTION_DRIVER.varname, null);
-    checkConfVar(ConfVars.METASTORE_CONNECTION_DRIVER, "org.apache.derby.jdbc.EmbeddedDriver");
-    checkHiveConf(ConfVars.METASTORE_CONNECTION_DRIVER.varname, "hive-site.xml");
+    checkHadoopConf(ConfVars.HIVETESTMODEDUMMYSTATAGGR.varname, null);
+    checkConfVar(ConfVars.HIVETESTMODEDUMMYSTATAGGR, "");
+    checkHiveConf(ConfVars.HIVETESTMODEDUMMYSTATAGGR.varname, "value2");
 
     // Property defined in hive-site.xml only
     checkHadoopConf("test.property1", null);
-    checkHiveConf("test.property1", "hive-site.xml");
+    checkHiveConf("test.property1", "value1");
 
     // Test HiveConf property variable substitution in hive-site.xml
     checkHiveConf("test.var.hiveconf.property", ConfVars.DEFAULTPARTITIONNAME.getDefaultValue());

http://git-wip-us.apache.org/repos/asf/hive/blob/f1ecce03/common/src/test/resources/hive-site.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/hive-site.xml b/common/src/test/resources/hive-site.xml
deleted file mode 100644
index 0d5c834..0000000
--- a/common/src/test/resources/hive-site.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-   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.
--->
-
-<!-- Test file for TestHiveConf -->
-
-<configuration>
-
-<property>
-  <name>javax.jdo.option.ConnectionDriverName</name>
-  <value>hive-site.xml</value>
-  <description>Override ConfVar defined in HiveConf</description>
-</property>
-
-<property>
-  <name>test.property1</name>
-  <value>hive-site.xml</value>
-  <description>Test property defined in hive-site.xml only</description>
-</property>
-
-<property>
-  <name>test.var.hiveconf.property</name>
-  <value>${hive.exec.default.partition.name}</value>
-  <description>Test hiveconf property substitution</description>
-</property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/f1ecce03/data/conf/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml
index 84005b4..2a5f891 100644
--- a/data/conf/hive-site.xml
+++ b/data/conf/hive-site.xml
@@ -244,6 +244,23 @@
 </property>
 
 <property>
+  <name>test.var.hiveconf.property</name>
+  <value>${hive.exec.default.partition.name}</value>
+  <description>Test hiveconf property substitution</description>
+</property>
+
+<property>
+  <name>test.property1</name>
+  <value>value1</value>
+  <description>Test property defined in hive-site.xml only</description>
+</property>
+
+<property>
+  <name>hive.test.dummystats.aggregator</name>
+  <value>value2</value>
+</property>
+
+<property>
   <name>hive.fetch.task.conversion</name>
   <value>minimal</value>
 </property>