Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CA8B2109F1 for ; Sat, 21 Sep 2013 15:50:28 +0000 (UTC) Received: (qmail 52266 invoked by uid 500); 21 Sep 2013 15:50:28 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 52236 invoked by uid 500); 21 Sep 2013 15:50:27 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 52228 invoked by uid 99); 21 Sep 2013 15:50:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Sep 2013 15:50:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Sep 2013 15:50:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2F0572388A02; Sat, 21 Sep 2013 15:49:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1525254 [3/4] - in /hive/branches/vectorization: ./ beeline/src/java/org/apache/hive/beeline/ beeline/src/test/org/apache/hive/beeline/src/test/ jdbc/src/java/org/apache/hive/jdbc/ jdbc/src/test/org/apache/hive/jdbc/ ql/src/java/org/apache... Date: Sat, 21 Sep 2013 15:49:50 -0000 To: commits@hive.apache.org From: hashutosh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130921154953.2F0572388A02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TExecuteStatementReq.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TExecuteStatementReq.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TExecuteStatementReq.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TExecuteStatementReq.java Sat Sep 21 15:49:49 2013 @@ -624,15 +624,15 @@ public class TExecuteStatementReq implem case 3: // CONF_OVERLAY if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map144 = iprot.readMapBegin(); - struct.confOverlay = new HashMap(2*_map144.size); - for (int _i145 = 0; _i145 < _map144.size; ++_i145) + org.apache.thrift.protocol.TMap _map154 = iprot.readMapBegin(); + struct.confOverlay = new HashMap(2*_map154.size); + for (int _i155 = 0; _i155 < _map154.size; ++_i155) { - String _key146; // required - String _val147; // required - _key146 = iprot.readString(); - _val147 = iprot.readString(); - struct.confOverlay.put(_key146, _val147); + String _key156; // required + String _val157; // required + _key156 = iprot.readString(); + _val157 = iprot.readString(); + struct.confOverlay.put(_key156, _val157); } iprot.readMapEnd(); } @@ -677,10 +677,10 @@ public class TExecuteStatementReq implem oprot.writeFieldBegin(CONF_OVERLAY_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.confOverlay.size())); - for (Map.Entry _iter148 : struct.confOverlay.entrySet()) + for (Map.Entry _iter158 : struct.confOverlay.entrySet()) { - oprot.writeString(_iter148.getKey()); - oprot.writeString(_iter148.getValue()); + oprot.writeString(_iter158.getKey()); + oprot.writeString(_iter158.getValue()); } oprot.writeMapEnd(); } @@ -722,10 +722,10 @@ public class TExecuteStatementReq implem if (struct.isSetConfOverlay()) { { oprot.writeI32(struct.confOverlay.size()); - for (Map.Entry _iter149 : struct.confOverlay.entrySet()) + for (Map.Entry _iter159 : struct.confOverlay.entrySet()) { - oprot.writeString(_iter149.getKey()); - oprot.writeString(_iter149.getValue()); + oprot.writeString(_iter159.getKey()); + oprot.writeString(_iter159.getValue()); } } } @@ -745,15 +745,15 @@ public class TExecuteStatementReq implem BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map150 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.confOverlay = new HashMap(2*_map150.size); - for (int _i151 = 0; _i151 < _map150.size; ++_i151) + org.apache.thrift.protocol.TMap _map160 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.confOverlay = new HashMap(2*_map160.size); + for (int _i161 = 0; _i161 < _map160.size; ++_i161) { - String _key152; // required - String _val153; // required - _key152 = iprot.readString(); - _val153 = iprot.readString(); - struct.confOverlay.put(_key152, _val153); + String _key162; // required + String _val163; // required + _key162 = iprot.readString(); + _val163 = iprot.readString(); + struct.confOverlay.put(_key162, _val163); } } struct.setConfOverlayIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TGetTablesReq.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TGetTablesReq.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TGetTablesReq.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TGetTablesReq.java Sat Sep 21 15:49:49 2013 @@ -711,13 +711,13 @@ public class TGetTablesReq implements or case 5: // TABLE_TYPES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list154 = iprot.readListBegin(); - struct.tableTypes = new ArrayList(_list154.size); - for (int _i155 = 0; _i155 < _list154.size; ++_i155) + org.apache.thrift.protocol.TList _list164 = iprot.readListBegin(); + struct.tableTypes = new ArrayList(_list164.size); + for (int _i165 = 0; _i165 < _list164.size; ++_i165) { - String _elem156; // required - _elem156 = iprot.readString(); - struct.tableTypes.add(_elem156); + String _elem166; // optional + _elem166 = iprot.readString(); + struct.tableTypes.add(_elem166); } iprot.readListEnd(); } @@ -770,9 +770,9 @@ public class TGetTablesReq implements or oprot.writeFieldBegin(TABLE_TYPES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tableTypes.size())); - for (String _iter157 : struct.tableTypes) + for (String _iter167 : struct.tableTypes) { - oprot.writeString(_iter157); + oprot.writeString(_iter167); } oprot.writeListEnd(); } @@ -823,9 +823,9 @@ public class TGetTablesReq implements or if (struct.isSetTableTypes()) { { oprot.writeI32(struct.tableTypes.size()); - for (String _iter158 : struct.tableTypes) + for (String _iter168 : struct.tableTypes) { - oprot.writeString(_iter158); + oprot.writeString(_iter168); } } } @@ -852,13 +852,13 @@ public class TGetTablesReq implements or } if (incoming.get(3)) { { - org.apache.thrift.protocol.TList _list159 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.tableTypes = new ArrayList(_list159.size); - for (int _i160 = 0; _i160 < _list159.size; ++_i160) + org.apache.thrift.protocol.TList _list169 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.tableTypes = new ArrayList(_list169.size); + for (int _i170 = 0; _i170 < _list169.size; ++_i170) { - String _elem161; // required - _elem161 = iprot.readString(); - struct.tableTypes.add(_elem161); + String _elem171; // optional + _elem171 = iprot.readString(); + struct.tableTypes.add(_elem171); } } struct.setTableTypesIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java Sat Sep 21 15:49:49 2013 @@ -141,7 +141,7 @@ public class TOpenSessionReq implements } public TOpenSessionReq() { - this.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V2; + this.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V3; } @@ -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_V2; + this.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V3; this.username = null; this.password = null; @@ -638,15 +638,15 @@ public class TOpenSessionReq implements case 4: // CONFIGURATION if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map124 = iprot.readMapBegin(); - struct.configuration = new HashMap(2*_map124.size); - for (int _i125 = 0; _i125 < _map124.size; ++_i125) + org.apache.thrift.protocol.TMap _map134 = iprot.readMapBegin(); + struct.configuration = new HashMap(2*_map134.size); + for (int _i135 = 0; _i135 < _map134.size; ++_i135) { - String _key126; // required - String _val127; // required - _key126 = iprot.readString(); - _val127 = iprot.readString(); - struct.configuration.put(_key126, _val127); + String _key136; // required + String _val137; // required + _key136 = iprot.readString(); + _val137 = iprot.readString(); + struct.configuration.put(_key136, _val137); } iprot.readMapEnd(); } @@ -692,10 +692,10 @@ public class TOpenSessionReq implements oprot.writeFieldBegin(CONFIGURATION_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.configuration.size())); - for (Map.Entry _iter128 : struct.configuration.entrySet()) + for (Map.Entry _iter138 : struct.configuration.entrySet()) { - oprot.writeString(_iter128.getKey()); - oprot.writeString(_iter128.getValue()); + oprot.writeString(_iter138.getKey()); + oprot.writeString(_iter138.getValue()); } oprot.writeMapEnd(); } @@ -740,10 +740,10 @@ public class TOpenSessionReq implements if (struct.isSetConfiguration()) { { oprot.writeI32(struct.configuration.size()); - for (Map.Entry _iter129 : struct.configuration.entrySet()) + for (Map.Entry _iter139 : struct.configuration.entrySet()) { - oprot.writeString(_iter129.getKey()); - oprot.writeString(_iter129.getValue()); + oprot.writeString(_iter139.getKey()); + oprot.writeString(_iter139.getValue()); } } } @@ -765,15 +765,15 @@ public class TOpenSessionReq implements } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map130 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.configuration = new HashMap(2*_map130.size); - for (int _i131 = 0; _i131 < _map130.size; ++_i131) + org.apache.thrift.protocol.TMap _map140 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.configuration = new HashMap(2*_map140.size); + for (int _i141 = 0; _i141 < _map140.size; ++_i141) { - String _key132; // required - String _val133; // required - _key132 = iprot.readString(); - _val133 = iprot.readString(); - struct.configuration.put(_key132, _val133); + String _key142; // required + String _val143; // required + _key142 = iprot.readString(); + _val143 = iprot.readString(); + struct.configuration.put(_key142, _val143); } } struct.setConfigurationIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java Sat Sep 21 15:49:49 2013 @@ -141,7 +141,7 @@ public class TOpenSessionResp implements } public TOpenSessionResp() { - this.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V2; + this.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V3; } @@ -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_V2; + this.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V3; this.sessionHandle = null; this.configuration = null; @@ -650,15 +650,15 @@ public class TOpenSessionResp implements case 4: // CONFIGURATION if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map134 = iprot.readMapBegin(); - struct.configuration = new HashMap(2*_map134.size); - for (int _i135 = 0; _i135 < _map134.size; ++_i135) + org.apache.thrift.protocol.TMap _map144 = iprot.readMapBegin(); + struct.configuration = new HashMap(2*_map144.size); + for (int _i145 = 0; _i145 < _map144.size; ++_i145) { - String _key136; // required - String _val137; // required - _key136 = iprot.readString(); - _val137 = iprot.readString(); - struct.configuration.put(_key136, _val137); + String _key146; // required + String _val147; // required + _key146 = iprot.readString(); + _val147 = iprot.readString(); + struct.configuration.put(_key146, _val147); } iprot.readMapEnd(); } @@ -702,10 +702,10 @@ public class TOpenSessionResp implements oprot.writeFieldBegin(CONFIGURATION_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.configuration.size())); - for (Map.Entry _iter138 : struct.configuration.entrySet()) + for (Map.Entry _iter148 : struct.configuration.entrySet()) { - oprot.writeString(_iter138.getKey()); - oprot.writeString(_iter138.getValue()); + oprot.writeString(_iter148.getKey()); + oprot.writeString(_iter148.getValue()); } oprot.writeMapEnd(); } @@ -745,10 +745,10 @@ public class TOpenSessionResp implements if (struct.isSetConfiguration()) { { oprot.writeI32(struct.configuration.size()); - for (Map.Entry _iter139 : struct.configuration.entrySet()) + for (Map.Entry _iter149 : struct.configuration.entrySet()) { - oprot.writeString(_iter139.getKey()); - oprot.writeString(_iter139.getValue()); + oprot.writeString(_iter149.getKey()); + oprot.writeString(_iter149.getValue()); } } } @@ -770,15 +770,15 @@ public class TOpenSessionResp implements } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map140 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.configuration = new HashMap(2*_map140.size); - for (int _i141 = 0; _i141 < _map140.size; ++_i141) + org.apache.thrift.protocol.TMap _map150 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.configuration = new HashMap(2*_map150.size); + for (int _i151 = 0; _i151 < _map150.size; ++_i151) { - String _key142; // required - String _val143; // required - _key142 = iprot.readString(); - _val143 = iprot.readString(); - struct.configuration.put(_key142, _val143); + String _key152; // required + String _val153; // required + _key152 = iprot.readString(); + _val153 = iprot.readString(); + struct.configuration.put(_key152, _val153); } } struct.setConfigurationIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java Sat Sep 21 15:49:49 2013 @@ -35,6 +35,7 @@ public class TPrimitiveTypeEntry impleme private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TPrimitiveTypeEntry"); private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1); + private static final org.apache.thrift.protocol.TField TYPE_QUALIFIERS_FIELD_DESC = new org.apache.thrift.protocol.TField("typeQualifiers", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -43,6 +44,7 @@ public class TPrimitiveTypeEntry impleme } private TTypeId type; // required + private TTypeQualifiers typeQualifiers; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -50,7 +52,8 @@ public class TPrimitiveTypeEntry impleme * * @see TTypeId */ - TYPE((short)1, "type"); + TYPE((short)1, "type"), + TYPE_QUALIFIERS((short)2, "typeQualifiers"); private static final Map byName = new HashMap(); @@ -67,6 +70,8 @@ public class TPrimitiveTypeEntry impleme switch(fieldId) { case 1: // TYPE return TYPE; + case 2: // TYPE_QUALIFIERS + return TYPE_QUALIFIERS; default: return null; } @@ -107,11 +112,14 @@ public class TPrimitiveTypeEntry impleme } // isset id assignments + private _Fields optionals[] = {_Fields.TYPE_QUALIFIERS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TTypeId.class))); + tmpMap.put(_Fields.TYPE_QUALIFIERS, new org.apache.thrift.meta_data.FieldMetaData("typeQualifiers", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTypeQualifiers.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TPrimitiveTypeEntry.class, metaDataMap); } @@ -133,6 +141,9 @@ public class TPrimitiveTypeEntry impleme if (other.isSetType()) { this.type = other.type; } + if (other.isSetTypeQualifiers()) { + this.typeQualifiers = new TTypeQualifiers(other.typeQualifiers); + } } public TPrimitiveTypeEntry deepCopy() { @@ -142,6 +153,7 @@ public class TPrimitiveTypeEntry impleme @Override public void clear() { this.type = null; + this.typeQualifiers = null; } /** @@ -175,6 +187,29 @@ public class TPrimitiveTypeEntry impleme } } + public TTypeQualifiers getTypeQualifiers() { + return this.typeQualifiers; + } + + public void setTypeQualifiers(TTypeQualifiers typeQualifiers) { + this.typeQualifiers = typeQualifiers; + } + + public void unsetTypeQualifiers() { + this.typeQualifiers = null; + } + + /** Returns true if field typeQualifiers is set (has been assigned a value) and false otherwise */ + public boolean isSetTypeQualifiers() { + return this.typeQualifiers != null; + } + + public void setTypeQualifiersIsSet(boolean value) { + if (!value) { + this.typeQualifiers = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TYPE: @@ -185,6 +220,14 @@ public class TPrimitiveTypeEntry impleme } break; + case TYPE_QUALIFIERS: + if (value == null) { + unsetTypeQualifiers(); + } else { + setTypeQualifiers((TTypeQualifiers)value); + } + break; + } } @@ -193,6 +236,9 @@ public class TPrimitiveTypeEntry impleme case TYPE: return getType(); + case TYPE_QUALIFIERS: + return getTypeQualifiers(); + } throw new IllegalStateException(); } @@ -206,6 +252,8 @@ public class TPrimitiveTypeEntry impleme switch (field) { case TYPE: return isSetType(); + case TYPE_QUALIFIERS: + return isSetTypeQualifiers(); } throw new IllegalStateException(); } @@ -232,6 +280,15 @@ public class TPrimitiveTypeEntry impleme return false; } + boolean this_present_typeQualifiers = true && this.isSetTypeQualifiers(); + boolean that_present_typeQualifiers = true && that.isSetTypeQualifiers(); + if (this_present_typeQualifiers || that_present_typeQualifiers) { + if (!(this_present_typeQualifiers && that_present_typeQualifiers)) + return false; + if (!this.typeQualifiers.equals(that.typeQualifiers)) + return false; + } + return true; } @@ -244,6 +301,11 @@ public class TPrimitiveTypeEntry impleme if (present_type) builder.append(type.getValue()); + boolean present_typeQualifiers = true && (isSetTypeQualifiers()); + builder.append(present_typeQualifiers); + if (present_typeQualifiers) + builder.append(typeQualifiers); + return builder.toHashCode(); } @@ -265,6 +327,16 @@ public class TPrimitiveTypeEntry impleme return lastComparison; } } + lastComparison = Boolean.valueOf(isSetTypeQualifiers()).compareTo(typedOther.isSetTypeQualifiers()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTypeQualifiers()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.typeQualifiers, typedOther.typeQualifiers); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -292,6 +364,16 @@ public class TPrimitiveTypeEntry impleme sb.append(this.type); } first = false; + if (isSetTypeQualifiers()) { + if (!first) sb.append(", "); + sb.append("typeQualifiers:"); + if (this.typeQualifiers == null) { + sb.append("null"); + } else { + sb.append(this.typeQualifiers); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -303,6 +385,9 @@ public class TPrimitiveTypeEntry impleme } // check for sub-struct validity + if (typeQualifiers != null) { + typeQualifiers.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -347,6 +432,15 @@ public class TPrimitiveTypeEntry impleme org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 2: // TYPE_QUALIFIERS + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.typeQualifiers = new TTypeQualifiers(); + struct.typeQualifiers.read(iprot); + struct.setTypeQualifiersIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -365,6 +459,13 @@ public class TPrimitiveTypeEntry impleme oprot.writeI32(struct.type.getValue()); oprot.writeFieldEnd(); } + if (struct.typeQualifiers != null) { + if (struct.isSetTypeQualifiers()) { + oprot.writeFieldBegin(TYPE_QUALIFIERS_FIELD_DESC); + struct.typeQualifiers.write(oprot); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -383,6 +484,14 @@ public class TPrimitiveTypeEntry impleme public void write(org.apache.thrift.protocol.TProtocol prot, TPrimitiveTypeEntry struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeI32(struct.type.getValue()); + BitSet optionals = new BitSet(); + if (struct.isSetTypeQualifiers()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetTypeQualifiers()) { + struct.typeQualifiers.write(oprot); + } } @Override @@ -390,6 +499,12 @@ public class TPrimitiveTypeEntry impleme TTupleProtocol iprot = (TTupleProtocol) prot; struct.type = TTypeId.findByValue(iprot.readI32()); struct.setTypeIsSet(true); + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.typeQualifiers = new TTypeQualifiers(); + struct.typeQualifiers.read(iprot); + struct.setTypeQualifiersIsSet(true); + } } } Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java Sat Sep 21 15:49:49 2013 @@ -13,7 +13,8 @@ import org.apache.thrift.TEnum; public enum TProtocolVersion implements org.apache.thrift.TEnum { HIVE_CLI_SERVICE_PROTOCOL_V1(0), - HIVE_CLI_SERVICE_PROTOCOL_V2(1); + HIVE_CLI_SERVICE_PROTOCOL_V2(1), + HIVE_CLI_SERVICE_PROTOCOL_V3(2); private final int value; @@ -38,6 +39,8 @@ public enum TProtocolVersion implements return HIVE_CLI_SERVICE_PROTOCOL_V1; case 1: return HIVE_CLI_SERVICE_PROTOCOL_V2; + case 2: + return HIVE_CLI_SERVICE_PROTOCOL_V3; default: return null; } Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java Sat Sep 21 15:49:49 2013 @@ -350,14 +350,14 @@ public class TRow implements org.apache. case 1: // COL_VALS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list92 = iprot.readListBegin(); - struct.colVals = new ArrayList(_list92.size); - for (int _i93 = 0; _i93 < _list92.size; ++_i93) + org.apache.thrift.protocol.TList _list102 = iprot.readListBegin(); + struct.colVals = new ArrayList(_list102.size); + for (int _i103 = 0; _i103 < _list102.size; ++_i103) { - TColumnValue _elem94; // required - _elem94 = new TColumnValue(); - _elem94.read(iprot); - struct.colVals.add(_elem94); + TColumnValue _elem104; // optional + _elem104 = new TColumnValue(); + _elem104.read(iprot); + struct.colVals.add(_elem104); } iprot.readListEnd(); } @@ -383,9 +383,9 @@ public class TRow implements org.apache. oprot.writeFieldBegin(COL_VALS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.colVals.size())); - for (TColumnValue _iter95 : struct.colVals) + for (TColumnValue _iter105 : struct.colVals) { - _iter95.write(oprot); + _iter105.write(oprot); } oprot.writeListEnd(); } @@ -410,9 +410,9 @@ public class TRow implements org.apache. TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.colVals.size()); - for (TColumnValue _iter96 : struct.colVals) + for (TColumnValue _iter106 : struct.colVals) { - _iter96.write(oprot); + _iter106.write(oprot); } } } @@ -421,14 +421,14 @@ public class TRow implements org.apache. public void read(org.apache.thrift.protocol.TProtocol prot, TRow struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list97 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.colVals = new ArrayList(_list97.size); - for (int _i98 = 0; _i98 < _list97.size; ++_i98) + org.apache.thrift.protocol.TList _list107 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.colVals = new ArrayList(_list107.size); + for (int _i108 = 0; _i108 < _list107.size; ++_i108) { - TColumnValue _elem99; // required - _elem99 = new TColumnValue(); - _elem99.read(iprot); - struct.colVals.add(_elem99); + TColumnValue _elem109; // optional + _elem109 = new TColumnValue(); + _elem109.read(iprot); + struct.colVals.add(_elem109); } } struct.setColValsIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java Sat Sep 21 15:49:49 2013 @@ -545,14 +545,14 @@ public class TRowSet implements org.apac case 2: // ROWS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list100 = iprot.readListBegin(); - struct.rows = new ArrayList(_list100.size); - for (int _i101 = 0; _i101 < _list100.size; ++_i101) + org.apache.thrift.protocol.TList _list110 = iprot.readListBegin(); + struct.rows = new ArrayList(_list110.size); + for (int _i111 = 0; _i111 < _list110.size; ++_i111) { - TRow _elem102; // required - _elem102 = new TRow(); - _elem102.read(iprot); - struct.rows.add(_elem102); + TRow _elem112; // optional + _elem112 = new TRow(); + _elem112.read(iprot); + struct.rows.add(_elem112); } iprot.readListEnd(); } @@ -564,14 +564,14 @@ public class TRowSet implements org.apac case 3: // COLUMNS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list103 = iprot.readListBegin(); - struct.columns = new ArrayList(_list103.size); - for (int _i104 = 0; _i104 < _list103.size; ++_i104) + org.apache.thrift.protocol.TList _list113 = iprot.readListBegin(); + struct.columns = new ArrayList(_list113.size); + for (int _i114 = 0; _i114 < _list113.size; ++_i114) { - TColumn _elem105; // required - _elem105 = new TColumn(); - _elem105.read(iprot); - struct.columns.add(_elem105); + TColumn _elem115; // optional + _elem115 = new TColumn(); + _elem115.read(iprot); + struct.columns.add(_elem115); } iprot.readListEnd(); } @@ -600,9 +600,9 @@ public class TRowSet implements org.apac oprot.writeFieldBegin(ROWS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.rows.size())); - for (TRow _iter106 : struct.rows) + for (TRow _iter116 : struct.rows) { - _iter106.write(oprot); + _iter116.write(oprot); } oprot.writeListEnd(); } @@ -613,9 +613,9 @@ public class TRowSet implements org.apac oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size())); - for (TColumn _iter107 : struct.columns) + for (TColumn _iter117 : struct.columns) { - _iter107.write(oprot); + _iter117.write(oprot); } oprot.writeListEnd(); } @@ -642,9 +642,9 @@ public class TRowSet implements org.apac oprot.writeI64(struct.startRowOffset); { oprot.writeI32(struct.rows.size()); - for (TRow _iter108 : struct.rows) + for (TRow _iter118 : struct.rows) { - _iter108.write(oprot); + _iter118.write(oprot); } } BitSet optionals = new BitSet(); @@ -655,9 +655,9 @@ public class TRowSet implements org.apac if (struct.isSetColumns()) { { oprot.writeI32(struct.columns.size()); - for (TColumn _iter109 : struct.columns) + for (TColumn _iter119 : struct.columns) { - _iter109.write(oprot); + _iter119.write(oprot); } } } @@ -669,28 +669,28 @@ public class TRowSet implements org.apac struct.startRowOffset = iprot.readI64(); struct.setStartRowOffsetIsSet(true); { - org.apache.thrift.protocol.TList _list110 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.rows = new ArrayList(_list110.size); - for (int _i111 = 0; _i111 < _list110.size; ++_i111) + org.apache.thrift.protocol.TList _list120 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.rows = new ArrayList(_list120.size); + for (int _i121 = 0; _i121 < _list120.size; ++_i121) { - TRow _elem112; // required - _elem112 = new TRow(); - _elem112.read(iprot); - struct.rows.add(_elem112); + TRow _elem122; // optional + _elem122 = new TRow(); + _elem122.read(iprot); + struct.rows.add(_elem122); } } struct.setRowsIsSet(true); BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list113 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.columns = new ArrayList(_list113.size); - for (int _i114 = 0; _i114 < _list113.size; ++_i114) + org.apache.thrift.protocol.TList _list123 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.columns = new ArrayList(_list123.size); + for (int _i124 = 0; _i124 < _list123.size; ++_i124) { - TColumn _elem115; // required - _elem115 = new TColumn(); - _elem115.read(iprot); - struct.columns.add(_elem115); + TColumn _elem125; // optional + _elem125 = new TColumn(); + _elem125.read(iprot); + struct.columns.add(_elem125); } } struct.setColumnsIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java Sat Sep 21 15:49:49 2013 @@ -694,13 +694,13 @@ public class TStatus implements org.apac case 2: // INFO_MESSAGES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list116 = iprot.readListBegin(); - struct.infoMessages = new ArrayList(_list116.size); - for (int _i117 = 0; _i117 < _list116.size; ++_i117) + org.apache.thrift.protocol.TList _list126 = iprot.readListBegin(); + struct.infoMessages = new ArrayList(_list126.size); + for (int _i127 = 0; _i127 < _list126.size; ++_i127) { - String _elem118; // required - _elem118 = iprot.readString(); - struct.infoMessages.add(_elem118); + String _elem128; // optional + _elem128 = iprot.readString(); + struct.infoMessages.add(_elem128); } iprot.readListEnd(); } @@ -756,9 +756,9 @@ public class TStatus implements org.apac oprot.writeFieldBegin(INFO_MESSAGES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.infoMessages.size())); - for (String _iter119 : struct.infoMessages) + for (String _iter129 : struct.infoMessages) { - oprot.writeString(_iter119); + oprot.writeString(_iter129); } oprot.writeListEnd(); } @@ -819,9 +819,9 @@ public class TStatus implements org.apac if (struct.isSetInfoMessages()) { { oprot.writeI32(struct.infoMessages.size()); - for (String _iter120 : struct.infoMessages) + for (String _iter130 : struct.infoMessages) { - oprot.writeString(_iter120); + oprot.writeString(_iter130); } } } @@ -844,13 +844,13 @@ public class TStatus implements org.apac BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list121 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.infoMessages = new ArrayList(_list121.size); - for (int _i122 = 0; _i122 < _list121.size; ++_i122) + org.apache.thrift.protocol.TList _list131 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.infoMessages = new ArrayList(_list131.size); + for (int _i132 = 0; _i132 < _list131.size; ++_i132) { - String _elem123; // required - _elem123 = iprot.readString(); - struct.infoMessages.add(_elem123); + String _elem133; // optional + _elem133 = iprot.readString(); + struct.infoMessages.add(_elem133); } } struct.setInfoMessagesIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStructTypeEntry.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStructTypeEntry.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStructTypeEntry.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStructTypeEntry.java Sat Sep 21 15:49:49 2013 @@ -355,15 +355,15 @@ public class TStructTypeEntry implements case 1: // NAME_TO_TYPE_PTR if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin(); - struct.nameToTypePtr = new HashMap(2*_map0.size); - for (int _i1 = 0; _i1 < _map0.size; ++_i1) + org.apache.thrift.protocol.TMap _map10 = iprot.readMapBegin(); + struct.nameToTypePtr = new HashMap(2*_map10.size); + for (int _i11 = 0; _i11 < _map10.size; ++_i11) { - String _key2; // required - int _val3; // required - _key2 = iprot.readString(); - _val3 = iprot.readI32(); - struct.nameToTypePtr.put(_key2, _val3); + String _key12; // required + int _val13; // required + _key12 = iprot.readString(); + _val13 = iprot.readI32(); + struct.nameToTypePtr.put(_key12, _val13); } iprot.readMapEnd(); } @@ -389,10 +389,10 @@ public class TStructTypeEntry implements oprot.writeFieldBegin(NAME_TO_TYPE_PTR_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.nameToTypePtr.size())); - for (Map.Entry _iter4 : struct.nameToTypePtr.entrySet()) + for (Map.Entry _iter14 : struct.nameToTypePtr.entrySet()) { - oprot.writeString(_iter4.getKey()); - oprot.writeI32(_iter4.getValue()); + oprot.writeString(_iter14.getKey()); + oprot.writeI32(_iter14.getValue()); } oprot.writeMapEnd(); } @@ -417,10 +417,10 @@ public class TStructTypeEntry implements TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.nameToTypePtr.size()); - for (Map.Entry _iter5 : struct.nameToTypePtr.entrySet()) + for (Map.Entry _iter15 : struct.nameToTypePtr.entrySet()) { - oprot.writeString(_iter5.getKey()); - oprot.writeI32(_iter5.getValue()); + oprot.writeString(_iter15.getKey()); + oprot.writeI32(_iter15.getValue()); } } } @@ -429,15 +429,15 @@ public class TStructTypeEntry implements public void read(org.apache.thrift.protocol.TProtocol prot, TStructTypeEntry struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.nameToTypePtr = new HashMap(2*_map6.size); - for (int _i7 = 0; _i7 < _map6.size; ++_i7) + org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.nameToTypePtr = new HashMap(2*_map16.size); + for (int _i17 = 0; _i17 < _map16.size; ++_i17) { - String _key8; // required - int _val9; // required - _key8 = iprot.readString(); - _val9 = iprot.readI32(); - struct.nameToTypePtr.put(_key8, _val9); + String _key18; // required + int _val19; // required + _key18 = iprot.readString(); + _val19 = iprot.readI32(); + struct.nameToTypePtr.put(_key18, _val19); } } struct.setNameToTypePtrIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTableSchema.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTableSchema.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTableSchema.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTableSchema.java Sat Sep 21 15:49:49 2013 @@ -350,14 +350,14 @@ public class TTableSchema implements org case 1: // COLUMNS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list28 = iprot.readListBegin(); - struct.columns = new ArrayList(_list28.size); - for (int _i29 = 0; _i29 < _list28.size; ++_i29) + org.apache.thrift.protocol.TList _list38 = iprot.readListBegin(); + struct.columns = new ArrayList(_list38.size); + for (int _i39 = 0; _i39 < _list38.size; ++_i39) { - TColumnDesc _elem30; // required - _elem30 = new TColumnDesc(); - _elem30.read(iprot); - struct.columns.add(_elem30); + TColumnDesc _elem40; // optional + _elem40 = new TColumnDesc(); + _elem40.read(iprot); + struct.columns.add(_elem40); } iprot.readListEnd(); } @@ -383,9 +383,9 @@ public class TTableSchema implements org oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size())); - for (TColumnDesc _iter31 : struct.columns) + for (TColumnDesc _iter41 : struct.columns) { - _iter31.write(oprot); + _iter41.write(oprot); } oprot.writeListEnd(); } @@ -410,9 +410,9 @@ public class TTableSchema implements org TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.columns.size()); - for (TColumnDesc _iter32 : struct.columns) + for (TColumnDesc _iter42 : struct.columns) { - _iter32.write(oprot); + _iter42.write(oprot); } } } @@ -421,14 +421,14 @@ public class TTableSchema implements org public void read(org.apache.thrift.protocol.TProtocol prot, TTableSchema struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.columns = new ArrayList(_list33.size); - for (int _i34 = 0; _i34 < _list33.size; ++_i34) + org.apache.thrift.protocol.TList _list43 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.columns = new ArrayList(_list43.size); + for (int _i44 = 0; _i44 < _list43.size; ++_i44) { - TColumnDesc _elem35; // required - _elem35 = new TColumnDesc(); - _elem35.read(iprot); - struct.columns.add(_elem35); + TColumnDesc _elem45; // optional + _elem45 = new TColumnDesc(); + _elem45.read(iprot); + struct.columns.add(_elem45); } } struct.setColumnsIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeDesc.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeDesc.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeDesc.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeDesc.java Sat Sep 21 15:49:49 2013 @@ -350,14 +350,14 @@ public class TTypeDesc implements org.ap case 1: // TYPES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list20 = iprot.readListBegin(); - struct.types = new ArrayList(_list20.size); - for (int _i21 = 0; _i21 < _list20.size; ++_i21) + org.apache.thrift.protocol.TList _list30 = iprot.readListBegin(); + struct.types = new ArrayList(_list30.size); + for (int _i31 = 0; _i31 < _list30.size; ++_i31) { - TTypeEntry _elem22; // required - _elem22 = new TTypeEntry(); - _elem22.read(iprot); - struct.types.add(_elem22); + TTypeEntry _elem32; // optional + _elem32 = new TTypeEntry(); + _elem32.read(iprot); + struct.types.add(_elem32); } iprot.readListEnd(); } @@ -383,9 +383,9 @@ public class TTypeDesc implements org.ap oprot.writeFieldBegin(TYPES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.types.size())); - for (TTypeEntry _iter23 : struct.types) + for (TTypeEntry _iter33 : struct.types) { - _iter23.write(oprot); + _iter33.write(oprot); } oprot.writeListEnd(); } @@ -410,9 +410,9 @@ public class TTypeDesc implements org.ap TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.types.size()); - for (TTypeEntry _iter24 : struct.types) + for (TTypeEntry _iter34 : struct.types) { - _iter24.write(oprot); + _iter34.write(oprot); } } } @@ -421,14 +421,14 @@ public class TTypeDesc implements org.ap public void read(org.apache.thrift.protocol.TProtocol prot, TTypeDesc struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list25 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.types = new ArrayList(_list25.size); - for (int _i26 = 0; _i26 < _list25.size; ++_i26) + org.apache.thrift.protocol.TList _list35 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.types = new ArrayList(_list35.size); + for (int _i36 = 0; _i36 < _list35.size; ++_i36) { - TTypeEntry _elem27; // required - _elem27 = new TTypeEntry(); - _elem27.read(iprot); - struct.types.add(_elem27); + TTypeEntry _elem37; // optional + _elem37 = new TTypeEntry(); + _elem37.read(iprot); + struct.types.add(_elem37); } } struct.setTypesIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java Sat Sep 21 15:49:49 2013 @@ -29,7 +29,8 @@ public enum TTypeId implements org.apach USER_DEFINED_TYPE(14), DECIMAL_TYPE(15), NULL_TYPE(16), - DATE_TYPE(17); + DATE_TYPE(17), + VARCHAR_TYPE(18); private final int value; @@ -86,6 +87,8 @@ public enum TTypeId implements org.apach return NULL_TYPE; case 17: return DATE_TYPE; + case 18: + return VARCHAR_TYPE; default: return null; } Modified: hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TUnionTypeEntry.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TUnionTypeEntry.java?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TUnionTypeEntry.java (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TUnionTypeEntry.java Sat Sep 21 15:49:49 2013 @@ -355,15 +355,15 @@ public class TUnionTypeEntry implements case 1: // NAME_TO_TYPE_PTR if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map10 = iprot.readMapBegin(); - struct.nameToTypePtr = new HashMap(2*_map10.size); - for (int _i11 = 0; _i11 < _map10.size; ++_i11) + org.apache.thrift.protocol.TMap _map20 = iprot.readMapBegin(); + struct.nameToTypePtr = new HashMap(2*_map20.size); + for (int _i21 = 0; _i21 < _map20.size; ++_i21) { - String _key12; // required - int _val13; // required - _key12 = iprot.readString(); - _val13 = iprot.readI32(); - struct.nameToTypePtr.put(_key12, _val13); + String _key22; // required + int _val23; // required + _key22 = iprot.readString(); + _val23 = iprot.readI32(); + struct.nameToTypePtr.put(_key22, _val23); } iprot.readMapEnd(); } @@ -389,10 +389,10 @@ public class TUnionTypeEntry implements oprot.writeFieldBegin(NAME_TO_TYPE_PTR_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.nameToTypePtr.size())); - for (Map.Entry _iter14 : struct.nameToTypePtr.entrySet()) + for (Map.Entry _iter24 : struct.nameToTypePtr.entrySet()) { - oprot.writeString(_iter14.getKey()); - oprot.writeI32(_iter14.getValue()); + oprot.writeString(_iter24.getKey()); + oprot.writeI32(_iter24.getValue()); } oprot.writeMapEnd(); } @@ -417,10 +417,10 @@ public class TUnionTypeEntry implements TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.nameToTypePtr.size()); - for (Map.Entry _iter15 : struct.nameToTypePtr.entrySet()) + for (Map.Entry _iter25 : struct.nameToTypePtr.entrySet()) { - oprot.writeString(_iter15.getKey()); - oprot.writeI32(_iter15.getValue()); + oprot.writeString(_iter25.getKey()); + oprot.writeI32(_iter25.getValue()); } } } @@ -429,15 +429,15 @@ public class TUnionTypeEntry implements public void read(org.apache.thrift.protocol.TProtocol prot, TUnionTypeEntry struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.nameToTypePtr = new HashMap(2*_map16.size); - for (int _i17 = 0; _i17 < _map16.size; ++_i17) + org.apache.thrift.protocol.TMap _map26 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.nameToTypePtr = new HashMap(2*_map26.size); + for (int _i27 = 0; _i27 < _map26.size; ++_i27) { - String _key18; // required - int _val19; // required - _key18 = iprot.readString(); - _val19 = iprot.readI32(); - struct.nameToTypePtr.put(_key18, _val19); + String _key28; // required + int _val29; // required + _key28 = iprot.readString(); + _val29 = iprot.readI32(); + struct.nameToTypePtr.put(_key28, _val29); } } struct.setNameToTypePtrIsSet(true); Modified: hive/branches/vectorization/service/src/gen/thrift/gen-py/TCLIService/constants.py URL: http://svn.apache.org/viewvc/hive/branches/vectorization/service/src/gen/thrift/gen-py/TCLIService/constants.py?rev=1525254&r1=1525253&r2=1525254&view=diff ============================================================================== --- hive/branches/vectorization/service/src/gen/thrift/gen-py/TCLIService/constants.py (original) +++ hive/branches/vectorization/service/src/gen/thrift/gen-py/TCLIService/constants.py Sat Sep 21 15:49:49 2013 @@ -23,6 +23,7 @@ PRIMITIVE_TYPES = set([ 15, 16, 17, + 18, ]) COMPLEX_TYPES = set([ 10, @@ -53,4 +54,6 @@ TYPE_NAMES = { 15 : "DECIMAL", 16 : "NULL", 17 : "DATE", + 18 : "VARCHAR", } +CHARACTER_MAXIMUM_LENGTH = "characterMaximumLength"