Author: hashutosh
Date: Wed Mar 12 23:03:26 2014
New Revision: 1576984
URL: http://svn.apache.org/r1576984
Log:
HIVE-6569 : HCatalog still has references to deprecated property
hive.metastore.local (Sushanth Sowmyan via Ashutosh Chauhan)
Modified:
hive/trunk/hcatalog/conf/proto-hive-site.xml
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHiveClientCache.java
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestPassProperties.java
hive/trunk/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/PigHCatUtil.java
hive/trunk/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestMsgBusConnection.java
hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml
hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/install.xml
hive/trunk/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java
hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
Modified: hive/trunk/hcatalog/conf/proto-hive-site.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/conf/proto-hive-site.xml?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
--- hive/trunk/hcatalog/conf/proto-hive-site.xml (original)
+++ hive/trunk/hcatalog/conf/proto-hive-site.xml Wed Mar 12 23:03:26 2014
@@ -29,12 +29,6 @@
</property>
<property>
- <name>hive.metastore.local</name>
- <value>false</value>
- <description>controls whether to connect to remove metastore server or open
a new metastore server in Hive Client JVM</description>
-</property>
-
-<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:mysql://DBHOSTNAME/hivemetastoredb?createDatabaseIfNotExist=true</value>
<description>JDBC connect string for a JDBC metastore</description>
Modified:
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java
(original)
+++
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestPermsGrp.java
Wed Mar 12 23:03:26 2014
@@ -84,7 +84,6 @@ public class TestPermsGrp extends TestCa
System.setSecurityManager(new NoExitSecurityManager());
hcatConf = new HiveConf(this.getClass());
- hcatConf.set("hive.metastore.local", "false");
hcatConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://127.0.0.1:" +
msPort);
hcatConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3);
hcatConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTFAILURERETRIES, 3);
Modified:
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHiveClientCache.java
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHiveClientCache.java?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHiveClientCache.java
(original)
+++
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/common/TestHiveClientCache.java
Wed Mar 12 23:03:26 2014
@@ -226,7 +226,6 @@ public class TestHiveClientCache {
securityManager = System.getSecurityManager();
System.setSecurityManager(new NoExitSecurityManager());
hiveConf = new HiveConf(TestHiveClientCache.class);
- hiveConf.set("hive.metastore.local", "false");
hiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:"
+ MS_PORT);
hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES,
3);
Modified:
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
(original)
+++
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
Wed Mar 12 23:03:26 2014
@@ -194,7 +194,6 @@ public class TestHCatMultiOutputFormat {
private static void initializeSetup() throws Exception {
hiveConf = new HiveConf(mrConf, TestHCatMultiOutputFormat.class);
- hiveConf.set("hive.metastore.local", "false");
hiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:" +
msPort);
hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3);
hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTFAILURERETRIES, 3);
Modified:
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
(original)
+++
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
Wed Mar 12 23:03:26 2014
@@ -112,7 +112,6 @@ public class TestHCatPartitionPublish {
System.setSecurityManager(new NoExitSecurityManager());
hcatConf = new HiveConf(TestHCatPartitionPublish.class);
- hcatConf.set("hive.metastore.local", "false");
hcatConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:"
+ msPort);
hcatConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3);
Modified:
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestPassProperties.java
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestPassProperties.java?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestPassProperties.java
(original)
+++
hive/trunk/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestPassProperties.java
Wed Mar 12 23:03:26 2014
@@ -91,7 +91,6 @@ public class TestPassProperties {
try {
Configuration conf = new Configuration();
conf.set("hive.metastore.uris", "thrift://no.such.machine:10888");
- conf.set("hive.metastore.local", "false");
Job job = new Job(conf, "Write-hcat-seq-table");
job.setJarByClass(TestPassProperties.class);
Modified:
hive/trunk/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/PigHCatUtil.java
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/PigHCatUtil.java?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/PigHCatUtil.java
(original)
+++
hive/trunk/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/PigHCatUtil.java
Wed Mar 12 23:03:26 2014
@@ -146,7 +146,6 @@ class PigHCatUtil {
HiveConf hiveConf = new HiveConf(clazz);
if (serverUri != null) {
- hiveConf.set("hive.metastore.local", "false");
hiveConf.setVar(HiveConf.ConfVars.METASTOREURIS, serverUri.trim());
}
Modified:
hive/trunk/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestMsgBusConnection.java
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestMsgBusConnection.java?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestMsgBusConnection.java
(original)
+++
hive/trunk/hcatalog/server-extensions/src/test/java/org/apache/hive/hcatalog/listener/TestMsgBusConnection.java
Wed Mar 12 23:03:26 2014
@@ -66,7 +66,6 @@ public class TestMsgBusConnection extend
HiveConf hiveConf = new HiveConf(this.getClass());
hiveConf.set(ConfVars.METASTORE_EVENT_LISTENERS.varname,
NotificationListener.class.getName());
- hiveConf.set("hive.metastore.local", "true");
hiveConf.set(HiveConf.ConfVars.PREEXECHOOKS.varname, "");
hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
Modified:
hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml
(original)
+++
hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml
Wed Mar 12 23:03:26 2014
@@ -155,8 +155,7 @@ ${env.PIG_HOME}/bin/pig
<tr>
<td><strong>templeton.hive.properties</strong></td>
<td>
-<code>hive.metastore.local=false,
-hive.metastore.uris=thrift://localhost:9933,
+<code>hive.metastore.uris=thrift://localhost:9933,
hive.metastore.sasl.enabled=false</code></td>
<td>Properties to set when running hive. To use it in a cluster with
kerberos security enabled set hive.metastore.sasl.enabled=false and add
hive.metastore.execute.setugi=true
Modified:
hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/install.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/install.xml?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/install.xml
(original)
+++ hive/trunk/hcatalog/src/docs/src/documentation/content/xdocs/install.xml
Wed Mar 12 23:03:26 2014
@@ -163,10 +163,6 @@
<th>Value to Set it to</th>
</tr>
<tr>
- <td>hive.metastore.local</td>
- <td>false</td>
- </tr>
- <tr>
<td>javax.jdo.option.ConnectionURL</td>
<td>jdbc:mysql://<em>hostname</em>/hivemetastoredb?createDatabaseIfNotExist=true
where <em>hostname</em> is the name of the machine you installed MySQL on.</td>
</tr>
Modified:
hive/trunk/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
---
hive/trunk/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java
(original)
+++
hive/trunk/hcatalog/webhcat/java-client/src/test/java/org/apache/hive/hcatalog/api/TestHCatClient.java
Wed Mar 12 23:03:26 2014
@@ -90,7 +90,6 @@ public class TestHCatClient {
securityManager = System.getSecurityManager();
System.setSecurityManager(new NoExitSecurityManager());
hcatConf = new HiveConf(TestHCatClient.class);
- hcatConf.set("hive.metastore.local", "false");
hcatConf.setVar(HiveConf.ConfVars.METASTOREURIS, "thrift://localhost:"
+ msPort);
hcatConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3);
Modified: hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml?rev=1576984&r1=1576983&r2=1576984&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml
(original)
+++ hive/trunk/hcatalog/webhcat/svr/src/main/config/webhcat-default.xml Wed Mar
12 23:03:26 2014
@@ -136,7 +136,7 @@
<property>
<name>templeton.hive.properties</name>
-
<value>hive.metastore.local=false,hive.metastore.uris=thrift://localhost:9933,hive.metastore.sasl.enabled=false</value>
+
<value>hive.metastore.uris=thrift://localhost:9933,hive.metastore.sasl.enabled=false</value>
<description>Properties to set when running hive.</description>
</property>