Skip to content

Hive : BACKPORT Hive-25377 : Creating Iceberg table where some columns has omments but the last one does not fails #3531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdblue merged 1 commit into from
Nov 15, 2021
Merged

Hive : BACKPORT Hive-25377 : Creating Iceberg table where some columns has omments but the last one does not fails #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hive-metastore/src/main/java/org/apache/iceberg/hive/HiveSchemaConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ List<Types.NestedField> convertInternal(List<String> names, List<TypeInfo> typeI
List<Types.NestedField> result = new ArrayList<>(names.size());
for (int i = 0; i < names.size(); ++i) {
result.add(Types.NestedField.optional(id++, names.get(i), convertType(typeInfos.get(i)),
comments.isEmpty() ? null : comments.get(i)));
(comments.isEmpty() || i >= comments.size()) ? null : comments.get(i)));
}

return result;
Expand Down
16 changes: 16 additions & 0 deletions hive-metastore/src/test/java/org/apache/iceberg/hive/TestHiveSchemaUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,22 @@ public void testComplexTypeAndTypeInfoConvert() {
}
}

@Test
public void testConversionWithoutLastComment() {
Schema expected = new Schema(
optional(0, "customer_id", Types.LongType.get(), "customer comment"),
optional(1, "first_name", Types.StringType.get(), null)
);

Schema schema = HiveSchemaUtil.convert(
Arrays.asList("customer_id", "first_name"),
Arrays.asList(TypeInfoUtils.getTypeInfoFromTypeString(serdeConstants.BIGINT_TYPE_NAME),
TypeInfoUtils.getTypeInfoFromTypeString(serdeConstants.STRING_TYPE_NAME)),
Arrays.asList("customer comment"));

Assert.assertEquals(expected.asStruct(), schema.asStruct());
}

protected List<FieldSchema> getSupportedFieldSchemas() {
List<FieldSchema> fields = new ArrayList<>();
fields.add(new FieldSchema("c_float", serdeConstants.FLOAT_TYPE_NAME, "float comment"));
Expand Down
5 changes: 3 additions & 2 deletions mr/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,8 @@ public void testCreateTableWithColumnComments() {
TableIdentifier identifier = TableIdentifier.of("default", "comment_table");
shell.executeStatement("CREATE EXTERNAL TABLE comment_table (" +
"t_int INT COMMENT 'int column', " +
"t_string STRING COMMENT 'string column') " +
"t_string STRING COMMENT 'string column', " +
"t_string_2 STRING) " +
"STORED BY 'org.apache.iceberg.mr.hive.HiveIcebergStorageHandler' " +
testTables.locationForCreateTableSQL(identifier) +
testTables.propertiesForCreateTableSQL(ImmutableMap.of()));
Expand All @@ -558,7 +559,7 @@ public void testCreateTableWithColumnComments() {
for (int i = 0; i < icebergTable.schema().columns().size(); i++) {
Types.NestedField field = icebergTable.schema().columns().get(i);
Assert.assertArrayEquals(new Object[] {field.name(), HiveSchemaUtil.convert(field.type()).getTypeName(),
field.doc()}, rows.get(i));
(field.doc() != null ? field.doc() : "from deserializer")}, rows.get(i));
}
}

Expand Down