HIVE-29345: Support Alter table command for write ordering. #6256
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,7 +51,6 @@ | |
| import org.apache.iceberg.PartitionSpecParser; | ||
| import org.apache.iceberg.Schema; | ||
| import org.apache.iceberg.SchemaParser; | ||
| import org.apache.iceberg.SortOrder; | ||
| import org.apache.iceberg.SortOrderParser; | ||
| import org.apache.iceberg.Table; | ||
|
|
@@ -238,7 +237,7 @@ private void validateCatalogConfigsDefined() { | |
| * - Otherwise, the JSON is a list of SortFields; we convert it to Iceberg | ||
| * SortOrder JSON and keep it in DEFAULT_SORT_ORDER for Iceberg to use it. | ||
| */ | ||
| protected void setSortOrder(org.apache.hadoop.hive.metastore.api.Table hmsTable, Schema schema, | ||
| Properties properties) { | ||
| String sortOrderJSONString = hmsTable.getParameters().get(TableProperties.DEFAULT_SORT_ORDER); | ||
| if (Strings.isNullOrEmpty(sortOrderJSONString)) { | ||
|
|
@@ -251,21 +250,16 @@ private void setSortOrder(org.apache.hadoop.hive.metastore.api.Table hmsTable, S | |
| return; | ||
| } | ||
|
|
||
| List<SortFieldDesc> sortFieldDescList = parseSortFieldsJSON(sortOrderJSONString); | ||
| if (sortFieldDescList != null) { | ||
| SortOrder.Builder sortOrderBuilder = SortOrder.builderFor(schema); | ||
| sortFieldDescList.forEach(fieldDesc -> { | ||
| sortOrderBuilder.sortBy( | ||
| fieldDesc.getColumnName(), | ||
| convertSortDirection(fieldDesc.getDirection()), | ||
| convertNullOrder(fieldDesc.getNullOrdering())); | ||
| }); | ||
| properties.put(TableProperties.DEFAULT_SORT_ORDER, SortOrderParser.toJson(sortOrderBuilder.build())); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -304,6 +298,44 @@ private boolean isZOrderJSON(String jsonString) { | |
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses Hive SortFields JSON and returns the list of sort field descriptors. | ||
| * This is a common utility method used by both CREATE TABLE and ALTER TABLE flows. | ||
| * | ||
| * @param sortOrderJSONString The JSON string containing Hive SortFields | ||
| * @return List of SortFieldDesc, or null if parsing fails or JSON is empty | ||
| */ | ||
| protected List<SortFieldDesc> parseSortFieldsJSON(String sortOrderJSONString) { | ||
| if (Strings.isNullOrEmpty(sortOrderJSONString) || isZOrderJSON(sortOrderJSONString)) { | ||
|
Member
There was a problem hiding this comment. why do we check |
||
| return null; | ||
| } | ||
|
|
||
| try { | ||
| SortFields sortFields = JSON_OBJECT_MAPPER.reader().readValue(sortOrderJSONString, SortFields.class); | ||
| if (sortFields != null && !sortFields.getSortFields().isEmpty()) { | ||
|
Member
There was a problem hiding this comment. why do we need |
||
| return sortFields.getSortFields(); | ||
| } | ||
| } catch (Exception e) { | ||
| LOG.warn("Failed to parse sort order JSON: {}", sortOrderJSONString, e); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * Converts Hive NullOrdering to Iceberg NullOrder. | ||
| */ | ||
| protected static NullOrder convertNullOrder(NullOrdering nullOrdering) { | ||
| return nullOrdering == NullOrdering.NULLS_FIRST ? NullOrder.NULLS_FIRST : NullOrder.NULLS_LAST; | ||
| } | ||
|
|
||
| /** | ||
| * Converts Hive SortDirection to Iceberg SortDirection. | ||
| */ | ||
| protected static org.apache.iceberg.SortDirection convertSortDirection(SortFieldDesc.SortDirection direction) { | ||
|
|
||
| return direction == SortFieldDesc.SortDirection.ASC ? | ||
| org.apache.iceberg.SortDirection.ASC : org.apache.iceberg.SortDirection.DESC; | ||
| } | ||
|
|
||
| @Override | ||
| public void rollbackCreateTable(org.apache.hadoop.hive.metastore.api.Table hmsTable) { | ||
| // do nothing | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| -- Mask neededVirtualColumns due to non-strict order | ||
| --! qt:replace:/(\s+neededVirtualColumns:\s)(.*)/$1#Masked#/ | ||
| -- Mask the totalSize value as it can have slight variability, causing test flakiness | ||
| --! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/ | ||
| -- Mask random uuid | ||
| --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/ | ||
| -- Mask a random snapshot id | ||
| --! qt:replace:/(\s+current-snapshot-id\s+)\S+(\s*)/$1#Masked#/ | ||
| -- Mask added file size | ||
| --! qt:replace:/(\S\"added-files-size\\\":\\\")(\d+)(\\\")/$1#Masked#$3/ | ||
| -- Mask total file size | ||
| --! qt:replace:/(\S\"total-files-size\\\":\\\")(\d+)(\\\")/$1#Masked#$3/ | ||
| -- Mask removed file size | ||
| --! qt:replace:/(\S\"removed-files-size\\\":\\\")(\d+)(\\\")/$1#Masked#$3/ | ||
| -- Mask current-snapshot-timestamp-ms | ||
| --! qt:replace:/(\s+current-snapshot-timestamp-ms\s+)\S+(\s*)/$1#Masked#$2/ | ||
| --! qt:replace:/(MAJOR\s+succeeded\s+)[a-zA-Z0-9\-\.\s+]+(\s+manual)/$1#Masked#$2/ | ||
| -- Mask iceberg version | ||
| --! qt:replace:/(\S\"iceberg-version\\\":\\\")(\w+\s\w+\s\d+\.\d+\.\d+\s\(\w+\s\w+\))(\\\")/$1#Masked#$3/ | ||
| set hive.vectorized.execution.enabled=true; | ||
|
|
||
| -- Test ALTER TABLE SET WRITE [LOCALLY] ORDERED BY | ||
|
|
||
| create table ice_orc_order (id int, name string, age int, city string) stored by iceberg stored as orc; | ||
| describe formatted ice_orc_order; | ||
|
|
||
| alter table ice_orc_order set write ordered by id desc nulls first, name asc nulls last; | ||
| describe formatted ice_orc_order; | ||
|
|
||
| explain insert into ice_orc_order values (4, 'David', 28, 'Seattle'),(5, 'Eve', 32, 'Boston'),(6, 'Frank', 29, 'Austin'),(7, 'Grace', 32, 'Denver'); | ||
| insert into ice_orc_order values (4, 'David', 28, 'Seattle'),(5, 'Eve', 32, 'Boston'),(6, 'Frank', 29, 'Austin'),(7, 'Grace', 32, 'Denver'); | ||
| select * from ice_orc_order; | ||
|
|
||
| drop table ice_orc_order; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why protected?