You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by px...@apache.org on 2015/09/02 01:26:15 UTC

[1/3] hive git commit: HIVE-10571 : HiveMetaStoreClient should close existing thrift connection before its reconnect (Chaoyu Tang via Szehon)

Repository: hive
Updated Branches:
  refs/heads/branch-1.2 97befb75b -> 7a3e79fc0


HIVE-10571 : HiveMetaStoreClient should close existing thrift connection before its reconnect (Chaoyu Tang via Szehon)


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

Branch: refs/heads/branch-1.2
Commit: 37e1f833ea1aece3b1e744e6d6db55fdb1514573
Parents: 97befb7
Author: Szehon Ho <sz...@cloudera.com>
Authored: Mon May 4 11:20:36 2015 -0700
Committer: Pengcheng Xiong <px...@apache.org>
Committed: Tue Sep 1 16:20:21 2015 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/37e1f833/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
index 41b4ea0..4891d42 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -308,6 +308,7 @@ public class HiveMetaStoreClient implements IMetaStoreClient {
       throw new MetaException("For direct MetaStore DB connections, we don't support retries" +
           " at the client level.");
     } else {
+      close();
       // Swap the first element of the metastoreUris[] with a random element from the rest
       // of the array. Rationale being that this method will generally be called when the default
       // connection has died and the default connection is likely to be the first array element.
@@ -492,7 +493,7 @@ public class HiveMetaStoreClient implements IMetaStoreClient {
         client.shutdown();
       }
     } catch (TException e) {
-      LOG.error("Unable to shutdown local metastore client", e);
+      LOG.debug("Unable to shutdown metastore client. Will try closing transport directly.", e);
     }
     // Transport would have got closed via client.shutdown(), so we dont need this, but
     // just in case, we make this call.


[2/3] hive git commit: HIVE-10646 : ColumnValue does not handle NULL_TYPE (Yongzhi Chen via Szehon)

Posted by px...@apache.org.
HIVE-10646 : ColumnValue does not handle NULL_TYPE (Yongzhi Chen via Szehon)


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

Branch: refs/heads/branch-1.2
Commit: b9a446485d1ab9b40426b4948ceb3ab531133617
Parents: 37e1f83
Author: Szehon Ho <sz...@cloudera.com>
Authored: Sun May 10 22:21:15 2015 -0500
Committer: Pengcheng Xiong <px...@apache.org>
Committed: Tue Sep 1 16:20:37 2015 -0700

----------------------------------------------------------------------
 service/src/java/org/apache/hive/service/cli/ColumnValue.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/b9a44648/service/src/java/org/apache/hive/service/cli/ColumnValue.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/cli/ColumnValue.java b/service/src/java/org/apache/hive/service/cli/ColumnValue.java
index 40144cf..662bd93 100644
--- a/service/src/java/org/apache/hive/service/cli/ColumnValue.java
+++ b/service/src/java/org/apache/hive/service/cli/ColumnValue.java
@@ -202,6 +202,8 @@ public class ColumnValue {
     case UNION_TYPE:
     case USER_DEFINED_TYPE:
       return stringValue((String)value);
+    case NULL_TYPE:
+      return stringValue((String)value);
     default:
       return null;
     }


[3/3] hive git commit: HIVE-9566: HiveServer2 fails to start with NullPointerException (Na via Xuefu)

Posted by px...@apache.org.
HIVE-9566: HiveServer2 fails to start with NullPointerException (Na via Xuefu)


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

Branch: refs/heads/branch-1.2
Commit: 7a3e79fc0f7991f8132137087a4280bae30f158b
Parents: b9a4464
Author: Xuefu Zhang <xz...@Cloudera.com>
Authored: Tue Jun 30 05:15:40 2015 -0700
Committer: Pengcheng Xiong <px...@apache.org>
Committed: Tue Sep 1 16:20:49 2015 -0700

----------------------------------------------------------------------
 .../src/java/org/apache/hive/service/server/HiveServer2.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/7a3e79fc/service/src/java/org/apache/hive/service/server/HiveServer2.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/server/HiveServer2.java b/service/src/java/org/apache/hive/service/server/HiveServer2.java
index 58e8e49..06c12b8 100644
--- a/service/src/java/org/apache/hive/service/server/HiveServer2.java
+++ b/service/src/java/org/apache/hive/service/server/HiveServer2.java
@@ -306,7 +306,7 @@ public class HiveServer2 extends CompositeService {
     HiveConf hiveConf = this.getHiveConf();
     super.stop();
     // Remove this server instance from ZooKeeper if dynamic service discovery is set
-    if (hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_SUPPORT_DYNAMIC_SERVICE_DISCOVERY)) {
+    if (hiveConf != null && hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_SUPPORT_DYNAMIC_SERVICE_DISCOVERY)) {
       try {
         removeServerInstanceFromZooKeeper();
       } catch (Exception e) {
@@ -315,7 +315,7 @@ public class HiveServer2 extends CompositeService {
     }
     // There should already be an instance of the session pool manager.
     // If not, ignoring is fine while stopping HiveServer2.
-    if (hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_TEZ_INITIALIZE_DEFAULT_SESSIONS)) {
+    if (hiveConf != null && hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_TEZ_INITIALIZE_DEFAULT_SESSIONS)) {
       try {
         TezSessionPoolManager.getInstance().stop();
       } catch (Exception e) {
@@ -324,7 +324,7 @@ public class HiveServer2 extends CompositeService {
       }
     }
 
-    if (hiveConf.getVar(ConfVars.HIVE_EXECUTION_ENGINE).equals("spark")) {
+    if (hiveConf != null && hiveConf.getVar(ConfVars.HIVE_EXECUTION_ENGINE).equals("spark")) {
       try {
         SparkSessionManagerImpl.getInstance().shutdown();
       } catch(Exception ex) {