hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From the...@apache.org
Subject hive git commit: HIVE-15906 : thrift code regeneration to include new protocol version (Anishek Agarwal via Thejas Nair)
Date Tue, 14 Feb 2017 17:49:44 GMT
Repository: hive
Updated Branches:
  refs/heads/master 3491c3973 -> d76c774a7


HIVE-15906 : thrift code regeneration to include new protocol version (Anishek Agarwal via
Thejas Nair)


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

Branch: refs/heads/master
Commit: d76c774a7db5eecc79a66432c886a9d0d2189dac
Parents: 3491c39
Author: Anishek Agarwal <anishek@gmail.com>
Authored: Tue Feb 14 09:49:36 2017 -0800
Committer: Thejas M Nair <thejas@hortonworks.com>
Committed: Tue Feb 14 09:49:41 2017 -0800

----------------------------------------------------------------------
 jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java   |  1 +
 service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp |  8 +++++---
 service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h   | 11 ++++++-----
 .../apache/hive/service/rpc/thrift/TOpenSessionReq.java  |  4 ++--
 .../apache/hive/service/rpc/thrift/TOpenSessionResp.java |  4 ++--
 .../apache/hive/service/rpc/thrift/TProtocolVersion.java |  5 ++++-
 service-rpc/src/gen/thrift/gen-php/Types.php             |  6 ++++--
 service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py  |  7 +++++--
 .../src/gen/thrift/gen-rb/t_c_l_i_service_types.rb       |  9 +++++----
 9 files changed, 34 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
----------------------------------------------------------------------
diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
index 5b71cde..535ad3d 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
@@ -168,6 +168,7 @@ public class HiveConnection implements java.sql.Connection {
     supportedProtocols.add(TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V7);
     supportedProtocols.add(TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V8);
     supportedProtocols.add(TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V9);
+    supportedProtocols.add(TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V10);
 
     if (isEmbeddedMode) {
       EmbeddedThriftBinaryCLIService embeddedClient = new EmbeddedThriftBinaryCLIService();

http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp
index 0a17e0e..b6995c4 100644
--- a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp
+++ b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.cpp
@@ -22,7 +22,8 @@ int _kTProtocolVersionValues[] = {
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V6,
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V7,
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V8,
-  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V9
+  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V9,
+  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V10
 };
 const char* _kTProtocolVersionNames[] = {
   "HIVE_CLI_SERVICE_PROTOCOL_V1",
@@ -33,9 +34,10 @@ const char* _kTProtocolVersionNames[] = {
   "HIVE_CLI_SERVICE_PROTOCOL_V6",
   "HIVE_CLI_SERVICE_PROTOCOL_V7",
   "HIVE_CLI_SERVICE_PROTOCOL_V8",
-  "HIVE_CLI_SERVICE_PROTOCOL_V9"
+  "HIVE_CLI_SERVICE_PROTOCOL_V9",
+  "HIVE_CLI_SERVICE_PROTOCOL_V10"
 };
-const std::map<int, const char*> _TProtocolVersion_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(9,
_kTProtocolVersionValues, _kTProtocolVersionNames), ::apache::thrift::TEnumIterator(-1, NULL,
NULL));
+const std::map<int, const char*> _TProtocolVersion_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(10,
_kTProtocolVersionValues, _kTProtocolVersionNames), ::apache::thrift::TEnumIterator(-1, NULL,
NULL));
 
 int _kTTypeIdValues[] = {
   TTypeId::BOOLEAN_TYPE,

http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h
index 6c2bb34..8accf66 100644
--- a/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h
+++ b/service-rpc/src/gen/thrift/gen-cpp/TCLIService_types.h
@@ -29,7 +29,8 @@ struct TProtocolVersion {
     HIVE_CLI_SERVICE_PROTOCOL_V6 = 5,
     HIVE_CLI_SERVICE_PROTOCOL_V7 = 6,
     HIVE_CLI_SERVICE_PROTOCOL_V8 = 7,
-    HIVE_CLI_SERVICE_PROTOCOL_V9 = 8
+    HIVE_CLI_SERVICE_PROTOCOL_V9 = 8,
+    HIVE_CLI_SERVICE_PROTOCOL_V10 = 9
   };
 };
 
@@ -2141,8 +2142,8 @@ class TOpenSessionReq {
 
   TOpenSessionReq(const TOpenSessionReq&);
   TOpenSessionReq& operator=(const TOpenSessionReq&);
-  TOpenSessionReq() : client_protocol((TProtocolVersion::type)8), username(), password()
{
-    client_protocol = (TProtocolVersion::type)8;
+  TOpenSessionReq() : client_protocol((TProtocolVersion::type)9), username(), password()
{
+    client_protocol = (TProtocolVersion::type)9;
 
   }
 
@@ -2211,8 +2212,8 @@ class TOpenSessionResp {
 
   TOpenSessionResp(const TOpenSessionResp&);
   TOpenSessionResp& operator=(const TOpenSessionResp&);
-  TOpenSessionResp() : serverProtocolVersion((TProtocolVersion::type)8) {
-    serverProtocolVersion = (TProtocolVersion::type)8;
+  TOpenSessionResp() : serverProtocolVersion((TProtocolVersion::type)9) {
+    serverProtocolVersion = (TProtocolVersion::type)9;
 
   }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java
b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java
index 18937d9..e47abbb 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionReq.java
@@ -145,7 +145,7 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
   }
 
   public TOpenSessionReq() {
-    this.client_protocol = org.apache.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V9;
+    this.client_protocol = org.apache.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V10;
 
   }
 
@@ -181,7 +181,7 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
 
   @Override
   public void clear() {
-    this.client_protocol = org.apache.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V9;
+    this.client_protocol = org.apache.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V10;
 
     this.username = null;
     this.password = null;

http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java
b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java
index 0a3c121..ee1c87b 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TOpenSessionResp.java
@@ -145,7 +145,7 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
   }
 
   public TOpenSessionResp() {
-    this.serverProtocolVersion = org.apache.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V9;
+    this.serverProtocolVersion = org.apache.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V10;
 
   }
 
@@ -184,7 +184,7 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
   @Override
   public void clear() {
     this.status = null;
-    this.serverProtocolVersion = org.apache.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V9;
+    this.serverProtocolVersion = org.apache.hive.service.rpc.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V10;
 
     this.sessionHandle = null;
     this.configuration = null;

http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java
b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java
index bce2a0c..18a7825 100644
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java
+++ b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TProtocolVersion.java
@@ -20,7 +20,8 @@ public enum TProtocolVersion implements org.apache.thrift.TEnum {
   HIVE_CLI_SERVICE_PROTOCOL_V6(5),
   HIVE_CLI_SERVICE_PROTOCOL_V7(6),
   HIVE_CLI_SERVICE_PROTOCOL_V8(7),
-  HIVE_CLI_SERVICE_PROTOCOL_V9(8);
+  HIVE_CLI_SERVICE_PROTOCOL_V9(8),
+  HIVE_CLI_SERVICE_PROTOCOL_V10(9);
 
   private final int value;
 
@@ -59,6 +60,8 @@ public enum TProtocolVersion implements org.apache.thrift.TEnum {
         return HIVE_CLI_SERVICE_PROTOCOL_V8;
       case 8:
         return HIVE_CLI_SERVICE_PROTOCOL_V9;
+      case 9:
+        return HIVE_CLI_SERVICE_PROTOCOL_V10;
       default:
         return null;
     }

http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/service-rpc/src/gen/thrift/gen-php/Types.php
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-php/Types.php b/service-rpc/src/gen/thrift/gen-php/Types.php
index 29b14d9..ee5acd2 100644
--- a/service-rpc/src/gen/thrift/gen-php/Types.php
+++ b/service-rpc/src/gen/thrift/gen-php/Types.php
@@ -25,6 +25,7 @@ final class TProtocolVersion {
   const HIVE_CLI_SERVICE_PROTOCOL_V7 = 6;
   const HIVE_CLI_SERVICE_PROTOCOL_V8 = 7;
   const HIVE_CLI_SERVICE_PROTOCOL_V9 = 8;
+  const HIVE_CLI_SERVICE_PROTOCOL_V10 = 9;
   static public $__names = array(
     0 => 'HIVE_CLI_SERVICE_PROTOCOL_V1',
     1 => 'HIVE_CLI_SERVICE_PROTOCOL_V2',
@@ -35,6 +36,7 @@ final class TProtocolVersion {
     6 => 'HIVE_CLI_SERVICE_PROTOCOL_V7',
     7 => 'HIVE_CLI_SERVICE_PROTOCOL_V8',
     8 => 'HIVE_CLI_SERVICE_PROTOCOL_V9',
+    9 => 'HIVE_CLI_SERVICE_PROTOCOL_V10',
   );
 }
 
@@ -4521,7 +4523,7 @@ class TOpenSessionReq {
   /**
    * @var int
    */
-  public $client_protocol =   8;
+  public $client_protocol =   9;
   /**
    * @var string
    */
@@ -4703,7 +4705,7 @@ class TOpenSessionResp {
   /**
    * @var int
    */
-  public $serverProtocolVersion =   8;
+  public $serverProtocolVersion =   9;
   /**
    * @var \TSessionHandle
    */

http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py b/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py
index 4ed2091..e9faa2a 100644
--- a/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py
+++ b/service-rpc/src/gen/thrift/gen-py/TCLIService/ttypes.py
@@ -26,6 +26,7 @@ class TProtocolVersion:
   HIVE_CLI_SERVICE_PROTOCOL_V7 = 6
   HIVE_CLI_SERVICE_PROTOCOL_V8 = 7
   HIVE_CLI_SERVICE_PROTOCOL_V9 = 8
+  HIVE_CLI_SERVICE_PROTOCOL_V10 = 9
 
   _VALUES_TO_NAMES = {
     0: "HIVE_CLI_SERVICE_PROTOCOL_V1",
@@ -37,6 +38,7 @@ class TProtocolVersion:
     6: "HIVE_CLI_SERVICE_PROTOCOL_V7",
     7: "HIVE_CLI_SERVICE_PROTOCOL_V8",
     8: "HIVE_CLI_SERVICE_PROTOCOL_V9",
+    9: "HIVE_CLI_SERVICE_PROTOCOL_V10",
   }
 
   _NAMES_TO_VALUES = {
@@ -49,6 +51,7 @@ class TProtocolVersion:
     "HIVE_CLI_SERVICE_PROTOCOL_V7": 6,
     "HIVE_CLI_SERVICE_PROTOCOL_V8": 7,
     "HIVE_CLI_SERVICE_PROTOCOL_V9": 8,
+    "HIVE_CLI_SERVICE_PROTOCOL_V10": 9,
   }
 
 class TTypeId:
@@ -3520,7 +3523,7 @@ class TOpenSessionReq:
 
   thrift_spec = (
     None, # 0
-    (1, TType.I32, 'client_protocol', None,     8, ), # 1
+    (1, TType.I32, 'client_protocol', None,     9, ), # 1
     (2, TType.STRING, 'username', None, None, ), # 2
     (3, TType.STRING, 'password', None, None, ), # 3
     (4, TType.MAP, 'configuration', (TType.STRING,None,TType.STRING,None), None, ), # 4
@@ -3637,7 +3640,7 @@ class TOpenSessionResp:
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'status', (TStatus, TStatus.thrift_spec), None, ), # 1
-    (2, TType.I32, 'serverProtocolVersion', None,     8, ), # 2
+    (2, TType.I32, 'serverProtocolVersion', None,     9, ), # 2
     (3, TType.STRUCT, 'sessionHandle', (TSessionHandle, TSessionHandle.thrift_spec), None,
), # 3
     (4, TType.MAP, 'configuration', (TType.STRING,None,TType.STRING,None), None, ), # 4
   )

http://git-wip-us.apache.org/repos/asf/hive/blob/d76c774a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb b/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
index c536a8a..714309c 100644
--- a/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
+++ b/service-rpc/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
@@ -16,8 +16,9 @@ module TProtocolVersion
   HIVE_CLI_SERVICE_PROTOCOL_V7 = 6
   HIVE_CLI_SERVICE_PROTOCOL_V8 = 7
   HIVE_CLI_SERVICE_PROTOCOL_V9 = 8
-  VALUE_MAP = {0 => "HIVE_CLI_SERVICE_PROTOCOL_V1", 1 => "HIVE_CLI_SERVICE_PROTOCOL_V2",
2 => "HIVE_CLI_SERVICE_PROTOCOL_V3", 3 => "HIVE_CLI_SERVICE_PROTOCOL_V4", 4 => "HIVE_CLI_SERVICE_PROTOCOL_V5",
5 => "HIVE_CLI_SERVICE_PROTOCOL_V6", 6 => "HIVE_CLI_SERVICE_PROTOCOL_V7", 7 => "HIVE_CLI_SERVICE_PROTOCOL_V8",
8 => "HIVE_CLI_SERVICE_PROTOCOL_V9"}
-  VALID_VALUES = Set.new([HIVE_CLI_SERVICE_PROTOCOL_V1, HIVE_CLI_SERVICE_PROTOCOL_V2, HIVE_CLI_SERVICE_PROTOCOL_V3,
HIVE_CLI_SERVICE_PROTOCOL_V4, HIVE_CLI_SERVICE_PROTOCOL_V5, HIVE_CLI_SERVICE_PROTOCOL_V6,
HIVE_CLI_SERVICE_PROTOCOL_V7, HIVE_CLI_SERVICE_PROTOCOL_V8, HIVE_CLI_SERVICE_PROTOCOL_V9]).freeze
+  HIVE_CLI_SERVICE_PROTOCOL_V10 = 9
+  VALUE_MAP = {0 => "HIVE_CLI_SERVICE_PROTOCOL_V1", 1 => "HIVE_CLI_SERVICE_PROTOCOL_V2",
2 => "HIVE_CLI_SERVICE_PROTOCOL_V3", 3 => "HIVE_CLI_SERVICE_PROTOCOL_V4", 4 => "HIVE_CLI_SERVICE_PROTOCOL_V5",
5 => "HIVE_CLI_SERVICE_PROTOCOL_V6", 6 => "HIVE_CLI_SERVICE_PROTOCOL_V7", 7 => "HIVE_CLI_SERVICE_PROTOCOL_V8",
8 => "HIVE_CLI_SERVICE_PROTOCOL_V9", 9 => "HIVE_CLI_SERVICE_PROTOCOL_V10"}
+  VALID_VALUES = Set.new([HIVE_CLI_SERVICE_PROTOCOL_V1, HIVE_CLI_SERVICE_PROTOCOL_V2, HIVE_CLI_SERVICE_PROTOCOL_V3,
HIVE_CLI_SERVICE_PROTOCOL_V4, HIVE_CLI_SERVICE_PROTOCOL_V5, HIVE_CLI_SERVICE_PROTOCOL_V6,
HIVE_CLI_SERVICE_PROTOCOL_V7, HIVE_CLI_SERVICE_PROTOCOL_V8, HIVE_CLI_SERVICE_PROTOCOL_V9,
HIVE_CLI_SERVICE_PROTOCOL_V10]).freeze
 end
 
 module TTypeId
@@ -964,7 +965,7 @@ class TOpenSessionReq
   CONFIGURATION = 4
 
   FIELDS = {
-    CLIENT_PROTOCOL => {:type => ::Thrift::Types::I32, :name => 'client_protocol',
:default =>     8, :enum_class => ::TProtocolVersion},
+    CLIENT_PROTOCOL => {:type => ::Thrift::Types::I32, :name => 'client_protocol',
:default =>     9, :enum_class => ::TProtocolVersion},
     USERNAME => {:type => ::Thrift::Types::STRING, :name => 'username', :optional
=> true},
     PASSWORD => {:type => ::Thrift::Types::STRING, :name => 'password', :optional
=> true},
     CONFIGURATION => {:type => ::Thrift::Types::MAP, :name => 'configuration', :key
=> {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING},
:optional => true}
@@ -991,7 +992,7 @@ class TOpenSessionResp
 
   FIELDS = {
     STATUS => {:type => ::Thrift::Types::STRUCT, :name => 'status', :class =>
::TStatus},
-    SERVERPROTOCOLVERSION => {:type => ::Thrift::Types::I32, :name => 'serverProtocolVersion',
:default =>     8, :enum_class => ::TProtocolVersion},
+    SERVERPROTOCOLVERSION => {:type => ::Thrift::Types::I32, :name => 'serverProtocolVersion',
:default =>     9, :enum_class => ::TProtocolVersion},
     SESSIONHANDLE => {:type => ::Thrift::Types::STRUCT, :name => 'sessionHandle',
:class => ::TSessionHandle, :optional => true},
     CONFIGURATION => {:type => ::Thrift::Types::MAP, :name => 'configuration', :key
=> {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING},
:optional => true}
   }


Mime
View raw message