diff --git a/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java b/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java index 37623f8594..0fb3e91a21 100644 --- a/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java +++ b/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java @@ -105,7 +105,7 @@ public void initialize(Configuration job, Properties tbl) throws SerDeException } else { columnNames = Arrays.asList(columnProperty.split(",")); cachedObjectInspector = MetadataListStructObjectInspector - .getInstance(columnNames,Lists.newArrayList(Splitter.on('\0').split(tbl.getProperty(COLUMNS_COMMENTS)))); + .getInstance(columnNames); } LOG.info(getClass().getName() + ": initialized with columnNames: " + columnNames); diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java index 156b410065..b798c161bf 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java @@ -149,8 +149,7 @@ public void initialize(Configuration conf, Properties tbl) } // StandardStruct uses ArrayList to store the row. - rowOI = ObjectInspectorFactory.getStandardStructObjectInspector( - columnNames,columnOIs,Lists.newArrayList(Splitter.on('\0').split(tbl.getProperty("columns.comments")))); + rowOI = ObjectInspectorFactory.getStandardStructObjectInspector(columnNames,columnOIs); row = new ArrayList(numColumns); // Constructing the row object, etc, which will be reused for all rows. diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java index cde34bcf42..dd2ea3008d 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreUtils.java @@ -1235,7 +1235,6 @@ private static Properties addCols(Properties schema, List cols) { StringBuilder colNameBuf = new StringBuilder(); StringBuilder colTypeBuf = new StringBuilder(); - StringBuilder colComment = new StringBuilder(); boolean first = true; String columnNameDelimiter = getColumnNameDelimiter(cols); @@ -1243,11 +1242,9 @@ private static Properties addCols(Properties schema, List cols) { if (!first) { colNameBuf.append(columnNameDelimiter); colTypeBuf.append(":"); - colComment.append('\0'); } colNameBuf.append(col.getName()); colTypeBuf.append(col.getType()); - colComment.append((null != col.getComment()) ? col.getComment() : StringUtils.EMPTY); first = false; } schema.setProperty( @@ -1258,7 +1255,6 @@ private static Properties addCols(Properties schema, List cols) { schema.setProperty( org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_COLUMN_TYPES, colTypes); - schema.setProperty("columns.comments", colComment.toString()); return schema;