hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1672173 [8/8] - in /hive/branches/cbo: ./ cli/src/java/org/apache/hadoop/hive/cli/ cli/src/test/org/apache/hadoop/hive/cli/ common/ common/src/java/org/apache/hadoop/hive/common/jsonexplain/ common/src/java/org/apache/hadoop/hive/conf/ hca...
Date Wed, 08 Apr 2015 20:49:47 GMT
Modified: hive/branches/cbo/service/if/TCLIService.thrift
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/if/TCLIService.thrift?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/if/TCLIService.thrift (original)
+++ hive/branches/cbo/service/if/TCLIService.thrift Wed Apr  8 20:49:44 2015
@@ -57,6 +57,9 @@ enum TProtocolVersion {
 
   // V7 adds support for delegation token based connection
   HIVE_CLI_SERVICE_PROTOCOL_V7
+
+  // V8 adds support for interval types
+  HIVE_CLI_SERVICE_PROTOCOL_V8
 }
 
 enum TTypeId {
@@ -79,7 +82,9 @@ enum TTypeId {
   NULL_TYPE,
   DATE_TYPE,
   VARCHAR_TYPE,
-  CHAR_TYPE
+  CHAR_TYPE,
+  INTERVAL_YEAR_MONTH_TYPE,
+  INTERVAL_DAY_TIME_TYPE
 }
   
 const set<TTypeId> PRIMITIVE_TYPES = [
@@ -97,7 +102,9 @@ const set<TTypeId> PRIMITIVE_TYPES = [
   TTypeId.NULL_TYPE,
   TTypeId.DATE_TYPE,
   TTypeId.VARCHAR_TYPE,
-  TTypeId.CHAR_TYPE
+  TTypeId.CHAR_TYPE,
+  TTypeId.INTERVAL_YEAR_MONTH_TYPE,
+  TTypeId.INTERVAL_DAY_TIME_TYPE
 ]
 
 const set<TTypeId> COMPLEX_TYPES = [
@@ -133,6 +140,8 @@ const map<TTypeId,string> TYPE_NAMES = {
   TTypeId.DATE_TYPE: "DATE"
   TTypeId.VARCHAR_TYPE: "VARCHAR"
   TTypeId.CHAR_TYPE: "CHAR"
+  TTypeId.INTERVAL_YEAR_MONTH_TYPE: "INTERVAL_YEAR_MONTH"
+  TTypeId.INTERVAL_DAY_TIME_TYPE: "INTERVAL_DAY_TIME"
 }
 
 // Thrift does not support recursively defined types or forward declarations,
@@ -323,7 +332,7 @@ union TColumnValue {
   4: TI32Value    i32Val       // INT
   5: TI64Value    i64Val       // BIGINT, TIMESTAMP
   6: TDoubleValue doubleVal    // FLOAT, DOUBLE
-  7: TStringValue stringVal    // STRING, LIST, MAP, STRUCT, UNIONTYPE, BINARY, DECIMAL, NULL
+  7: TStringValue stringVal    // STRING, LIST, MAP, STRUCT, UNIONTYPE, BINARY, DECIMAL, NULL, INTERVAL_YEAR_MONTH, INTERVAL_DAY_TIME
 }
 
 // Represents a row in a rowset.
@@ -542,7 +551,7 @@ struct TOperationHandle {
 // which operations may be executed.
 struct TOpenSessionReq {
   // The version of the HiveServer2 protocol that the client is using.
-  1: required TProtocolVersion client_protocol = TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V7
+  1: required TProtocolVersion client_protocol = TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V8
 
   // Username and password for authentication.
   // Depending on the authentication scheme being used,
@@ -561,7 +570,7 @@ struct TOpenSessionResp {
   1: required TStatus status
 
   // The protocol version that the server is using.
-  2: required TProtocolVersion serverProtocolVersion = TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V7
+  2: required TProtocolVersion serverProtocolVersion = TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V8
 
   // Session Handle
   3: optional TSessionHandle sessionHandle

Modified: hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_constants.cpp
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_constants.cpp?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_constants.cpp (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_constants.cpp Wed Apr  8 20:49:44 2015
@@ -26,6 +26,8 @@ TCLIServiceConstants::TCLIServiceConstan
   PRIMITIVE_TYPES.insert((TTypeId::type)17);
   PRIMITIVE_TYPES.insert((TTypeId::type)18);
   PRIMITIVE_TYPES.insert((TTypeId::type)19);
+  PRIMITIVE_TYPES.insert((TTypeId::type)20);
+  PRIMITIVE_TYPES.insert((TTypeId::type)21);
 
   COMPLEX_TYPES.insert((TTypeId::type)10);
   COMPLEX_TYPES.insert((TTypeId::type)11);
@@ -55,6 +57,8 @@ TCLIServiceConstants::TCLIServiceConstan
   TYPE_NAMES.insert(std::make_pair((TTypeId::type)17, "DATE"));
   TYPE_NAMES.insert(std::make_pair((TTypeId::type)18, "VARCHAR"));
   TYPE_NAMES.insert(std::make_pair((TTypeId::type)19, "CHAR"));
+  TYPE_NAMES.insert(std::make_pair((TTypeId::type)20, "INTERVAL_YEAR_MONTH"));
+  TYPE_NAMES.insert(std::make_pair((TTypeId::type)21, "INTERVAL_DAY_TIME"));
 
   CHARACTER_MAXIMUM_LENGTH = "characterMaximumLength";
 

Modified: hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp Wed Apr  8 20:49:44 2015
@@ -17,7 +17,8 @@ int _kTProtocolVersionValues[] = {
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V4,
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V5,
   TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V6,
-  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V7
+  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V7,
+  TProtocolVersion::HIVE_CLI_SERVICE_PROTOCOL_V8
 };
 const char* _kTProtocolVersionNames[] = {
   "HIVE_CLI_SERVICE_PROTOCOL_V1",
@@ -26,9 +27,10 @@ const char* _kTProtocolVersionNames[] =
   "HIVE_CLI_SERVICE_PROTOCOL_V4",
   "HIVE_CLI_SERVICE_PROTOCOL_V5",
   "HIVE_CLI_SERVICE_PROTOCOL_V6",
-  "HIVE_CLI_SERVICE_PROTOCOL_V7"
+  "HIVE_CLI_SERVICE_PROTOCOL_V7",
+  "HIVE_CLI_SERVICE_PROTOCOL_V8"
 };
-const std::map<int, const char*> _TProtocolVersion_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kTProtocolVersionValues, _kTProtocolVersionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _TProtocolVersion_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _kTProtocolVersionValues, _kTProtocolVersionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
 int _kTTypeIdValues[] = {
   TTypeId::BOOLEAN_TYPE,
@@ -50,7 +52,9 @@ int _kTTypeIdValues[] = {
   TTypeId::NULL_TYPE,
   TTypeId::DATE_TYPE,
   TTypeId::VARCHAR_TYPE,
-  TTypeId::CHAR_TYPE
+  TTypeId::CHAR_TYPE,
+  TTypeId::INTERVAL_YEAR_MONTH_TYPE,
+  TTypeId::INTERVAL_DAY_TIME_TYPE
 };
 const char* _kTTypeIdNames[] = {
   "BOOLEAN_TYPE",
@@ -72,9 +76,11 @@ const char* _kTTypeIdNames[] = {
   "NULL_TYPE",
   "DATE_TYPE",
   "VARCHAR_TYPE",
-  "CHAR_TYPE"
+  "CHAR_TYPE",
+  "INTERVAL_YEAR_MONTH_TYPE",
+  "INTERVAL_DAY_TIME_TYPE"
 };
-const std::map<int, const char*> _TTypeId_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(20, _kTTypeIdValues, _kTTypeIdNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _TTypeId_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(22, _kTTypeIdValues, _kTTypeIdNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
 int _kTStatusCodeValues[] = {
   TStatusCode::SUCCESS_STATUS,

Modified: hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_types.h
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_types.h?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_types.h (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-cpp/TCLIService_types.h Wed Apr  8 20:49:44 2015
@@ -24,7 +24,8 @@ struct 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
+    HIVE_CLI_SERVICE_PROTOCOL_V7 = 6,
+    HIVE_CLI_SERVICE_PROTOCOL_V8 = 7
   };
 };
 
@@ -51,7 +52,9 @@ struct TTypeId {
     NULL_TYPE = 16,
     DATE_TYPE = 17,
     VARCHAR_TYPE = 18,
-    CHAR_TYPE = 19
+    CHAR_TYPE = 19,
+    INTERVAL_YEAR_MONTH_TYPE = 20,
+    INTERVAL_DAY_TIME_TYPE = 21
   };
 };
 
@@ -1946,8 +1949,8 @@ class TOpenSessionReq {
   static const char* ascii_fingerprint; // = "C8FD0F306A16C16BDA7B57F58BFAE5B2";
   static const uint8_t binary_fingerprint[16]; // = {0xC8,0xFD,0x0F,0x30,0x6A,0x16,0xC1,0x6B,0xDA,0x7B,0x57,0xF5,0x8B,0xFA,0xE5,0xB2};
 
-  TOpenSessionReq() : client_protocol((TProtocolVersion::type)6), username(), password() {
-    client_protocol = (TProtocolVersion::type)6;
+  TOpenSessionReq() : client_protocol((TProtocolVersion::type)7), username(), password() {
+    client_protocol = (TProtocolVersion::type)7;
 
   }
 
@@ -2022,8 +2025,8 @@ class TOpenSessionResp {
   static const char* ascii_fingerprint; // = "CFE7D7F4E9EC671F2518ED74FEE9F163";
   static const uint8_t binary_fingerprint[16]; // = {0xCF,0xE7,0xD7,0xF4,0xE9,0xEC,0x67,0x1F,0x25,0x18,0xED,0x74,0xFE,0xE9,0xF1,0x63};
 
-  TOpenSessionResp() : serverProtocolVersion((TProtocolVersion::type)6) {
-    serverProtocolVersion = (TProtocolVersion::type)6;
+  TOpenSessionResp() : serverProtocolVersion((TProtocolVersion::type)7) {
+    serverProtocolVersion = (TProtocolVersion::type)7;
 
   }
 

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/ThriftHive.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/ThriftHive.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/ThriftHive.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/service/ThriftHive.java Wed Apr  8 20:49:44 2015
@@ -3023,7 +3023,7 @@ public class ThriftHive {
                   struct.success = new ArrayList<String>(_list0.size);
                   for (int _i1 = 0; _i1 < _list0.size; ++_i1)
                   {
-                    String _elem2; // required
+                    String _elem2; // optional
                     _elem2 = iprot.readString();
                     struct.success.add(_elem2);
                   }
@@ -3122,7 +3122,7 @@ public class ThriftHive {
             struct.success = new ArrayList<String>(_list5.size);
             for (int _i6 = 0; _i6 < _list5.size; ++_i6)
             {
-              String _elem7; // required
+              String _elem7; // optional
               _elem7 = iprot.readString();
               struct.success.add(_elem7);
             }
@@ -3785,7 +3785,7 @@ public class ThriftHive {
                   struct.success = new ArrayList<String>(_list8.size);
                   for (int _i9 = 0; _i9 < _list8.size; ++_i9)
                   {
-                    String _elem10; // required
+                    String _elem10; // optional
                     _elem10 = iprot.readString();
                     struct.success.add(_elem10);
                   }
@@ -3884,7 +3884,7 @@ public class ThriftHive {
             struct.success = new ArrayList<String>(_list13.size);
             for (int _i14 = 0; _i14 < _list13.size; ++_i14)
             {
-              String _elem15; // required
+              String _elem15; // optional
               _elem15 = iprot.readString();
               struct.success.add(_elem15);
             }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TBinaryColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TBinaryColumn.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TBinaryColumn.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TBinaryColumn.java Wed Apr  8 20:49:44 2015
@@ -451,7 +451,7 @@ public class TBinaryColumn implements or
                 struct.values = new ArrayList<ByteBuffer>(_list110.size);
                 for (int _i111 = 0; _i111 < _list110.size; ++_i111)
                 {
-                  ByteBuffer _elem112; // required
+                  ByteBuffer _elem112; // optional
                   _elem112 = iprot.readBinary();
                   struct.values.add(_elem112);
                 }
@@ -535,7 +535,7 @@ public class TBinaryColumn implements or
         struct.values = new ArrayList<ByteBuffer>(_list115.size);
         for (int _i116 = 0; _i116 < _list115.size; ++_i116)
         {
-          ByteBuffer _elem117; // required
+          ByteBuffer _elem117; // optional
           _elem117 = iprot.readBinary();
           struct.values.add(_elem117);
         }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TBoolColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TBoolColumn.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TBoolColumn.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TBoolColumn.java Wed Apr  8 20:49:44 2015
@@ -449,7 +449,7 @@ public class TBoolColumn implements org.
                 struct.values = new ArrayList<Boolean>(_list54.size);
                 for (int _i55 = 0; _i55 < _list54.size; ++_i55)
                 {
-                  boolean _elem56; // required
+                  boolean _elem56; // optional
                   _elem56 = iprot.readBool();
                   struct.values.add(_elem56);
                 }
@@ -533,7 +533,7 @@ public class TBoolColumn implements org.
         struct.values = new ArrayList<Boolean>(_list59.size);
         for (int _i60 = 0; _i60 < _list59.size; ++_i60)
         {
-          boolean _elem61; // required
+          boolean _elem61; // optional
           _elem61 = iprot.readBool();
           struct.values.add(_elem61);
         }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TByteColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TByteColumn.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TByteColumn.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TByteColumn.java Wed Apr  8 20:49:44 2015
@@ -449,7 +449,7 @@ public class TByteColumn implements org.
                 struct.values = new ArrayList<Byte>(_list62.size);
                 for (int _i63 = 0; _i63 < _list62.size; ++_i63)
                 {
-                  byte _elem64; // required
+                  byte _elem64; // optional
                   _elem64 = iprot.readByte();
                   struct.values.add(_elem64);
                 }
@@ -533,7 +533,7 @@ public class TByteColumn implements org.
         struct.values = new ArrayList<Byte>(_list67.size);
         for (int _i68 = 0; _i68 < _list67.size; ++_i68)
         {
-          byte _elem69; // required
+          byte _elem69; // optional
           _elem69 = iprot.readByte();
           struct.values.add(_elem69);
         }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java Wed Apr  8 20:49:44 2015
@@ -50,6 +50,8 @@ public class TCLIServiceConstants {
     PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.DATE_TYPE);
     PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.VARCHAR_TYPE);
     PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.CHAR_TYPE);
+    PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.INTERVAL_YEAR_MONTH_TYPE);
+    PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.INTERVAL_DAY_TIME_TYPE);
   }
 
   public static final Set<TTypeId> COMPLEX_TYPES = new HashSet<TTypeId>();
@@ -88,6 +90,8 @@ public class TCLIServiceConstants {
     TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.DATE_TYPE, "DATE");
     TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.VARCHAR_TYPE, "VARCHAR");
     TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.CHAR_TYPE, "CHAR");
+    TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.INTERVAL_YEAR_MONTH_TYPE, "INTERVAL_YEAR_MONTH");
+    TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.INTERVAL_DAY_TIME_TYPE, "INTERVAL_DAY_TIME");
   }
 
   public static final String CHARACTER_MAXIMUM_LENGTH = "characterMaximumLength";

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TDoubleColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TDoubleColumn.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TDoubleColumn.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TDoubleColumn.java Wed Apr  8 20:49:44 2015
@@ -449,7 +449,7 @@ public class TDoubleColumn implements or
                 struct.values = new ArrayList<Double>(_list94.size);
                 for (int _i95 = 0; _i95 < _list94.size; ++_i95)
                 {
-                  double _elem96; // required
+                  double _elem96; // optional
                   _elem96 = iprot.readDouble();
                   struct.values.add(_elem96);
                 }
@@ -533,7 +533,7 @@ public class TDoubleColumn implements or
         struct.values = new ArrayList<Double>(_list99.size);
         for (int _i100 = 0; _i100 < _list99.size; ++_i100)
         {
-          double _elem101; // required
+          double _elem101; // optional
           _elem101 = iprot.readDouble();
           struct.values.add(_elem101);
         }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TGetTablesReq.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TGetTablesReq.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TGetTablesReq.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TGetTablesReq.java Wed Apr  8 20:49:44 2015
@@ -715,7 +715,7 @@ public class TGetTablesReq implements or
                 struct.tableTypes = new ArrayList<String>(_list172.size);
                 for (int _i173 = 0; _i173 < _list172.size; ++_i173)
                 {
-                  String _elem174; // required
+                  String _elem174; // optional
                   _elem174 = iprot.readString();
                   struct.tableTypes.add(_elem174);
                 }
@@ -856,7 +856,7 @@ public class TGetTablesReq implements or
           struct.tableTypes = new ArrayList<String>(_list177.size);
           for (int _i178 = 0; _i178 < _list177.size; ++_i178)
           {
-            String _elem179; // required
+            String _elem179; // optional
             _elem179 = iprot.readString();
             struct.tableTypes.add(_elem179);
           }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI16Column.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI16Column.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI16Column.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI16Column.java Wed Apr  8 20:49:44 2015
@@ -449,7 +449,7 @@ public class TI16Column implements org.a
                 struct.values = new ArrayList<Short>(_list70.size);
                 for (int _i71 = 0; _i71 < _list70.size; ++_i71)
                 {
-                  short _elem72; // required
+                  short _elem72; // optional
                   _elem72 = iprot.readI16();
                   struct.values.add(_elem72);
                 }
@@ -533,7 +533,7 @@ public class TI16Column implements org.a
         struct.values = new ArrayList<Short>(_list75.size);
         for (int _i76 = 0; _i76 < _list75.size; ++_i76)
         {
-          short _elem77; // required
+          short _elem77; // optional
           _elem77 = iprot.readI16();
           struct.values.add(_elem77);
         }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI32Column.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI32Column.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI32Column.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI32Column.java Wed Apr  8 20:49:44 2015
@@ -449,7 +449,7 @@ public class TI32Column implements org.a
                 struct.values = new ArrayList<Integer>(_list78.size);
                 for (int _i79 = 0; _i79 < _list78.size; ++_i79)
                 {
-                  int _elem80; // required
+                  int _elem80; // optional
                   _elem80 = iprot.readI32();
                   struct.values.add(_elem80);
                 }
@@ -533,7 +533,7 @@ public class TI32Column implements org.a
         struct.values = new ArrayList<Integer>(_list83.size);
         for (int _i84 = 0; _i84 < _list83.size; ++_i84)
         {
-          int _elem85; // required
+          int _elem85; // optional
           _elem85 = iprot.readI32();
           struct.values.add(_elem85);
         }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI64Column.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI64Column.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI64Column.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TI64Column.java Wed Apr  8 20:49:44 2015
@@ -449,7 +449,7 @@ public class TI64Column implements org.a
                 struct.values = new ArrayList<Long>(_list86.size);
                 for (int _i87 = 0; _i87 < _list86.size; ++_i87)
                 {
-                  long _elem88; // required
+                  long _elem88; // optional
                   _elem88 = iprot.readI64();
                   struct.values.add(_elem88);
                 }
@@ -533,7 +533,7 @@ public class TI64Column implements org.a
         struct.values = new ArrayList<Long>(_list91.size);
         for (int _i92 = 0; _i92 < _list91.size; ++_i92)
         {
-          long _elem93; // required
+          long _elem93; // optional
           _elem93 = iprot.readI64();
           struct.values.add(_elem93);
         }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java Wed Apr  8 20:49:44 2015
@@ -141,7 +141,7 @@ public class TOpenSessionReq implements
   }
 
   public TOpenSessionReq() {
-    this.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V7;
+    this.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V8;
 
   }
 
@@ -188,7 +188,7 @@ public class TOpenSessionReq implements
 
   @Override
   public void clear() {
-    this.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V7;
+    this.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V8;
 
     this.username = null;
     this.password = null;

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java Wed Apr  8 20:49:44 2015
@@ -141,7 +141,7 @@ public class TOpenSessionResp implements
   }
 
   public TOpenSessionResp() {
-    this.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V7;
+    this.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V8;
 
   }
 
@@ -191,7 +191,7 @@ public class TOpenSessionResp implements
   @Override
   public void clear() {
     this.status = null;
-    this.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V7;
+    this.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V8;
 
     this.sessionHandle = null;
     this.configuration = null;

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java Wed Apr  8 20:49:44 2015
@@ -18,7 +18,8 @@ public enum TProtocolVersion implements
   HIVE_CLI_SERVICE_PROTOCOL_V4(3),
   HIVE_CLI_SERVICE_PROTOCOL_V5(4),
   HIVE_CLI_SERVICE_PROTOCOL_V6(5),
-  HIVE_CLI_SERVICE_PROTOCOL_V7(6);
+  HIVE_CLI_SERVICE_PROTOCOL_V7(6),
+  HIVE_CLI_SERVICE_PROTOCOL_V8(7);
 
   private final int value;
 
@@ -53,6 +54,8 @@ public enum TProtocolVersion implements
         return HIVE_CLI_SERVICE_PROTOCOL_V6;
       case 6:
         return HIVE_CLI_SERVICE_PROTOCOL_V7;
+      case 7:
+        return HIVE_CLI_SERVICE_PROTOCOL_V8;
       default:
         return null;
     }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java Wed Apr  8 20:49:44 2015
@@ -354,7 +354,7 @@ public class TRow implements org.apache.
                 struct.colVals = new ArrayList<TColumnValue>(_list46.size);
                 for (int _i47 = 0; _i47 < _list46.size; ++_i47)
                 {
-                  TColumnValue _elem48; // required
+                  TColumnValue _elem48; // optional
                   _elem48 = new TColumnValue();
                   _elem48.read(iprot);
                   struct.colVals.add(_elem48);
@@ -425,7 +425,7 @@ public class TRow implements org.apache.
         struct.colVals = new ArrayList<TColumnValue>(_list51.size);
         for (int _i52 = 0; _i52 < _list51.size; ++_i52)
         {
-          TColumnValue _elem53; // required
+          TColumnValue _elem53; // optional
           _elem53 = new TColumnValue();
           _elem53.read(iprot);
           struct.colVals.add(_elem53);

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java Wed Apr  8 20:49:44 2015
@@ -549,7 +549,7 @@ public class TRowSet implements org.apac
                 struct.rows = new ArrayList<TRow>(_list118.size);
                 for (int _i119 = 0; _i119 < _list118.size; ++_i119)
                 {
-                  TRow _elem120; // required
+                  TRow _elem120; // optional
                   _elem120 = new TRow();
                   _elem120.read(iprot);
                   struct.rows.add(_elem120);
@@ -568,7 +568,7 @@ public class TRowSet implements org.apac
                 struct.columns = new ArrayList<TColumn>(_list121.size);
                 for (int _i122 = 0; _i122 < _list121.size; ++_i122)
                 {
-                  TColumn _elem123; // required
+                  TColumn _elem123; // optional
                   _elem123 = new TColumn();
                   _elem123.read(iprot);
                   struct.columns.add(_elem123);
@@ -673,7 +673,7 @@ public class TRowSet implements org.apac
         struct.rows = new ArrayList<TRow>(_list128.size);
         for (int _i129 = 0; _i129 < _list128.size; ++_i129)
         {
-          TRow _elem130; // required
+          TRow _elem130; // optional
           _elem130 = new TRow();
           _elem130.read(iprot);
           struct.rows.add(_elem130);
@@ -687,7 +687,7 @@ public class TRowSet implements org.apac
           struct.columns = new ArrayList<TColumn>(_list131.size);
           for (int _i132 = 0; _i132 < _list131.size; ++_i132)
           {
-            TColumn _elem133; // required
+            TColumn _elem133; // optional
             _elem133 = new TColumn();
             _elem133.read(iprot);
             struct.columns.add(_elem133);

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java Wed Apr  8 20:49:44 2015
@@ -698,7 +698,7 @@ public class TStatus implements org.apac
                 struct.infoMessages = new ArrayList<String>(_list134.size);
                 for (int _i135 = 0; _i135 < _list134.size; ++_i135)
                 {
-                  String _elem136; // required
+                  String _elem136; // optional
                   _elem136 = iprot.readString();
                   struct.infoMessages.add(_elem136);
                 }
@@ -848,7 +848,7 @@ public class TStatus implements org.apac
           struct.infoMessages = new ArrayList<String>(_list139.size);
           for (int _i140 = 0; _i140 < _list139.size; ++_i140)
           {
-            String _elem141; // required
+            String _elem141; // optional
             _elem141 = iprot.readString();
             struct.infoMessages.add(_elem141);
           }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStringColumn.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStringColumn.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStringColumn.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStringColumn.java Wed Apr  8 20:49:44 2015
@@ -449,7 +449,7 @@ public class TStringColumn implements or
                 struct.values = new ArrayList<String>(_list102.size);
                 for (int _i103 = 0; _i103 < _list102.size; ++_i103)
                 {
-                  String _elem104; // required
+                  String _elem104; // optional
                   _elem104 = iprot.readString();
                   struct.values.add(_elem104);
                 }
@@ -533,7 +533,7 @@ public class TStringColumn implements or
         struct.values = new ArrayList<String>(_list107.size);
         for (int _i108 = 0; _i108 < _list107.size; ++_i108)
         {
-          String _elem109; // required
+          String _elem109; // optional
           _elem109 = iprot.readString();
           struct.values.add(_elem109);
         }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTableSchema.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTableSchema.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTableSchema.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTableSchema.java Wed Apr  8 20:49:44 2015
@@ -354,7 +354,7 @@ public class TTableSchema implements org
                 struct.columns = new ArrayList<TColumnDesc>(_list38.size);
                 for (int _i39 = 0; _i39 < _list38.size; ++_i39)
                 {
-                  TColumnDesc _elem40; // required
+                  TColumnDesc _elem40; // optional
                   _elem40 = new TColumnDesc();
                   _elem40.read(iprot);
                   struct.columns.add(_elem40);
@@ -425,7 +425,7 @@ public class TTableSchema implements org
         struct.columns = new ArrayList<TColumnDesc>(_list43.size);
         for (int _i44 = 0; _i44 < _list43.size; ++_i44)
         {
-          TColumnDesc _elem45; // required
+          TColumnDesc _elem45; // optional
           _elem45 = new TColumnDesc();
           _elem45.read(iprot);
           struct.columns.add(_elem45);

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeDesc.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeDesc.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeDesc.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeDesc.java Wed Apr  8 20:49:44 2015
@@ -354,7 +354,7 @@ public class TTypeDesc implements org.ap
                 struct.types = new ArrayList<TTypeEntry>(_list30.size);
                 for (int _i31 = 0; _i31 < _list30.size; ++_i31)
                 {
-                  TTypeEntry _elem32; // required
+                  TTypeEntry _elem32; // optional
                   _elem32 = new TTypeEntry();
                   _elem32.read(iprot);
                   struct.types.add(_elem32);
@@ -425,7 +425,7 @@ public class TTypeDesc implements org.ap
         struct.types = new ArrayList<TTypeEntry>(_list35.size);
         for (int _i36 = 0; _i36 < _list35.size; ++_i36)
         {
-          TTypeEntry _elem37; // required
+          TTypeEntry _elem37; // optional
           _elem37 = new TTypeEntry();
           _elem37.read(iprot);
           struct.types.add(_elem37);

Modified: hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java Wed Apr  8 20:49:44 2015
@@ -31,7 +31,9 @@ public enum TTypeId implements org.apach
   NULL_TYPE(16),
   DATE_TYPE(17),
   VARCHAR_TYPE(18),
-  CHAR_TYPE(19);
+  CHAR_TYPE(19),
+  INTERVAL_YEAR_MONTH_TYPE(20),
+  INTERVAL_DAY_TIME_TYPE(21);
 
   private final int value;
 
@@ -92,6 +94,10 @@ public enum TTypeId implements org.apach
         return VARCHAR_TYPE;
       case 19:
         return CHAR_TYPE;
+      case 20:
+        return INTERVAL_YEAR_MONTH_TYPE;
+      case 21:
+        return INTERVAL_DAY_TIME_TYPE;
       default:
         return null;
     }

Modified: hive/branches/cbo/service/src/gen/thrift/gen-py/TCLIService/constants.py
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-py/TCLIService/constants.py?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-py/TCLIService/constants.py (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-py/TCLIService/constants.py Wed Apr  8 20:49:44 2015
@@ -25,6 +25,8 @@ PRIMITIVE_TYPES = set([
     17,
     18,
     19,
+    20,
+    21,
 ])
 COMPLEX_TYPES = set([
     10,
@@ -57,6 +59,8 @@ TYPE_NAMES = {
     17 : "DATE",
     18 : "VARCHAR",
     19 : "CHAR",
+    20 : "INTERVAL_YEAR_MONTH",
+    21 : "INTERVAL_DAY_TIME",
 }
 CHARACTER_MAXIMUM_LENGTH = "characterMaximumLength"
 PRECISION = "precision"

Modified: hive/branches/cbo/service/src/gen/thrift/gen-py/TCLIService/ttypes.py
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-py/TCLIService/ttypes.py?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-py/TCLIService/ttypes.py (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-py/TCLIService/ttypes.py Wed Apr  8 20:49:44 2015
@@ -24,6 +24,7 @@ class TProtocolVersion:
   HIVE_CLI_SERVICE_PROTOCOL_V5 = 4
   HIVE_CLI_SERVICE_PROTOCOL_V6 = 5
   HIVE_CLI_SERVICE_PROTOCOL_V7 = 6
+  HIVE_CLI_SERVICE_PROTOCOL_V8 = 7
 
   _VALUES_TO_NAMES = {
     0: "HIVE_CLI_SERVICE_PROTOCOL_V1",
@@ -33,6 +34,7 @@ class TProtocolVersion:
     4: "HIVE_CLI_SERVICE_PROTOCOL_V5",
     5: "HIVE_CLI_SERVICE_PROTOCOL_V6",
     6: "HIVE_CLI_SERVICE_PROTOCOL_V7",
+    7: "HIVE_CLI_SERVICE_PROTOCOL_V8",
   }
 
   _NAMES_TO_VALUES = {
@@ -43,6 +45,7 @@ class TProtocolVersion:
     "HIVE_CLI_SERVICE_PROTOCOL_V5": 4,
     "HIVE_CLI_SERVICE_PROTOCOL_V6": 5,
     "HIVE_CLI_SERVICE_PROTOCOL_V7": 6,
+    "HIVE_CLI_SERVICE_PROTOCOL_V8": 7,
   }
 
 class TTypeId:
@@ -66,6 +69,8 @@ class TTypeId:
   DATE_TYPE = 17
   VARCHAR_TYPE = 18
   CHAR_TYPE = 19
+  INTERVAL_YEAR_MONTH_TYPE = 20
+  INTERVAL_DAY_TIME_TYPE = 21
 
   _VALUES_TO_NAMES = {
     0: "BOOLEAN_TYPE",
@@ -88,6 +93,8 @@ class TTypeId:
     17: "DATE_TYPE",
     18: "VARCHAR_TYPE",
     19: "CHAR_TYPE",
+    20: "INTERVAL_YEAR_MONTH_TYPE",
+    21: "INTERVAL_DAY_TIME_TYPE",
   }
 
   _NAMES_TO_VALUES = {
@@ -111,6 +118,8 @@ class TTypeId:
     "DATE_TYPE": 17,
     "VARCHAR_TYPE": 18,
     "CHAR_TYPE": 19,
+    "INTERVAL_YEAR_MONTH_TYPE": 20,
+    "INTERVAL_DAY_TIME_TYPE": 21,
   }
 
 class TStatusCode:
@@ -3245,7 +3254,7 @@ class TOpenSessionReq:
 
   thrift_spec = (
     None, # 0
-    (1, TType.I32, 'client_protocol', None,     6, ), # 1
+    (1, TType.I32, 'client_protocol', None,     7, ), # 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
@@ -3354,7 +3363,7 @@ class TOpenSessionResp:
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'status', (TStatus, TStatus.thrift_spec), None, ), # 1
-    (2, TType.I32, 'serverProtocolVersion', None,     6, ), # 2
+    (2, TType.I32, 'serverProtocolVersion', None,     7, ), # 2
     (3, TType.STRUCT, 'sessionHandle', (TSessionHandle, TSessionHandle.thrift_spec), None, ), # 3
     (4, TType.MAP, 'configuration', (TType.STRING,None,TType.STRING,None), None, ), # 4
   )

Modified: hive/branches/cbo/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb Wed Apr  8 20:49:44 2015
@@ -23,6 +23,8 @@ PRIMITIVE_TYPES = Set.new([
     17,
     18,
     19,
+    20,
+    21,
 ])
 
 COMPLEX_TYPES = Set.new([
@@ -58,6 +60,8 @@ TYPE_NAMES = {
     17 => %q"DATE",
     18 => %q"VARCHAR",
     19 => %q"CHAR",
+    20 => %q"INTERVAL_YEAR_MONTH",
+    21 => %q"INTERVAL_DAY_TIME",
 }
 
 CHARACTER_MAXIMUM_LENGTH = %q"characterMaximumLength"

Modified: hive/branches/cbo/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb (original)
+++ hive/branches/cbo/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb Wed Apr  8 20:49:44 2015
@@ -14,8 +14,9 @@ module TProtocolVersion
   HIVE_CLI_SERVICE_PROTOCOL_V5 = 4
   HIVE_CLI_SERVICE_PROTOCOL_V6 = 5
   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
+  HIVE_CLI_SERVICE_PROTOCOL_V8 = 7
+  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"}
+  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]).freeze
 end
 
 module TTypeId
@@ -39,8 +40,10 @@ module TTypeId
   DATE_TYPE = 17
   VARCHAR_TYPE = 18
   CHAR_TYPE = 19
-  VALUE_MAP = {0 => "BOOLEAN_TYPE", 1 => "TINYINT_TYPE", 2 => "SMALLINT_TYPE", 3 => "INT_TYPE", 4 => "BIGINT_TYPE", 5 => "FLOAT_TYPE", 6 => "DOUBLE_TYPE", 7 => "STRING_TYPE", 8 => "TIMESTAMP_TYPE", 9 => "BINARY_TYPE", 10 => "ARRAY_TYPE", 11 => "MAP_TYPE", 12 => "STRUCT_TYPE", 13 => "UNION_TYPE", 14 => "USER_DEFINED_TYPE", 15 => "DECIMAL_TYPE", 16 => "NULL_TYPE", 17 => "DATE_TYPE", 18 => "VARCHAR_TYPE", 19 => "CHAR_TYPE"}
-  VALID_VALUES = Set.new([BOOLEAN_TYPE, TINYINT_TYPE, SMALLINT_TYPE, INT_TYPE, BIGINT_TYPE, FLOAT_TYPE, DOUBLE_TYPE, STRING_TYPE, TIMESTAMP_TYPE, BINARY_TYPE, ARRAY_TYPE, MAP_TYPE, STRUCT_TYPE, UNION_TYPE, USER_DEFINED_TYPE, DECIMAL_TYPE, NULL_TYPE, DATE_TYPE, VARCHAR_TYPE, CHAR_TYPE]).freeze
+  INTERVAL_YEAR_MONTH_TYPE = 20
+  INTERVAL_DAY_TIME_TYPE = 21
+  VALUE_MAP = {0 => "BOOLEAN_TYPE", 1 => "TINYINT_TYPE", 2 => "SMALLINT_TYPE", 3 => "INT_TYPE", 4 => "BIGINT_TYPE", 5 => "FLOAT_TYPE", 6 => "DOUBLE_TYPE", 7 => "STRING_TYPE", 8 => "TIMESTAMP_TYPE", 9 => "BINARY_TYPE", 10 => "ARRAY_TYPE", 11 => "MAP_TYPE", 12 => "STRUCT_TYPE", 13 => "UNION_TYPE", 14 => "USER_DEFINED_TYPE", 15 => "DECIMAL_TYPE", 16 => "NULL_TYPE", 17 => "DATE_TYPE", 18 => "VARCHAR_TYPE", 19 => "CHAR_TYPE", 20 => "INTERVAL_YEAR_MONTH_TYPE", 21 => "INTERVAL_DAY_TIME_TYPE"}
+  VALID_VALUES = Set.new([BOOLEAN_TYPE, TINYINT_TYPE, SMALLINT_TYPE, INT_TYPE, BIGINT_TYPE, FLOAT_TYPE, DOUBLE_TYPE, STRING_TYPE, TIMESTAMP_TYPE, BINARY_TYPE, ARRAY_TYPE, MAP_TYPE, STRUCT_TYPE, UNION_TYPE, USER_DEFINED_TYPE, DECIMAL_TYPE, NULL_TYPE, DATE_TYPE, VARCHAR_TYPE, CHAR_TYPE, INTERVAL_YEAR_MONTH_TYPE, INTERVAL_DAY_TIME_TYPE]).freeze
 end
 
 module TStatusCode
@@ -947,7 +950,7 @@ class TOpenSessionReq
   CONFIGURATION = 4
 
   FIELDS = {
-    CLIENT_PROTOCOL => {:type => ::Thrift::Types::I32, :name => 'client_protocol', :default =>     6, :enum_class => ::TProtocolVersion},
+    CLIENT_PROTOCOL => {:type => ::Thrift::Types::I32, :name => 'client_protocol', :default =>     7, :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}
@@ -974,7 +977,7 @@ class TOpenSessionResp
 
   FIELDS = {
     STATUS => {:type => ::Thrift::Types::STRUCT, :name => 'status', :class => ::TStatus},
-    SERVERPROTOCOLVERSION => {:type => ::Thrift::Types::I32, :name => 'serverProtocolVersion', :default =>     6, :enum_class => ::TProtocolVersion},
+    SERVERPROTOCOLVERSION => {:type => ::Thrift::Types::I32, :name => 'serverProtocolVersion', :default =>     7, :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}
   }

Modified: hive/branches/cbo/service/src/java/org/apache/hive/service/cli/ColumnValue.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/cli/ColumnValue.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/java/org/apache/hive/service/cli/ColumnValue.java (original)
+++ hive/branches/cbo/service/src/java/org/apache/hive/service/cli/ColumnValue.java Wed Apr  8 20:49:44 2015
@@ -24,6 +24,8 @@ import java.sql.Timestamp;
 
 import org.apache.hadoop.hive.common.type.HiveChar;
 import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.common.type.HiveIntervalDayTime;
+import org.apache.hadoop.hive.common.type.HiveIntervalYearMonth;
 import org.apache.hadoop.hive.common.type.HiveVarchar;
 import org.apache.hive.service.cli.thrift.TBoolValue;
 import org.apache.hive.service.cli.thrift.TByteValue;
@@ -144,6 +146,22 @@ public class ColumnValue {
     return TColumnValue.stringVal(tStrValue);
   }
 
+  private static TColumnValue stringValue(HiveIntervalYearMonth value) {
+    TStringValue tStrValue = new TStringValue();
+    if (value != null) {
+      tStrValue.setValue(value.toString());
+    }
+    return TColumnValue.stringVal(tStrValue);
+  }
+
+  private static TColumnValue stringValue(HiveIntervalDayTime value) {
+    TStringValue tStrValue = new TStringValue();
+    if (value != null) {
+      tStrValue.setValue(value.toString());
+    }
+    return TColumnValue.stringVal(tStrValue);
+  }
+
   public static TColumnValue toTColumnValue(Type type, Object value) {
     switch (type) {
     case BOOLEAN_TYPE:
@@ -170,6 +188,10 @@ public class ColumnValue {
       return dateValue((Date)value);
     case TIMESTAMP_TYPE:
       return timestampValue((Timestamp)value);
+    case INTERVAL_YEAR_MONTH_TYPE:
+      return stringValue((HiveIntervalYearMonth) value);
+    case INTERVAL_DAY_TIME_TYPE:
+      return stringValue((HiveIntervalDayTime) value);
     case DECIMAL_TYPE:
       return stringValue(((HiveDecimal)value));
     case BINARY_TYPE:

Modified: hive/branches/cbo/service/src/java/org/apache/hive/service/cli/Type.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/cli/Type.java?rev=1672173&r1=1672172&r2=1672173&view=diff
==============================================================================
--- hive/branches/cbo/service/src/java/org/apache/hive/service/cli/Type.java (original)
+++ hive/branches/cbo/service/src/java/org/apache/hive/service/cli/Type.java Wed Apr  8 20:49:44 2015
@@ -69,6 +69,12 @@ public enum Type {
   TIMESTAMP_TYPE("TIMESTAMP",
       java.sql.Types.TIMESTAMP,
       TTypeId.TIMESTAMP_TYPE),
+  INTERVAL_YEAR_MONTH_TYPE("INTERVAL_YEAR_MONTH",
+      java.sql.Types.OTHER,
+      TTypeId.INTERVAL_YEAR_MONTH_TYPE),
+  INTERVAL_DAY_TIME_TYPE("INTERVAL_DAY_TIME",
+      java.sql.Types.OTHER,
+      TTypeId.INTERVAL_DAY_TIME_TYPE),
   BINARY_TYPE("BINARY",
       java.sql.Types.BINARY,
       TTypeId.BINARY_TYPE),



Mime
View raw message