[ https://issues.apache.org/jira/browse/HIVE-25255?focusedWorklogId=618674&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-618674 ]
ASF GitHub Bot logged work on HIVE-25255: ----------------------------------------- Author: ASF GitHub Bot Created on: 05/Jul/21 14:32 Start Date: 05/Jul/21 14:32 Worklog Time Spent: 10m Work Description: marton-bod commented on a change in pull request #2418: URL: https://github.com/apache/hive/pull/2418#discussion_r663975836 ########## File path: iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/HiveSchemaUtil.java ########## @@ -138,22 +137,88 @@ public static Type convert(TypeInfo typeInfo) { } /** - * Produces the difference of two FieldSchema lists by only taking into account the field name and type. + * Returns a SchemaDifference containing those fields which are present in only one of the collections, as well as + * those fields which are present in both (in terms of the name) but their type or comment has changed. * @param minuendCollection Collection of fields to subtract from * @param subtrahendCollection Collection of fields to subtract - * @return the result list of difference + * @param bothDirections Whether or not to compute the missing fields from the minuendCollection as well + * @return the difference between the two schemas */ - public static Collection<FieldSchema> schemaDifference( - Collection<FieldSchema> minuendCollection, Collection<FieldSchema> subtrahendCollection) { + public static SchemaDifference getSchemaDiff(Collection<FieldSchema> minuendCollection, + Collection<FieldSchema> subtrahendCollection, boolean bothDirections) { + SchemaDifference difference = new SchemaDifference(); - Function<FieldSchema, FieldSchema> unsetCommentFunc = fs -> new FieldSchema(fs.getName(), fs.getType(), null); - Set<FieldSchema> subtrahendWithoutComment = - subtrahendCollection.stream().map(unsetCommentFunc).collect(Collectors.toSet()); + for (FieldSchema first : minuendCollection) { + boolean found = false; + for (FieldSchema second : subtrahendCollection) { + if (first.getName().equals(second.getName())) { Review comment: I didn't use it because `name` should never be null, unlike comment (and maybe type?). Anyways, I've changed it to use Objects.equals to be safe and for symmetry. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 618674) Time Spent: 2.5h (was: 2h 20m) > Support ALTER TABLE REPLACE COLUMNS for Iceberg > ----------------------------------------------- > > Key: HIVE-25255 > URL: https://issues.apache.org/jira/browse/HIVE-25255 > Project: Hive > Issue Type: New Feature > Reporter: Marton Bod > Assignee: Marton Bod > Priority: Major > Labels: pull-request-available > Time Spent: 2.5h > Remaining Estimate: 0h > -- This message was sent by Atlassian Jira (v8.3.4#803005)