You are viewing a plain text version of this content. The canonical link for it is here.
Posted to gitbox@hive.apache.org by GitBox <gi...@apache.org> on 2021/02/01 23:33:39 UTC
[GitHub] [hive] mustafaiman opened a new pull request #1934: HIVE-24717: Migrate to listStatusIterator in moving files
mustafaiman opened a new pull request #1934:
URL: https://github.com/apache/hive/pull/1934
Change-Id: I7f718cb368c62cfbbc1ab80d7f5b9877391f5611
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://cwiki.apache.org/confluence/display/Hive/HowToContribute
2. Ensure that you have created an issue on the Hive project JIRA: https://issues.apache.org/jira/projects/HIVE/summary
3. Ensure you have added or run the appropriate tests for your PR:
4. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP]HIVE-XXXXX: Your PR title ...'.
5. Be sure to keep the PR description updated to reflect all changes.
6. Please write your PR title to summarize what this PR proposes.
7. If possible, provide a concise example to reproduce the issue for a faster review.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description, screenshot and/or a reproducable example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Hive versions or within the unreleased branches such as master.
If no, write 'No'.
-->
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
-->
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] rbalamohan commented on a change in pull request #1934: HIVE-24717: Migrate to listStatusIterator in moving files
Posted by GitBox <gi...@apache.org>.
rbalamohan commented on a change in pull request #1934:
URL: https://github.com/apache/hive/pull/1934#discussion_r568426369
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
##########
@@ -5011,29 +5019,80 @@ public void cleanUpOneDirectoryForReplace(Path path, FileSystem fs,
if (isNeedRecycle && conf.getBoolVar(HiveConf.ConfVars.REPLCMENABLED)) {
recycleDirToCmPath(path, purge);
}
- FileStatus[] statuses = fs.listStatus(path, pathFilter);
- if (statuses == null || statuses.length == 0) {
- return;
+
+ if (!trashDirectoryContent(fs, path, pathFilter, conf, purge)) {
+ throw new HiveException("Old path " + path + " has not been cleaned up.");
}
- if (Utilities.FILE_OP_LOGGER.isTraceEnabled()) {
- String s = "Deleting files under " + path + " for replace: ";
- for (FileStatus file : statuses) {
- s += file.getPath().getName() + ", ";
+ }
+
+ private static ExecutorService createDeleteProcessorPool(final Configuration conf) {
+ final ExecutorService pool = conf.getInt(ConfVars.HIVE_MOVE_FILES_THREAD_COUNT.varname, 25) > 0 ?
+ Executors.newFixedThreadPool(conf.getInt(ConfVars.HIVE_MOVE_FILES_THREAD_COUNT.varname, 25),
+ new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Delete-Thread-%d").build()) : null;
+ return pool;
+ }
+
+ /**
+ * Trashes or deletes files in given directory. Deletion happens in a
+ * seperate thread pool if {@link ConfVars.HIVE_MOVE_FILES_THREAD_COUNT}
+ * is set accordingly
+ * @param fs FileSystem to use
+ * @param path directory to be cleaned up
+ * @param pathFilter filter to be applied
+ * @param conf hive configuration
+ * @param purge skip trash if true
+ * @return true if deletion successful
+ * @throws IOException
+ */
+ public static boolean trashDirectoryContent(final FileSystem fs, final Path path, PathFilter pathFilter,
+ final Configuration conf, final boolean purge)
+ throws IOException {
+ boolean result = true;
+
+ final List<Future<Boolean>> futures = new LinkedList<>();
+ final ExecutorService pool = createDeleteProcessorPool(conf);
+ final SessionState parentSession = SessionState.get();
+ RemoteIterator<FileStatus> remoteIterator = fs.listStatusIterator(path);
+ while (remoteIterator.hasNext()){
+ FileStatus status = remoteIterator.next();
+ if (!pathFilter.accept(status.getPath())) {
+ continue;
+ }
+ if (null == pool) {
Review comment:
Minor comment.
This kind of overlaps with trashFiles(). Should this be refactored instead of duplicating it in 2 places?
Rest LGTM.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] rbalamohan commented on a change in pull request #1934: HIVE-24717: Migrate to listStatusIterator in moving files
Posted by GitBox <gi...@apache.org>.
rbalamohan commented on a change in pull request #1934:
URL: https://github.com/apache/hive/pull/1934#discussion_r568426369
##########
File path: ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
##########
@@ -5011,29 +5019,80 @@ public void cleanUpOneDirectoryForReplace(Path path, FileSystem fs,
if (isNeedRecycle && conf.getBoolVar(HiveConf.ConfVars.REPLCMENABLED)) {
recycleDirToCmPath(path, purge);
}
- FileStatus[] statuses = fs.listStatus(path, pathFilter);
- if (statuses == null || statuses.length == 0) {
- return;
+
+ if (!trashDirectoryContent(fs, path, pathFilter, conf, purge)) {
+ throw new HiveException("Old path " + path + " has not been cleaned up.");
}
- if (Utilities.FILE_OP_LOGGER.isTraceEnabled()) {
- String s = "Deleting files under " + path + " for replace: ";
- for (FileStatus file : statuses) {
- s += file.getPath().getName() + ", ";
+ }
+
+ private static ExecutorService createDeleteProcessorPool(final Configuration conf) {
+ final ExecutorService pool = conf.getInt(ConfVars.HIVE_MOVE_FILES_THREAD_COUNT.varname, 25) > 0 ?
+ Executors.newFixedThreadPool(conf.getInt(ConfVars.HIVE_MOVE_FILES_THREAD_COUNT.varname, 25),
+ new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Delete-Thread-%d").build()) : null;
+ return pool;
+ }
+
+ /**
+ * Trashes or deletes files in given directory. Deletion happens in a
+ * seperate thread pool if {@link ConfVars.HIVE_MOVE_FILES_THREAD_COUNT}
+ * is set accordingly
+ * @param fs FileSystem to use
+ * @param path directory to be cleaned up
+ * @param pathFilter filter to be applied
+ * @param conf hive configuration
+ * @param purge skip trash if true
+ * @return true if deletion successful
+ * @throws IOException
+ */
+ public static boolean trashDirectoryContent(final FileSystem fs, final Path path, PathFilter pathFilter,
+ final Configuration conf, final boolean purge)
+ throws IOException {
+ boolean result = true;
+
+ final List<Future<Boolean>> futures = new LinkedList<>();
+ final ExecutorService pool = createDeleteProcessorPool(conf);
+ final SessionState parentSession = SessionState.get();
+ RemoteIterator<FileStatus> remoteIterator = fs.listStatusIterator(path);
+ while (remoteIterator.hasNext()){
+ FileStatus status = remoteIterator.next();
+ if (!pathFilter.accept(status.getPath())) {
+ continue;
+ }
+ if (null == pool) {
Review comment:
Minor comment.
This kind of overlaps with trashFiles(). Should this be refactored instead of duplicating it in 2 places?
Rest LGTM.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] github-actions[bot] closed pull request #1934: HIVE-24717: Migrate to listStatusIterator in moving files
Posted by GitBox <gi...@apache.org>.
github-actions[bot] closed pull request #1934:
URL: https://github.com/apache/hive/pull/1934
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] github-actions[bot] commented on pull request #1934: HIVE-24717: Migrate to listStatusIterator in moving files
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #1934:
URL: https://github.com/apache/hive/pull/1934#issuecomment-812946437
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.
Feel free to reach out on the dev@hive.apache.org list if the patch is in need of reviews.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org