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 AD09C1140B for ; Thu, 18 Sep 2014 18:39:24 +0000 (UTC) Received: (qmail 52599 invoked by uid 500); 18 Sep 2014 18:39:24 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 52555 invoked by uid 500); 18 Sep 2014 18:39:24 -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 52544 invoked by uid 99); 18 Sep 2014 18:39:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2014 18:39:24 +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; Thu, 18 Sep 2014 18:38:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3DA2323888FE; Thu, 18 Sep 2014 18:38:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1626043 - in /hive/trunk: metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ ql/if/ ql/src/gen/thrift/gen-cpp/ ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/ ql/src/gen/thrift/gen-php/ ql/src/ge... Date: Thu, 18 Sep 2014 18:38:53 -0000 To: commits@hive.apache.org From: prasanthj@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140918183854.3DA2323888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: prasanthj Date: Thu Sep 18 18:38:52 2014 New Revision: 1626043 URL: http://svn.apache.org/r1626043 Log: HIVE-8142: Add merge operators to queryplan.thrift instead of generated source file (Prasanth J reviewed by Gunther Hagleitner) Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java hive/trunk/ql/if/queryplan.thrift hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java hive/trunk/ql/src/gen/thrift/gen-php/Types.php hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.cpp hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.h hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java hive/trunk/serde/src/gen/thrift/gen-py/complex/ttypes.py hive/trunk/serde/src/gen/thrift/gen-rb/complex_types.rb Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java (original) +++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java Thu Sep 18 18:38:52 2014 @@ -135,9 +135,9 @@ public class FieldSchema implements org. String comment) { this(); - this.name = name; - this.type = type; - this.comment = comment; + this.name = org.apache.hive.common.util.HiveStringUtils.intern(name); + this.type = org.apache.hive.common.util.HiveStringUtils.intern(type); + this.comment = org.apache.hive.common.util.HiveStringUtils.intern(comment); } /** @@ -145,13 +145,13 @@ public class FieldSchema implements org. */ public FieldSchema(FieldSchema other) { if (other.isSetName()) { - this.name = other.name; + this.name = org.apache.hive.common.util.HiveStringUtils.intern(other.name); } if (other.isSetType()) { - this.type = other.type; + this.type = org.apache.hive.common.util.HiveStringUtils.intern(other.type); } if (other.isSetComment()) { - this.comment = other.comment; + this.comment = org.apache.hive.common.util.HiveStringUtils.intern(other.comment); } } @@ -171,7 +171,7 @@ public class FieldSchema implements org. } public void setName(String name) { - this.name = name; + this.name = org.apache.hive.common.util.HiveStringUtils.intern(name); } public void unsetName() { @@ -194,7 +194,7 @@ public class FieldSchema implements org. } public void setType(String type) { - this.type = type; + this.type = org.apache.hive.common.util.HiveStringUtils.intern(type); } public void unsetType() { @@ -217,7 +217,7 @@ public class FieldSchema implements org. } public void setComment(String comment) { - this.comment = comment; + this.comment = org.apache.hive.common.util.HiveStringUtils.intern(comment); } public void unsetComment() { Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java (original) +++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java Thu Sep 18 18:38:52 2014 @@ -182,14 +182,14 @@ public class Partition implements org.ap { this(); this.values = values; - this.dbName = dbName; - this.tableName = tableName; + this.dbName = org.apache.hive.common.util.HiveStringUtils.intern(dbName); + this.tableName = org.apache.hive.common.util.HiveStringUtils.intern(tableName); this.createTime = createTime; setCreateTimeIsSet(true); this.lastAccessTime = lastAccessTime; setLastAccessTimeIsSet(true); this.sd = sd; - this.parameters = parameters; + this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters); } /** @@ -205,10 +205,10 @@ public class Partition implements org.ap this.values = __this__values; } if (other.isSetDbName()) { - this.dbName = other.dbName; + this.dbName = org.apache.hive.common.util.HiveStringUtils.intern(other.dbName); } if (other.isSetTableName()) { - this.tableName = other.tableName; + this.tableName = org.apache.hive.common.util.HiveStringUtils.intern(other.tableName); } this.createTime = other.createTime; this.lastAccessTime = other.lastAccessTime; @@ -222,9 +222,9 @@ public class Partition implements org.ap String other_element_key = other_element.getKey(); String other_element_value = other_element.getValue(); - String __this__parameters_copy_key = other_element_key; + String __this__parameters_copy_key = org.apache.hive.common.util.HiveStringUtils.intern(other_element_key); - String __this__parameters_copy_value = other_element_value; + String __this__parameters_copy_value = org.apache.hive.common.util.HiveStringUtils.intern(other_element_value); __this__parameters.put(__this__parameters_copy_key, __this__parameters_copy_value); } @@ -296,7 +296,7 @@ public class Partition implements org.ap } public void setDbName(String dbName) { - this.dbName = dbName; + this.dbName = org.apache.hive.common.util.HiveStringUtils.intern(dbName); } public void unsetDbName() { @@ -319,7 +319,7 @@ public class Partition implements org.ap } public void setTableName(String tableName) { - this.tableName = tableName; + this.tableName = org.apache.hive.common.util.HiveStringUtils.intern(tableName); } public void unsetTableName() { @@ -420,7 +420,7 @@ public class Partition implements org.ap } public void setParameters(Map parameters) { - this.parameters = parameters; + this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters); } public void unsetParameters() { Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java (original) +++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java Thu Sep 18 18:38:52 2014 @@ -137,9 +137,9 @@ public class SerDeInfo implements org.ap Map parameters) { this(); - this.name = name; - this.serializationLib = serializationLib; - this.parameters = parameters; + this.name = org.apache.hive.common.util.HiveStringUtils.intern(name); + this.serializationLib = org.apache.hive.common.util.HiveStringUtils.intern(serializationLib); + this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters); } /** @@ -147,10 +147,10 @@ public class SerDeInfo implements org.ap */ public SerDeInfo(SerDeInfo other) { if (other.isSetName()) { - this.name = other.name; + this.name = org.apache.hive.common.util.HiveStringUtils.intern(other.name); } if (other.isSetSerializationLib()) { - this.serializationLib = other.serializationLib; + this.serializationLib = org.apache.hive.common.util.HiveStringUtils.intern(other.serializationLib); } if (other.isSetParameters()) { Map __this__parameters = new HashMap(); @@ -159,9 +159,9 @@ public class SerDeInfo implements org.ap String other_element_key = other_element.getKey(); String other_element_value = other_element.getValue(); - String __this__parameters_copy_key = other_element_key; + String __this__parameters_copy_key = org.apache.hive.common.util.HiveStringUtils.intern(other_element_key); - String __this__parameters_copy_value = other_element_value; + String __this__parameters_copy_value = org.apache.hive.common.util.HiveStringUtils.intern(other_element_value); __this__parameters.put(__this__parameters_copy_key, __this__parameters_copy_value); } @@ -185,7 +185,7 @@ public class SerDeInfo implements org.ap } public void setName(String name) { - this.name = name; + this.name = org.apache.hive.common.util.HiveStringUtils.intern(name); } public void unsetName() { @@ -208,7 +208,7 @@ public class SerDeInfo implements org.ap } public void setSerializationLib(String serializationLib) { - this.serializationLib = serializationLib; + this.serializationLib = org.apache.hive.common.util.HiveStringUtils.intern(serializationLib); } public void unsetSerializationLib() { @@ -242,7 +242,7 @@ public class SerDeInfo implements org.ap } public void setParameters(Map parameters) { - this.parameters = parameters; + this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters); } public void unsetParameters() { Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java (original) +++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java Thu Sep 18 18:38:52 2014 @@ -216,17 +216,17 @@ public class StorageDescriptor implement { this(); this.cols = cols; - this.location = location; - this.inputFormat = inputFormat; - this.outputFormat = outputFormat; + this.location = org.apache.hive.common.util.HiveStringUtils.intern(location); + this.inputFormat = org.apache.hive.common.util.HiveStringUtils.intern(inputFormat); + this.outputFormat = org.apache.hive.common.util.HiveStringUtils.intern(outputFormat); this.compressed = compressed; setCompressedIsSet(true); this.numBuckets = numBuckets; setNumBucketsIsSet(true); this.serdeInfo = serdeInfo; - this.bucketCols = bucketCols; + this.bucketCols = org.apache.hive.common.util.HiveStringUtils.intern(bucketCols); this.sortCols = sortCols; - this.parameters = parameters; + this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters); } /** @@ -242,13 +242,13 @@ public class StorageDescriptor implement this.cols = __this__cols; } if (other.isSetLocation()) { - this.location = other.location; + this.location = org.apache.hive.common.util.HiveStringUtils.intern(other.location); } if (other.isSetInputFormat()) { - this.inputFormat = other.inputFormat; + this.inputFormat = org.apache.hive.common.util.HiveStringUtils.intern(other.inputFormat); } if (other.isSetOutputFormat()) { - this.outputFormat = other.outputFormat; + this.outputFormat = org.apache.hive.common.util.HiveStringUtils.intern(other.outputFormat); } this.compressed = other.compressed; this.numBuckets = other.numBuckets; @@ -276,9 +276,9 @@ public class StorageDescriptor implement String other_element_key = other_element.getKey(); String other_element_value = other_element.getValue(); - String __this__parameters_copy_key = other_element_key; + String __this__parameters_copy_key = org.apache.hive.common.util.HiveStringUtils.intern(other_element_key); - String __this__parameters_copy_value = other_element_value; + String __this__parameters_copy_value = org.apache.hive.common.util.HiveStringUtils.intern(other_element_value); __this__parameters.put(__this__parameters_copy_key, __this__parameters_copy_value); } @@ -356,7 +356,7 @@ public class StorageDescriptor implement } public void setLocation(String location) { - this.location = location; + this.location = org.apache.hive.common.util.HiveStringUtils.intern(location); } public void unsetLocation() { @@ -379,7 +379,7 @@ public class StorageDescriptor implement } public void setInputFormat(String inputFormat) { - this.inputFormat = inputFormat; + this.inputFormat = org.apache.hive.common.util.HiveStringUtils.intern(inputFormat); } public void unsetInputFormat() { @@ -402,7 +402,7 @@ public class StorageDescriptor implement } public void setOutputFormat(String outputFormat) { - this.outputFormat = outputFormat; + this.outputFormat = org.apache.hive.common.util.HiveStringUtils.intern(outputFormat); } public void unsetOutputFormat() { @@ -507,7 +507,7 @@ public class StorageDescriptor implement } public void setBucketCols(List bucketCols) { - this.bucketCols = bucketCols; + this.bucketCols = org.apache.hive.common.util.HiveStringUtils.intern(bucketCols); } public void unsetBucketCols() { @@ -579,7 +579,7 @@ public class StorageDescriptor implement } public void setParameters(Map parameters) { - this.parameters = parameters; + this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters); } public void unsetParameters() { Modified: hive/trunk/ql/if/queryplan.thrift URL: http://svn.apache.org/viewvc/hive/trunk/ql/if/queryplan.thrift?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/ql/if/queryplan.thrift (original) +++ hive/trunk/ql/if/queryplan.thrift Thu Sep 18 18:38:52 2014 @@ -57,6 +57,8 @@ enum OperatorType { MUX, DEMUX, EVENT, + ORCFILEMERGE, + RCFILEMERGE, } struct Operator { Modified: hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp (original) +++ hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp Thu Sep 18 18:38:52 2014 @@ -52,7 +52,9 @@ int _kOperatorTypeValues[] = { OperatorType::PTF, OperatorType::MUX, OperatorType::DEMUX, - OperatorType::EVENT + OperatorType::EVENT, + OperatorType::ORCFILEMERGE, + OperatorType::RCFILEMERGE }; const char* _kOperatorTypeNames[] = { "JOIN", @@ -76,9 +78,11 @@ const char* _kOperatorTypeNames[] = { "PTF", "MUX", "DEMUX", - "EVENT" + "EVENT", + "ORCFILEMERGE", + "RCFILEMERGE" }; -const std::map _OperatorType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(22, _kOperatorTypeValues, _kOperatorTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); +const std::map _OperatorType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(24, _kOperatorTypeValues, _kOperatorTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); int _kTaskTypeValues[] = { TaskType::MAP, Modified: hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h (original) +++ hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h Thu Sep 18 18:38:52 2014 @@ -57,7 +57,9 @@ struct OperatorType { PTF = 18, MUX = 19, DEMUX = 20, - EVENT = 21 + EVENT = 21, + ORCFILEMERGE = 22, + RCFILEMERGE = 23 }; }; Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java (original) +++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java Thu Sep 18 18:38:52 2014 @@ -7,6 +7,10 @@ package org.apache.hadoop.hive.ql.plan.api; +import java.util.Map; +import java.util.HashMap; +import org.apache.thrift.TEnum; + public enum OperatorType implements org.apache.thrift.TEnum { JOIN(0), MAPJOIN(1), Modified: hive/trunk/ql/src/gen/thrift/gen-php/Types.php URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-php/Types.php?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/ql/src/gen/thrift/gen-php/Types.php (original) +++ hive/trunk/ql/src/gen/thrift/gen-php/Types.php Thu Sep 18 18:38:52 2014 @@ -57,6 +57,8 @@ final class OperatorType { const MUX = 19; const DEMUX = 20; const EVENT = 21; + const ORCFILEMERGE = 22; + const RCFILEMERGE = 23; static public $__names = array( 0 => 'JOIN', 1 => 'MAPJOIN', @@ -80,6 +82,8 @@ final class OperatorType { 19 => 'MUX', 20 => 'DEMUX', 21 => 'EVENT', + 22 => 'ORCFILEMERGE', + 23 => 'RCFILEMERGE', ); } Modified: hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py (original) +++ hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py Thu Sep 18 18:38:52 2014 @@ -67,6 +67,8 @@ class OperatorType: MUX = 19 DEMUX = 20 EVENT = 21 + ORCFILEMERGE = 22 + RCFILEMERGE = 23 _VALUES_TO_NAMES = { 0: "JOIN", @@ -91,6 +93,8 @@ class OperatorType: 19: "MUX", 20: "DEMUX", 21: "EVENT", + 22: "ORCFILEMERGE", + 23: "RCFILEMERGE", } _NAMES_TO_VALUES = { @@ -116,6 +120,8 @@ class OperatorType: "MUX": 19, "DEMUX": 20, "EVENT": 21, + "ORCFILEMERGE": 22, + "RCFILEMERGE": 23, } class TaskType: Modified: hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb (original) +++ hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb Thu Sep 18 18:38:52 2014 @@ -43,8 +43,10 @@ module OperatorType MUX = 19 DEMUX = 20 EVENT = 21 - VALUE_MAP = {0 => "JOIN", 1 => "MAPJOIN", 2 => "EXTRACT", 3 => "FILTER", 4 => "FORWARD", 5 => "GROUPBY", 6 => "LIMIT", 7 => "SCRIPT", 8 => "SELECT", 9 => "TABLESCAN", 10 => "FILESINK", 11 => "REDUCESINK", 12 => "UNION", 13 => "UDTF", 14 => "LATERALVIEWJOIN", 15 => "LATERALVIEWFORWARD", 16 => "HASHTABLESINK", 17 => "HASHTABLEDUMMY", 18 => "PTF", 19 => "MUX", 20 => "DEMUX", 21 => "EVENT"} - VALID_VALUES = Set.new([JOIN, MAPJOIN, EXTRACT, FILTER, FORWARD, GROUPBY, LIMIT, SCRIPT, SELECT, TABLESCAN, FILESINK, REDUCESINK, UNION, UDTF, LATERALVIEWJOIN, LATERALVIEWFORWARD, HASHTABLESINK, HASHTABLEDUMMY, PTF, MUX, DEMUX, EVENT]).freeze + ORCFILEMERGE = 22 + RCFILEMERGE = 23 + VALUE_MAP = {0 => "JOIN", 1 => "MAPJOIN", 2 => "EXTRACT", 3 => "FILTER", 4 => "FORWARD", 5 => "GROUPBY", 6 => "LIMIT", 7 => "SCRIPT", 8 => "SELECT", 9 => "TABLESCAN", 10 => "FILESINK", 11 => "REDUCESINK", 12 => "UNION", 13 => "UDTF", 14 => "LATERALVIEWJOIN", 15 => "LATERALVIEWFORWARD", 16 => "HASHTABLESINK", 17 => "HASHTABLEDUMMY", 18 => "PTF", 19 => "MUX", 20 => "DEMUX", 21 => "EVENT", 22 => "ORCFILEMERGE", 23 => "RCFILEMERGE"} + VALID_VALUES = Set.new([JOIN, MAPJOIN, EXTRACT, FILTER, FORWARD, GROUPBY, LIMIT, SCRIPT, SELECT, TABLESCAN, FILESINK, REDUCESINK, UNION, UDTF, LATERALVIEWJOIN, LATERALVIEWFORWARD, HASHTABLESINK, HASHTABLEDUMMY, PTF, MUX, DEMUX, EVENT, ORCFILEMERGE, RCFILEMERGE]).freeze end module TaskType Modified: hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.cpp URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.cpp?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.cpp (original) +++ hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.cpp Thu Sep 18 18:38:52 2014 @@ -622,4 +622,100 @@ void swap(Complex &a, Complex &b) { swap(a.__isset, b.__isset); } +const char* SetIntString::ascii_fingerprint = "842B41C940D05DFB16183142A90DFC54"; +const uint8_t SetIntString::binary_fingerprint[16] = {0x84,0x2B,0x41,0xC9,0x40,0xD0,0x5D,0xFB,0x16,0x18,0x31,0x42,0xA9,0x0D,0xFC,0x54}; + +uint32_t SetIntString::read(::apache::thrift::protocol::TProtocol* iprot) { + + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + + while (true) + { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + switch (fid) + { + case 1: + if (ftype == ::apache::thrift::protocol::T_SET) { + { + this->sIntString.clear(); + uint32_t _size64; + ::apache::thrift::protocol::TType _etype67; + xfer += iprot->readSetBegin(_etype67, _size64); + uint32_t _i68; + for (_i68 = 0; _i68 < _size64; ++_i68) + { + IntString _elem69; + xfer += _elem69.read(iprot); + this->sIntString.insert(_elem69); + } + xfer += iprot->readSetEnd(); + } + this->__isset.sIntString = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 2: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->aString); + this->__isset.aString = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + return xfer; +} + +uint32_t SetIntString::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + xfer += oprot->writeStructBegin("SetIntString"); + + xfer += oprot->writeFieldBegin("sIntString", ::apache::thrift::protocol::T_SET, 1); + { + xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->sIntString.size())); + std::set ::const_iterator _iter70; + for (_iter70 = this->sIntString.begin(); _iter70 != this->sIntString.end(); ++_iter70) + { + xfer += (*_iter70).write(oprot); + } + xfer += oprot->writeSetEnd(); + } + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("aString", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString(this->aString); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + +void swap(SetIntString &a, SetIntString &b) { + using ::std::swap; + swap(a.sIntString, b.sIntString); + swap(a.aString, b.aString); + swap(a.__isset, b.__isset); +} + Modified: hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.h URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.h?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.h (original) +++ hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.h Thu Sep 18 18:38:52 2014 @@ -296,6 +296,57 @@ class Complex { void swap(Complex &a, Complex &b); +typedef struct _SetIntString__isset { + _SetIntString__isset() : sIntString(false), aString(false) {} + bool sIntString; + bool aString; +} _SetIntString__isset; + +class SetIntString { + public: + + static const char* ascii_fingerprint; // = "842B41C940D05DFB16183142A90DFC54"; + static const uint8_t binary_fingerprint[16]; // = {0x84,0x2B,0x41,0xC9,0x40,0xD0,0x5D,0xFB,0x16,0x18,0x31,0x42,0xA9,0x0D,0xFC,0x54}; + + SetIntString() : aString() { + } + + virtual ~SetIntString() throw() {} + + std::set sIntString; + std::string aString; + + _SetIntString__isset __isset; + + void __set_sIntString(const std::set & val) { + sIntString = val; + } + + void __set_aString(const std::string& val) { + aString = val; + } + + bool operator == (const SetIntString & rhs) const + { + if (!(sIntString == rhs.sIntString)) + return false; + if (!(aString == rhs.aString)) + return false; + return true; + } + bool operator != (const SetIntString &rhs) const { + return !(*this == rhs); + } + + bool operator < (const SetIntString & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + +}; + +void swap(SetIntString &a, SetIntString &b); + #endif Modified: hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java (original) +++ hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java Thu Sep 18 18:38:52 2014 @@ -37,8 +37,6 @@ public class serdeConstants { public static final String SERIALIZATION_CLASS = "serialization.class"; - public static final String SERIALIZATION_TYPE = "serialization.type"; - public static final String SERIALIZATION_FORMAT = "serialization.format"; public static final String SERIALIZATION_DDL = "serialization.ddl"; Modified: hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java (original) +++ hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java Thu Sep 18 18:38:52 2014 @@ -1267,7 +1267,7 @@ public class Complex implements org.apac for (int _i28 = 0; _i28 < _map27.size; ++_i28) { String _key29; // required - String _val30; // optional + String _val30; // required _key29 = iprot.readString(); _val30 = iprot.readString(); struct.mStringString.put(_key29, _val30); @@ -1287,7 +1287,7 @@ public class Complex implements org.apac for (int _i32 = 0; _i32 < _map31.size; ++_i32) { String _key33; // required - Map> _val34; // optional + Map> _val34; // required _key33 = iprot.readString(); { org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin(); @@ -1295,7 +1295,7 @@ public class Complex implements org.apac for (int _i36 = 0; _i36 < _map35.size; ++_i36) { String _key37; // required - Map _val38; // optional + Map _val38; // required _key37 = iprot.readString(); { org.apache.thrift.protocol.TMap _map39 = iprot.readMapBegin(); @@ -1303,7 +1303,7 @@ public class Complex implements org.apac for (int _i40 = 0; _i40 < _map39.size; ++_i40) { String _key41; // required - PropValueUnion _val42; // optional + PropValueUnion _val42; // required _key41 = iprot.readString(); _val42 = new PropValueUnion(); _val42.read(iprot); @@ -1651,7 +1651,7 @@ public class Complex implements org.apac for (int _i67 = 0; _i67 < _map66.size; ++_i67) { String _key68; // required - String _val69; // optional + String _val69; // required _key68 = iprot.readString(); _val69 = iprot.readString(); struct.mStringString.put(_key68, _val69); @@ -1666,7 +1666,7 @@ public class Complex implements org.apac for (int _i71 = 0; _i71 < _map70.size; ++_i71) { String _key72; // required - Map> _val73; // optional + Map> _val73; // required _key72 = iprot.readString(); { org.apache.thrift.protocol.TMap _map74 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); @@ -1674,7 +1674,7 @@ public class Complex implements org.apac for (int _i75 = 0; _i75 < _map74.size; ++_i75) { String _key76; // required - Map _val77; // optional + Map _val77; // required _key76 = iprot.readString(); { org.apache.thrift.protocol.TMap _map78 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); @@ -1682,7 +1682,7 @@ public class Complex implements org.apac for (int _i79 = 0; _i79 < _map78.size; ++_i79) { String _key80; // required - PropValueUnion _val81; // optional + PropValueUnion _val81; // required _key80 = iprot.readString(); _val81 = new PropValueUnion(); _val81.read(iprot); Modified: hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java (original) +++ hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java Thu Sep 18 18:38:52 2014 @@ -320,7 +320,7 @@ public class PropValueUnion extends org. for (int _i4 = 0; _i4 < _map3.size; ++_i4) { String _key5; // required - String _val6; // optional + String _val6; // required _key5 = iprot.readString(); _val6 = iprot.readString(); unionMStringString.put(_key5, _val6); @@ -438,7 +438,7 @@ public class PropValueUnion extends org. for (int _i13 = 0; _i13 < _map12.size; ++_i13) { String _key14; // required - String _val15; // optional + String _val15; // required _key14 = iprot.readString(); _val15 = iprot.readString(); unionMStringString.put(_key14, _val15); Modified: hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java (original) +++ hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java Thu Sep 18 18:38:52 2014 @@ -6,6 +6,7 @@ */ package org.apache.hadoop.hive.serde2.thrift.test; +import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -42,8 +43,8 @@ public class SetIntString implements org schemes.put(TupleScheme.class, new SetIntStringTupleSchemeFactory()); } - public Set sIntString; // required - public String aString; // required + private Set sIntString; // required + private String aString; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -176,9 +177,8 @@ public class SetIntString implements org return this.sIntString; } - public SetIntString setSIntString(Set sIntString) { + public void setSIntString(Set sIntString) { this.sIntString = sIntString; - return this; } public void unsetSIntString() { @@ -200,9 +200,8 @@ public class SetIntString implements org return this.aString; } - public SetIntString setAString(String aString) { + public void setAString(String aString) { this.aString = aString; - return this; } public void unsetAString() { @@ -304,7 +303,19 @@ public class SetIntString implements org @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_sIntString = true && (isSetSIntString()); + builder.append(present_sIntString); + if (present_sIntString) + builder.append(sIntString); + + boolean present_aString = true && (isSetAString()); + builder.append(present_aString); + if (present_aString) + builder.append(aString); + + return builder.toHashCode(); } public int compareTo(SetIntString other) { @@ -416,14 +427,14 @@ public class SetIntString implements org case 1: // S_INT_STRING if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set34 = iprot.readSetBegin(); - struct.sIntString = new HashSet(2*_set34.size); - for (int _i35 = 0; _i35 < _set34.size; ++_i35) + org.apache.thrift.protocol.TSet _set82 = iprot.readSetBegin(); + struct.sIntString = new HashSet(2*_set82.size); + for (int _i83 = 0; _i83 < _set82.size; ++_i83) { - IntString _elem36; // required - _elem36 = new IntString(); - _elem36.read(iprot); - struct.sIntString.add(_elem36); + IntString _elem84; // required + _elem84 = new IntString(); + _elem84.read(iprot); + struct.sIntString.add(_elem84); } iprot.readSetEnd(); } @@ -446,8 +457,6 @@ public class SetIntString implements org iprot.readFieldEnd(); } iprot.readStructEnd(); - - // check for required fields of primitive type, which can't be checked in the validate method struct.validate(); } @@ -459,9 +468,9 @@ public class SetIntString implements org oprot.writeFieldBegin(S_INT_STRING_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, struct.sIntString.size())); - for (IntString _iter37 : struct.sIntString) + for (IntString _iter85 : struct.sIntString) { - _iter37.write(oprot); + _iter85.write(oprot); } oprot.writeSetEnd(); } @@ -500,9 +509,9 @@ public class SetIntString implements org if (struct.isSetSIntString()) { { oprot.writeI32(struct.sIntString.size()); - for (IntString _iter38 : struct.sIntString) + for (IntString _iter86 : struct.sIntString) { - _iter38.write(oprot); + _iter86.write(oprot); } } } @@ -517,14 +526,14 @@ public class SetIntString implements org BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TSet _set39 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.sIntString = new HashSet(2*_set39.size); - for (int _i40 = 0; _i40 < _set39.size; ++_i40) + org.apache.thrift.protocol.TSet _set87 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.sIntString = new HashSet(2*_set87.size); + for (int _i88 = 0; _i88 < _set87.size; ++_i88) { - IntString _elem41; // required - _elem41 = new IntString(); - _elem41.read(iprot); - struct.sIntString.add(_elem41); + IntString _elem89; // required + _elem89 = new IntString(); + _elem89.read(iprot); + struct.sIntString.add(_elem89); } } struct.setSIntStringIsSet(true); Modified: hive/trunk/serde/src/gen/thrift/gen-py/complex/ttypes.py URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-py/complex/ttypes.py?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/serde/src/gen/thrift/gen-py/complex/ttypes.py (original) +++ hive/trunk/serde/src/gen/thrift/gen-py/complex/ttypes.py Thu Sep 18 18:38:52 2014 @@ -487,3 +487,84 @@ class Complex: def __ne__(self, other): return not (self == other) + +class SetIntString: + """ + Attributes: + - sIntString + - aString + """ + + thrift_spec = ( + None, # 0 + (1, TType.SET, 'sIntString', (TType.STRUCT,(IntString, IntString.thrift_spec)), None, ), # 1 + (2, TType.STRING, 'aString', None, None, ), # 2 + ) + + def __init__(self, sIntString=None, aString=None,): + self.sIntString = sIntString + self.aString = aString + + def read(self, iprot): + if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: + fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec)) + return + iprot.readStructBegin() + while True: + (fname, ftype, fid) = iprot.readFieldBegin() + if ftype == TType.STOP: + break + if fid == 1: + if ftype == TType.SET: + self.sIntString = set() + (_etype76, _size73) = iprot.readSetBegin() + for _i77 in xrange(_size73): + _elem78 = IntString() + _elem78.read(iprot) + self.sIntString.add(_elem78) + iprot.readSetEnd() + else: + iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRING: + self.aString = iprot.readString(); + else: + iprot.skip(ftype) + else: + iprot.skip(ftype) + iprot.readFieldEnd() + iprot.readStructEnd() + + def write(self, oprot): + if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None: + oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) + return + oprot.writeStructBegin('SetIntString') + if self.sIntString is not None: + oprot.writeFieldBegin('sIntString', TType.SET, 1) + oprot.writeSetBegin(TType.STRUCT, len(self.sIntString)) + for iter79 in self.sIntString: + iter79.write(oprot) + oprot.writeSetEnd() + oprot.writeFieldEnd() + if self.aString is not None: + oprot.writeFieldBegin('aString', TType.STRING, 2) + oprot.writeString(self.aString) + oprot.writeFieldEnd() + oprot.writeFieldStop() + oprot.writeStructEnd() + + def validate(self): + return + + + def __repr__(self): + L = ['%s=%r' % (key, value) + for key, value in self.__dict__.iteritems()] + return '%s(%s)' % (self.__class__.__name__, ', '.join(L)) + + def __eq__(self, other): + return isinstance(other, self.__class__) and self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not (self == other) Modified: hive/trunk/serde/src/gen/thrift/gen-rb/complex_types.rb URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-rb/complex_types.rb?rev=1626043&r1=1626042&r2=1626043&view=diff ============================================================================== --- hive/trunk/serde/src/gen/thrift/gen-rb/complex_types.rb (original) +++ hive/trunk/serde/src/gen/thrift/gen-rb/complex_types.rb Thu Sep 18 18:38:52 2014 @@ -119,3 +119,21 @@ class Complex ::Thrift::Struct.generate_accessors self end +class SetIntString + include ::Thrift::Struct, ::Thrift::Struct_Union + SINTSTRING = 1 + ASTRING = 2 + + FIELDS = { + SINTSTRING => {:type => ::Thrift::Types::SET, :name => 'sIntString', :element => {:type => ::Thrift::Types::STRUCT, :class => ::IntString}}, + ASTRING => {:type => ::Thrift::Types::STRING, :name => 'aString'} + } + + def struct_fields; FIELDS; end + + def validate + end + + ::Thrift::Struct.generate_accessors self +end +