[ https://issues.apache.org/jira/browse/HIVE-25883?focusedWorklogId=715831&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-715831 ]
ASF GitHub Bot logged work on HIVE-25883: ----------------------------------------- Author: ASF GitHub Bot Created on: 26/Jan/22 17:18 Start Date: 26/Jan/22 17:18 Worklog Time Spent: 10m Work Description: kgyrtkirk commented on a change in pull request #2971: URL: https://github.com/apache/hive/pull/2971#discussion_r792867605 ########## File path: ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java ########## @@ -434,8 +437,18 @@ private boolean removeFiles(String location, ValidWriteIdList writeIdList, Compa return success; } - private boolean hasDataBelowWatermark(FileSystem fs, Path path, long highWatermark) throws IOException { - FileStatus[] children = fs.listStatus(path); + private boolean hasDataBelowWatermark(AcidDirectory acidDir, FileSystem fs, Path path, long highWatermark) + throws IOException { + Set<Path> acidPaths = new HashSet<>(); + for (ParsedDelta delta : acidDir.getCurrentDirectories()) { + acidPaths.add(delta.getPath()); + } + if (acidDir.getBaseDirectory() != null) { + acidPaths.add(acidDir.getBaseDirectory()); + } + FileStatus[] children = fs.listStatus(path, p -> { + return !acidPaths.contains(p); + }); for (FileStatus child : children) { if (isFileBelowWatermark(child, highWatermark)) { Review comment: after some thinking I convinced myself that you are right :) * I've changed to return `true` for non-directories ** in the background these should appear as `obsolete` files anyway; so it should not cause any real trouble in the scope of HIVE-25883; but it makes the method live up to its name... * since the latest patch we are checking and excluding all the dirs the actual acid dir is using - so if we have anything below or even at the writeid level that should be considered invalid; the `nothingToCleanAfterAbortsDelta` testcase is a "complicated" case but the default case is similar to this with the new checks. pushed a new commit to update these -- 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: 715831) Time Spent: 1h 40m (was: 1.5h) > Enhance Compaction Cleaner to skip when there is nothing to do > -------------------------------------------------------------- > > Key: HIVE-25883 > URL: https://issues.apache.org/jira/browse/HIVE-25883 > Project: Hive > Issue Type: Bug > Reporter: Zoltan Haindrich > Assignee: Zoltan Haindrich > Priority: Major > Labels: pull-request-available > Fix For: 4.0.0 > > Time Spent: 1h 40m > Remaining Estimate: 0h > > the cleaner works the following way: > * it identifies obsolete directories (delta dirs ; which doesn't have open > txns) > * removes them and done > if there are no obsolete directoris that is attributed to that there might be > open txns so the request should be retried later. > however if for some reason the directory was already cleaned - similarily it > has no obsolete directories; and thus the request is retried for forever -- This message was sent by Atlassian Jira (v8.20.1#820001)