You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2014/03/14 22:17:13 UTC

svn commit: r1577718 - in /hive/branches/branch-0.13: jdbc/src/java/org/apache/hive/jdbc/ service/if/ service/src/gen/thrift/gen-cpp/ service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/ service/src/gen/thrift/gen-py/TCLIService/ ser...

Author: thejas
Date: Fri Mar 14 21:17:12 2014
New Revision: 1577718

URL: http://svn.apache.org/r1577718
Log:
HIVE-6647 : Bump the thrift api version to V7 for HiveServer2 (Prasad Mujumdar via Thejas Nair)

Modified:
    hive/branches/branch-0.13/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
    hive/branches/branch-0.13/service/if/TCLIService.thrift
    hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp
    hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.h
    hive/branches/branch-0.13/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java
    hive/branches/branch-0.13/service/src/gen/thrift/gen-py/TCLIService/ttypes.py
    hive/branches/branch-0.13/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb

Modified: hive/branches/branch-0.13/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java?rev=1577718&r1=1577717&r2=1577718&view=diff
==============================================================================
--- hive/branches/branch-0.13/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java (original)
+++ hive/branches/branch-0.13/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java Fri Mar 14 21:17:12 2014
@@ -188,6 +188,7 @@ public class HiveConnection implements j
     supportedProtocols.add(TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V4);
     supportedProtocols.add(TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V5);
     supportedProtocols.add(TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V6);
+    supportedProtocols.add(TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V7);
 
     // open client session
     openSession(connParams.getSessionVars());

Modified: hive/branches/branch-0.13/service/if/TCLIService.thrift
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/service/if/TCLIService.thrift?rev=1577718&r1=1577717&r2=1577718&view=diff
==============================================================================
--- hive/branches/branch-0.13/service/if/TCLIService.thrift (original)
+++ hive/branches/branch-0.13/service/if/TCLIService.thrift Fri Mar 14 21:17:12 2014
@@ -54,6 +54,9 @@ enum TProtocolVersion {
 
   // V6 uses binary type for binary payload (was string) and uses columnar result set
   HIVE_CLI_SERVICE_PROTOCOL_V6
+
+  // V7 adds support for delegation token based connection
+  HIVE_CLI_SERVICE_PROTOCOL_V7
 }
 
 enum TTypeId {

Modified: hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp?rev=1577718&r1=1577717&r2=1577718&view=diff
==============================================================================
--- hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp (original)
+++ hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp Fri Mar 14 21:17:12 2014
@@ -16,7 +16,8 @@ int _kTProtocolVersionValues[] = {
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V3,
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V4,
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V5,
-  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V6
+  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V6,
+  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V7
 };
 const char* _kTProtocolVersionNames[] = {
   "HIVE_CLI_SERVICE_PROTOCOL_V1",
@@ -24,9 +25,10 @@ const char* _kTProtocolVersionNames[] = 
   "HIVE_CLI_SERVICE_PROTOCOL_V3",
   "HIVE_CLI_SERVICE_PROTOCOL_V4",
   "HIVE_CLI_SERVICE_PROTOCOL_V5",
-  "HIVE_CLI_SERVICE_PROTOCOL_V6"
+  "HIVE_CLI_SERVICE_PROTOCOL_V6",
+  "HIVE_CLI_SERVICE_PROTOCOL_V7"
 };
-const std::map<int, const char*> _TProtocolVersion_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kTProtocolVersionValues, _kTProtocolVersionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _TProtocolVersion_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kTProtocolVersionValues, _kTProtocolVersionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
 int _kTTypeIdValues[] = {
   TTypeId::BOOLEAN_TYPE,

Modified: hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.h
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.h?rev=1577718&r1=1577717&r2=1577718&view=diff
==============================================================================
--- hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.h (original)
+++ hive/branches/branch-0.13/service/src/gen/thrift/gen-cpp/TCLIService_types.h Fri Mar 14 21:17:12 2014
@@ -23,7 +23,8 @@ struct TProtocolVersion {
     HIVE_CLI_SERVICE_PROTOCOL_V3 = 2,
     HIVE_CLI_SERVICE_PROTOCOL_V4 = 3,
     HIVE_CLI_SERVICE_PROTOCOL_V5 = 4,
-    HIVE_CLI_SERVICE_PROTOCOL_V6 = 5
+    HIVE_CLI_SERVICE_PROTOCOL_V6 = 5,
+    HIVE_CLI_SERVICE_PROTOCOL_V7 = 6
   };
 };
 

Modified: hive/branches/branch-0.13/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java?rev=1577718&r1=1577717&r2=1577718&view=diff
==============================================================================
--- hive/branches/branch-0.13/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java (original)
+++ hive/branches/branch-0.13/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java Fri Mar 14 21:17:12 2014
@@ -17,7 +17,8 @@ public enum TProtocolVersion implements 
   HIVE_CLI_SERVICE_PROTOCOL_V3(2),
   HIVE_CLI_SERVICE_PROTOCOL_V4(3),
   HIVE_CLI_SERVICE_PROTOCOL_V5(4),
-  HIVE_CLI_SERVICE_PROTOCOL_V6(5);
+  HIVE_CLI_SERVICE_PROTOCOL_V6(5),
+  HIVE_CLI_SERVICE_PROTOCOL_V7(6);
 
   private final int value;
 
@@ -50,6 +51,8 @@ public enum TProtocolVersion implements 
         return HIVE_CLI_SERVICE_PROTOCOL_V5;
       case 5:
         return HIVE_CLI_SERVICE_PROTOCOL_V6;
+      case 6:
+        return HIVE_CLI_SERVICE_PROTOCOL_V7;
       default:
         return null;
     }

Modified: hive/branches/branch-0.13/service/src/gen/thrift/gen-py/TCLIService/ttypes.py
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/service/src/gen/thrift/gen-py/TCLIService/ttypes.py?rev=1577718&r1=1577717&r2=1577718&view=diff
==============================================================================
--- hive/branches/branch-0.13/service/src/gen/thrift/gen-py/TCLIService/ttypes.py (original)
+++ hive/branches/branch-0.13/service/src/gen/thrift/gen-py/TCLIService/ttypes.py Fri Mar 14 21:17:12 2014
@@ -23,6 +23,7 @@ class TProtocolVersion:
   HIVE_CLI_SERVICE_PROTOCOL_V4 = 3
   HIVE_CLI_SERVICE_PROTOCOL_V5 = 4
   HIVE_CLI_SERVICE_PROTOCOL_V6 = 5
+  HIVE_CLI_SERVICE_PROTOCOL_V7 = 6
 
   _VALUES_TO_NAMES = {
     0: "HIVE_CLI_SERVICE_PROTOCOL_V1",
@@ -31,6 +32,7 @@ class TProtocolVersion:
     3: "HIVE_CLI_SERVICE_PROTOCOL_V4",
     4: "HIVE_CLI_SERVICE_PROTOCOL_V5",
     5: "HIVE_CLI_SERVICE_PROTOCOL_V6",
+    6: "HIVE_CLI_SERVICE_PROTOCOL_V7",
   }
 
   _NAMES_TO_VALUES = {
@@ -40,6 +42,7 @@ class TProtocolVersion:
     "HIVE_CLI_SERVICE_PROTOCOL_V4": 3,
     "HIVE_CLI_SERVICE_PROTOCOL_V5": 4,
     "HIVE_CLI_SERVICE_PROTOCOL_V6": 5,
+    "HIVE_CLI_SERVICE_PROTOCOL_V7": 6,
   }
 
 class TTypeId:

Modified: hive/branches/branch-0.13/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb?rev=1577718&r1=1577717&r2=1577718&view=diff
==============================================================================
--- hive/branches/branch-0.13/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb (original)
+++ hive/branches/branch-0.13/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb Fri Mar 14 21:17:12 2014
@@ -13,8 +13,9 @@ module TProtocolVersion
   HIVE_CLI_SERVICE_PROTOCOL_V4 = 3
   HIVE_CLI_SERVICE_PROTOCOL_V5 = 4
   HIVE_CLI_SERVICE_PROTOCOL_V6 = 5
-  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"}
-  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]).freeze
+  HIVE_CLI_SERVICE_PROTOCOL_V7 = 6
+  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"}
+  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]).freeze
 end
 
 module TTypeId