Repository: hive Updated Branches: refs/heads/branch-2 8d1f636ed -> 0273a5ea7
HIVE-19041 : Thrift deserialization of Partition objects should intern fields (Vihang Karajgaonkar reviewed by Sahil Takiar and Misha Dmitriev) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/0273a5ea Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0273a5ea Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0273a5ea Branch: refs/heads/branch-2 Commit: 0273a5ea71ba2eccbb1990366475e5d730db108b Parents: 8d1f636 Author: Vihang Karajgaonkar <[email protected]> Authored: Fri May 11 11:55:48 2018 -0700 Committer: Vihang Karajgaonkar <[email protected]> Committed: Fri May 11 11:55:48 2018 -0700 ---------------------------------------------------------------------- metastore/pom.xml | 2 ++ .../metastore/api/ColumnStatisticsDesc.java | 20 +++++------ .../hive/metastore/api/ColumnStatisticsObj.java | 20 +++++------ .../hadoop/hive/metastore/api/FieldSchema.java | 12 +++---- .../hadoop/hive/metastore/api/Partition.java | 8 ++--- .../hadoop/hive/metastore/api/SerDeInfo.java | 8 ++--- .../hive/metastore/api/StorageDescriptor.java | 16 ++++----- .../src/main/resources/thrift-replacements.txt | 35 ++++++++++++++++++++ 8 files changed, 79 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/0273a5ea/metastore/pom.xml ---------------------------------------------------------------------- diff --git a/metastore/pom.xml b/metastore/pom.xml index 80eb532..fddc5ca 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -288,6 +288,8 @@ <include>Partition.java</include> <include>SerDeInfo.java</include> <include>StorageDescriptor.java</include> + <include>ColumnStatisticsDesc.java</include> + <include>ColumnStatisticsObj.java</include> </includes> <tokenValueMap>${basedir}/src/main/resources/thrift-replacements.txt</tokenValueMap> <regex>true</regex> http://git-wip-us.apache.org/repos/asf/hive/blob/0273a5ea/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java index daf3d10..e987939 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsDesc.java @@ -159,8 +159,8 @@ public class ColumnStatisticsDesc implements org.apache.thrift.TBase<ColumnStati this(); this.isTblLevel = isTblLevel; setIsTblLevelIsSet(true); - 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); } /** @@ -170,10 +170,10 @@ public class ColumnStatisticsDesc implements org.apache.thrift.TBase<ColumnStati __isset_bitfield = other.__isset_bitfield; this.isTblLevel = other.isTblLevel; 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); } if (other.isSetPartName()) { this.partName = other.partName; @@ -223,7 +223,7 @@ public class ColumnStatisticsDesc implements org.apache.thrift.TBase<ColumnStati } public void setDbName(String dbName) { - this.dbName = dbName; + this.dbName = org.apache.hive.common.util.HiveStringUtils.intern(dbName); } public void unsetDbName() { @@ -246,7 +246,7 @@ public class ColumnStatisticsDesc implements org.apache.thrift.TBase<ColumnStati } public void setTableName(String tableName) { - this.tableName = tableName; + this.tableName = org.apache.hive.common.util.HiveStringUtils.intern(tableName); } public void unsetTableName() { @@ -669,7 +669,7 @@ public class ColumnStatisticsDesc implements org.apache.thrift.TBase<ColumnStati break; case 2: // DB_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.dbName = iprot.readString(); + struct.dbName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setDbNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -677,7 +677,7 @@ public class ColumnStatisticsDesc implements org.apache.thrift.TBase<ColumnStati break; case 3: // TABLE_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.tableName = iprot.readString(); + struct.tableName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setTableNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -778,9 +778,9 @@ public class ColumnStatisticsDesc implements org.apache.thrift.TBase<ColumnStati TTupleProtocol iprot = (TTupleProtocol) prot; struct.isTblLevel = iprot.readBool(); struct.setIsTblLevelIsSet(true); - struct.dbName = iprot.readString(); + struct.dbName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setDbNameIsSet(true); - struct.tableName = iprot.readString(); + struct.tableName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setTableNameIsSet(true); BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { http://git-wip-us.apache.org/repos/asf/hive/blob/0273a5ea/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java index 4191beb..faefd70 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatisticsObj.java @@ -139,8 +139,8 @@ public class ColumnStatisticsObj implements org.apache.thrift.TBase<ColumnStatis ColumnStatisticsData statsData) { this(); - this.colName = colName; - this.colType = colType; + this.colName = org.apache.hive.common.util.HiveStringUtils.intern(colName); + this.colType = org.apache.hive.common.util.HiveStringUtils.intern(colType); this.statsData = statsData; } @@ -149,10 +149,10 @@ public class ColumnStatisticsObj implements org.apache.thrift.TBase<ColumnStatis */ public ColumnStatisticsObj(ColumnStatisticsObj other) { if (other.isSetColName()) { - this.colName = other.colName; + this.colName = org.apache.hive.common.util.HiveStringUtils.intern(other.colName); } if (other.isSetColType()) { - this.colType = other.colType; + this.colType = org.apache.hive.common.util.HiveStringUtils.intern(other.colType); } if (other.isSetStatsData()) { this.statsData = new ColumnStatisticsData(other.statsData); @@ -175,7 +175,7 @@ public class ColumnStatisticsObj implements org.apache.thrift.TBase<ColumnStatis } public void setColName(String colName) { - this.colName = colName; + this.colName = org.apache.hive.common.util.HiveStringUtils.intern(colName); } public void unsetColName() { @@ -198,7 +198,7 @@ public class ColumnStatisticsObj implements org.apache.thrift.TBase<ColumnStatis } public void setColType(String colType) { - this.colType = colType; + this.colType = org.apache.hive.common.util.HiveStringUtils.intern(colType); } public void unsetColType() { @@ -503,7 +503,7 @@ public class ColumnStatisticsObj implements org.apache.thrift.TBase<ColumnStatis switch (schemeField.id) { case 1: // COL_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.colName = iprot.readString(); + struct.colName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setColNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -511,7 +511,7 @@ public class ColumnStatisticsObj implements org.apache.thrift.TBase<ColumnStatis break; case 2: // COL_TYPE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.colType = iprot.readString(); + struct.colType = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setColTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -579,9 +579,9 @@ public class ColumnStatisticsObj implements org.apache.thrift.TBase<ColumnStatis @Override public void read(org.apache.thrift.protocol.TProtocol prot, ColumnStatisticsObj struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.colName = iprot.readString(); + struct.colName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setColNameIsSet(true); - struct.colType = iprot.readString(); + struct.colType = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setColTypeIsSet(true); struct.statsData = new ColumnStatisticsData(); struct.statsData.read(iprot); http://git-wip-us.apache.org/repos/asf/hive/blob/0273a5ea/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java index 06a7b4d..9442678 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java @@ -491,7 +491,7 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc switch (schemeField.id) { case 1: // NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.name = iprot.readString(); + struct.name = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -499,7 +499,7 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc break; case 2: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.type = iprot.readString(); + struct.type = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -507,7 +507,7 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc break; case 3: // COMMENT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.comment = iprot.readString(); + struct.comment = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setCommentIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -585,15 +585,15 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.name = iprot.readString(); + struct.name = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setNameIsSet(true); } if (incoming.get(1)) { - struct.type = iprot.readString(); + struct.type = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setTypeIsSet(true); } if (incoming.get(2)) { - struct.comment = iprot.readString(); + struct.comment = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setCommentIsSet(true); } } http://git-wip-us.apache.org/repos/asf/hive/blob/0273a5ea/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java index a247221..90b1977 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java @@ -948,7 +948,7 @@ public class Partition implements org.apache.thrift.TBase<Partition, Partition._ break; case 2: // DB_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.dbName = iprot.readString(); + struct.dbName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setDbNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -956,7 +956,7 @@ public class Partition implements org.apache.thrift.TBase<Partition, Partition._ break; case 3: // TABLE_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.tableName = iprot.readString(); + struct.tableName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setTableNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1182,11 +1182,11 @@ public class Partition implements org.apache.thrift.TBase<Partition, Partition._ struct.setValuesIsSet(true); } if (incoming.get(1)) { - struct.dbName = iprot.readString(); + struct.dbName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setDbNameIsSet(true); } if (incoming.get(2)) { - struct.tableName = iprot.readString(); + struct.tableName = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setTableNameIsSet(true); } if (incoming.get(3)) { http://git-wip-us.apache.org/repos/asf/hive/blob/0273a5ea/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java index d5a8d99..81c7f13 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java @@ -505,7 +505,7 @@ public class SerDeInfo implements org.apache.thrift.TBase<SerDeInfo, SerDeInfo._ switch (schemeField.id) { case 1: // NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.name = iprot.readString(); + struct.name = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -513,7 +513,7 @@ public class SerDeInfo implements org.apache.thrift.TBase<SerDeInfo, SerDeInfo._ break; case 2: // SERIALIZATION_LIB if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.serializationLib = iprot.readString(); + struct.serializationLib = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setSerializationLibIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -626,11 +626,11 @@ public class SerDeInfo implements org.apache.thrift.TBase<SerDeInfo, SerDeInfo._ TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.name = iprot.readString(); + struct.name = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setNameIsSet(true); } if (incoming.get(1)) { - struct.serializationLib = iprot.readString(); + struct.serializationLib = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setSerializationLibIsSet(true); } if (incoming.get(2)) { http://git-wip-us.apache.org/repos/asf/hive/blob/0273a5ea/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java ---------------------------------------------------------------------- diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java index 938f06b..fc8b3cd 100644 --- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java +++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java @@ -1308,7 +1308,7 @@ public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescrip break; case 2: // LOCATION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.location = iprot.readString(); + struct.location = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setLocationIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1316,7 +1316,7 @@ public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescrip break; case 3: // INPUT_FORMAT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.inputFormat = iprot.readString(); + struct.inputFormat = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setInputFormatIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1324,7 +1324,7 @@ public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescrip break; case 4: // OUTPUT_FORMAT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.outputFormat = iprot.readString(); + struct.outputFormat = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setOutputFormatIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1368,7 +1368,7 @@ public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescrip } iprot.readListEnd(); } - struct.setBucketColsIsSet(true); + struct.bucketCols = org.apache.hive.common.util.HiveStringUtils.intern(struct.bucketCols); struct.setBucketColsIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1666,15 +1666,15 @@ public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescrip struct.setColsIsSet(true); } if (incoming.get(1)) { - struct.location = iprot.readString(); + struct.location = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setLocationIsSet(true); } if (incoming.get(2)) { - struct.inputFormat = iprot.readString(); + struct.inputFormat = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setInputFormatIsSet(true); } if (incoming.get(3)) { - struct.outputFormat = iprot.readString(); + struct.outputFormat = org.apache.hive.common.util.HiveStringUtils.intern(iprot.readString()); struct.setOutputFormatIsSet(true); } if (incoming.get(4)) { @@ -1701,7 +1701,7 @@ public class StorageDescriptor implements org.apache.thrift.TBase<StorageDescrip struct.bucketCols.add(_elem181); } } - struct.setBucketColsIsSet(true); + struct.bucketCols = org.apache.hive.common.util.HiveStringUtils.intern(struct.bucketCols); struct.setBucketColsIsSet(true); } if (incoming.get(8)) { { http://git-wip-us.apache.org/repos/asf/hive/blob/0273a5ea/metastore/src/main/resources/thrift-replacements.txt ---------------------------------------------------------------------- diff --git a/metastore/src/main/resources/thrift-replacements.txt b/metastore/src/main/resources/thrift-replacements.txt index 528ed08..3f72cab 100644 --- a/metastore/src/main/resources/thrift-replacements.txt +++ b/metastore/src/main/resources/thrift-replacements.txt @@ -34,10 +34,18 @@ this\.inputFormat\ \=\ inputFormat;=this.inputFormat\ \=\ org.apache.hive.common this\.outputFormat\ \=\ outputFormat;=this.outputFormat\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(outputFormat); this\.dbName\ \=\ dbName;=this.dbName\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(dbName); this\.tableName\ \=\ tableName;=this.tableName\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(tableName); +this\.serializerClass\ \=\ serializerClass;=this\.serializerClass\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(serializerClass); +this\.deserializerClass\ \=\ deserializerClass;=this\.deserializerClass\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(deserializerClass); +this\.colName\ \=\ colName;=this\.colName\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(colName); +this\.colType\ \=\ colType;=this\.colType\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(colType); # Fix constructors and setters of List<String> instance fields this\.bucketCols\ \=\ bucketCols;=this.bucketCols\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(bucketCols); +this\.serializerClass\ \=\ other\.serializerClass;=this\.serializerClass\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(other.serializerClass); +this\.deserializerClass\ \=\ other\.deserializerClass;=this\.deserializerClass\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(other.deserializerClass); +this\.colName\ \=\ other\.colName;=this\.colName\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(other.colName); +this\.colType\ \=\ other\.colType;=this\.colType\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(other.colType); # Fix constructors and setters of Map<String, String> instance fields @@ -58,3 +66,30 @@ this\.tableName\ \=\ other\.tableName;=this.tableName\ \=\ org.apache.hive.commo __this__parameters_copy_key\ \=\ other_element_key;=__this__parameters_copy_key\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(other_element_key); __this__parameters_copy_value\ \=\ other_element_value;=__this__parameters_copy_value\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(other_element_value); __this_values\.add(other_element);=__this_values.add(org.apache.hive.common.util.HiveStringUtils.intern(other_element)); + + +# Fix the StandardScheme read method which deserializes the fields into the thrift objects + +# PartitionStandardScheme - parameters are already interned above +struct\.dbName\ \=\ iprot\.readString\(\);=struct\.dbName\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.tableName\ \=\ iprot\.readString\(\);=struct\.tableName\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); + +# StorageDescriptorStandardScheme - parameters are already interned above +struct\.location\ \=\ iprot\.readString\(\);=struct\.location\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.inputFormat\ \=\ iprot\.readString\(\);=struct\.inputFormat\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.outputFormat\ \=\ iprot\.readString\(\);=struct\.outputFormat\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.setBucketColsIsSet\(true\);=struct\.bucketCols\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(struct.bucketCols);\ struct.setBucketColsIsSet(true); + +# SerDeInfoStandardScheme - parameters are already interned above +struct\.name\ \=\ iprot\.readString\(\);=struct\.name\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.serializationLib\ \=\ iprot\.readString\(\);=struct\.serializationLib\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.serializerClass\ \=\ iprot\.readString\(\);=struct\.serializerClass\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.deserializerClass\ \=\ iprot\.readString\(\);=struct\.deserializerClass\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); + +# FieldSchemaStandardScheme - name field gets automatically handled above +struct\.type\ \=\ iprot\.readString\(\);=struct\.type\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.comment\ \=\ iprot\.readString\(\);=struct\.comment\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); + +# ColumnStatisticsObjStandardScheme +struct\.colName\ \=\ iprot\.readString\(\);=struct\.colName\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); +struct\.colType\ \=\ iprot\.readString\(\);=struct\.colType\ \=\ org.apache.hive.common.util.HiveStringUtils.intern(iprot\.readString\(\)); \ No newline at end of file
