Author: hashutosh
Date: Wed Jul 10 08:46:04 2013
New Revision: 1501675
URL: http://svn.apache.org/r1501675
Log:
HIVE-4807 : Hive metastore hangs (Sarvesh Sakalanaga via Ashutosh Chauhan)
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/ivy/libraries.properties
hive/trunk/jdbc/build.xml
hive/trunk/metastore/ivy.xml
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL:
http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1501675&r1=1501674&r2=1501675&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
(original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Wed
Jul 10 08:46:04 2013
@@ -314,7 +314,7 @@ public class HiveConf extends Configurat
METASTORE_CLUSTER_DELEGATION_TOKEN_STORE_ZK_ACL(
"hive.cluster.delegation.token.store.zookeeper.acl", ""),
METASTORE_CACHE_PINOBJTYPES("hive.metastore.cache.pinobjtypes",
"Table,StorageDescriptor,SerDeInfo,Partition,Database,Type,FieldSchema,Order"),
- METASTORE_CONNECTION_POOLING_TYPE("datanucleus.connectionPoolingType",
"DBCP"),
+ METASTORE_CONNECTION_POOLING_TYPE("datanucleus.connectionPoolingType",
"BONECP"),
METASTORE_VALIDATE_TABLES("datanucleus.validateTables", false),
METASTORE_VALIDATE_COLUMNS("datanucleus.validateColumns", false),
METASTORE_VALIDATE_CONSTRAINTS("datanucleus.validateConstraints", false),
Modified: hive/trunk/ivy/libraries.properties
URL:
http://svn.apache.org/viewvc/hive/trunk/ivy/libraries.properties?rev=1501675&r1=1501674&r2=1501675&view=diff
==============================================================================
--- hive/trunk/ivy/libraries.properties (original)
+++ hive/trunk/ivy/libraries.properties Wed Jul 10 08:46:04 2013
@@ -30,12 +30,12 @@ datanucleus-enhancer.version=2.0.3
datanucleus-rdbms.version=2.0.3
checkstyle.version=5.0
findbugs.version=1.3.9
+BoneCP.version=0.7.1.RELEASE
commons-cli.version=1.2
commons-codec.version=1.4
commons-collections.version=3.2.1
commons-compress.version=1.4.1
commons-configuration.version=1.6
-commons-dbcp.version=1.4
commons-httpclient.version=3.0.1
commons-io.version=2.4
commons-lang.version=2.4
Modified: hive/trunk/jdbc/build.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/jdbc/build.xml?rev=1501675&r1=1501674&r2=1501675&view=diff
==============================================================================
--- hive/trunk/jdbc/build.xml (original)
+++ hive/trunk/jdbc/build.xml Wed Jul 10 08:46:04 2013
@@ -33,7 +33,8 @@
<fileset dir="${test.src.data.dir}" includes="files/*.jar"/>
<fileset dir="${hive.root}" includes="testlibs/*.jar"/>
<pathelement location="${build.dir.hive}/ql/test/classes"/>
- <fileset dir="${hive.root}/build/ivy/lib/hadoop0.${hadoop.mr.rev}.shim"
includes="*.jar" />
+ <fileset dir="${build.ivy.lib.dir}" includes="default/*.jar"/>
+ <fileset dir="${hive.root}/build/ivy/lib/hadoop0.${hadoop.mr.rev}.shim"
includes="*.jar" />
<path refid="classpath" />
</distinctelementsclasspath>
</target>
Modified: hive/trunk/metastore/ivy.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/metastore/ivy.xml?rev=1501675&r1=1501674&r2=1501675&view=diff
==============================================================================
--- hive/trunk/metastore/ivy.xml (original)
+++ hive/trunk/metastore/ivy.xml Wed Jul 10 08:46:04 2013
@@ -31,10 +31,7 @@
<dependency org="org.antlr" name="ST4" rev="${ST4.version}"
transitive="false"/><!-- manually added (antlr dep), bad POM -->
<dependency org="org.apache.hive" name="hive-serde" rev="${version}"
conf="compile->default" />
- <dependency org="commons-dbcp" name="commons-dbcp"
rev="${commons-dbcp.version}">
- <exclude module="commons-pool" />
- <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
- </dependency>
+ <dependency org="com.jolbox" name="bonecp" rev="${BoneCP.version}"/>
<dependency org="commons-pool" name="commons-pool"
rev="${commons-pool.version}"/>
<dependency org="org.datanucleus" name="datanucleus-connectionpool"
rev="${datanucleus-connectionpool.version}"
transitive="false"/>
