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/25 05:50:15 UTC

[1/2] 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.0 2801d2c4b -> 0bb08b3cd


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/7bc067a6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7bc067a6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7bc067a6

Branch: refs/heads/branch-1.0
Commit: 7bc067a64802fbaa72996e8ef41e2134d71c5c14
Parents: 2801d2c
Author: Szehon Ho <sz...@cloudera.com>
Authored: Mon May 4 11:20:36 2015 -0700
Committer: Pengcheng Xiong <px...@apache.org>
Committed: Thu Sep 24 20:40:01 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/7bc067a6/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 abfdfb1..3c4d814 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -263,6 +263,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.
@@ -436,7 +437,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/2] 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/0bb08b3c
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0bb08b3c
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0bb08b3c

Branch: refs/heads/branch-1.0
Commit: 0bb08b3cd86b9ddb3085552e3693d6e874efb1da
Parents: 7bc067a
Author: Szehon Ho <sz...@cloudera.com>
Authored: Sun May 10 22:21:15 2015 -0500
Committer: Pengcheng Xiong <px...@apache.org>
Committed: Thu Sep 24 20:40:53 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/0bb08b3c/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 9b48396..d383180 100644
--- a/service/src/java/org/apache/hive/service/cli/ColumnValue.java
+++ b/service/src/java/org/apache/hive/service/cli/ColumnValue.java
@@ -180,6 +180,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;
     }