Skip empty files for local, hdfs, and cloud input sources #9450
Conversation
This file contains 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
ccaominh
reviewed
Mar 3, 2020
| @@ -40,6 +42,7 @@ | |||
| public class MaxSizeSplitHintSpec implements SplitHintSpec | |||
| { | |||
| public static final String TYPE = "maxSize"; | |||
| private static final Logger LOG = new Logger(MaxSizeSplitHintSpec.class); | |||
| @@ -21,6 +21,7 @@ | |||
|
|
|||
| import com.fasterxml.jackson.databind.ObjectMapper; | |||
| import nl.jqno.equalsverifier.EqualsVerifier; | |||
| import org.apache.commons.compress.utils.Lists; | |||
There was a problem hiding this comment.
Should this be the one from guava instead? (same for MaxSizeSplitHintSpecTest)
Comment on lines
+121
to
+122
| prepareNextRequest(); | ||
| fetchNextBatch(); |
There was a problem hiding this comment.
This branch is not covered by unit tests
ccaominh
reviewed
Mar 3, 2020
| @@ -98,11 +99,19 @@ public void testGetFileIteratorWithBothBaseDirAndDuplicateFilesIteratingFilesOnl | |||
| File baseDir = temporaryFolder.newFolder(); | |||
| List<File> filesInBaseDir = new ArrayList<>(); | |||
| for (int i = 0; i < 10; i++) { | |||
| filesInBaseDir.add(File.createTempFile("local-input-source", ".data", baseDir)); | |||
| final File file = File.createTempFile("local-input-source", ".data", baseDir); | |||
| try (FileWriter writer = new FileWriter(file)) { | |||
There was a problem hiding this comment.
The forbidden apis checks is flagging this: java.io.FileWriter [Uses default charset]
ccaominh
reviewed
Mar 3, 2020
| @@ -19,6 +19,7 @@ | |||
|
|
|||
| package org.apache.druid.storage.azure; | |||
|
|
|||
| import com.google.api.client.util.Lists; | |||
There was a problem hiding this comment.
You'll need to update the pom to add this dependency:
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<scope>test</scope>
</dependency>
There was a problem hiding this comment.
Ah, this was a mistake. I'm not sure why the Intellij keeps adding a wrong one. Fixed it now.
ccaominh
approved these changes
Mar 3, 2020
ccaominh
approved these changes
Mar 4, 2020
jihoonson
added a commit
to jihoonson/druid
that referenced
this pull request
Mar 4, 2020
* Skip empty files for local, hdfs, and cloud input sources * split hint spec doc * doc for skipping empty files * fix typo; adjust tests * unnecessary fluent iterable * address comments * fix test * use the right lists * fix test * fix test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR modifies the input sources to skip empty files except for the HTTP input source. This PR additionally fixes the two bugs:
This PR has: