gianm closed pull request #2394: Adds possibility to read '.gz' files when
using local firehose
URL: https://github.com/apache/incubator-druid/pull/2394
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java
b/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java
index 4d530f4ba73..bae738ee50c 100644
---
a/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java
+++
b/server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java
@@ -21,8 +21,10 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Charsets;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
+import com.metamx.common.CompressionUtils;
import com.metamx.common.IAE;
import com.metamx.common.ISE;
import com.metamx.emitter.EmittingLogger;
@@ -31,12 +33,18 @@
import io.druid.data.input.impl.FileIteratingFirehose;
import io.druid.data.input.impl.StringInputRowParser;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.commons.io.filefilter.TrueFileFilter;
import org.apache.commons.io.filefilter.WildcardFileFilter;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
@@ -45,93 +53,122 @@
*/
public class LocalFirehoseFactory implements
FirehoseFactory<StringInputRowParser>
{
- private static final EmittingLogger log = new
EmittingLogger(LocalFirehoseFactory.class);
-
- private final File baseDir;
- private final String filter;
- private final StringInputRowParser parser;
-
- @JsonCreator
- public LocalFirehoseFactory(
- @JsonProperty("baseDir") File baseDir,
- @JsonProperty("filter") String filter,
- // Backwards compatible
- @JsonProperty("parser") StringInputRowParser parser
- )
- {
- this.baseDir = baseDir;
- this.filter = filter;
- this.parser = parser;
- }
-
- @JsonProperty
- public File getBaseDir()
- {
- return baseDir;
- }
-
- @JsonProperty
- public String getFilter()
- {
- return filter;
- }
-
- @JsonProperty
- public StringInputRowParser getParser()
- {
- return parser;
- }
-
- @Override
- public Firehose connect(StringInputRowParser firehoseParser) throws
IOException
- {
- if (baseDir == null) {
- throw new IAE("baseDir is null");
- }
- log.info("Searching for all [%s] in and beneath [%s]", filter,
baseDir.getAbsoluteFile());
-
- Collection<File> foundFiles = FileUtils.listFiles(
- baseDir.getAbsoluteFile(),
- new WildcardFileFilter(filter),
- TrueFileFilter.INSTANCE
- );
-
- if (foundFiles == null || foundFiles.isEmpty()) {
- throw new ISE("Found no files to ingest! Check your schema.");
- }
- log.info ("Found files: " + foundFiles);
-
- final LinkedList<File> files = Lists.newLinkedList(
- foundFiles
- );
-
- return new FileIteratingFirehose(
- new Iterator<LineIterator>()
- {
- @Override
- public boolean hasNext()
- {
- return !files.isEmpty();
- }
-
- @Override
- public LineIterator next()
- {
- try {
- return FileUtils.lineIterator(files.poll());
- }
- catch (Exception e) {
- throw Throwables.propagate(e);
- }
- }
-
- @Override
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
- },
- firehoseParser
- );
- }
+ private static final EmittingLogger log = new
EmittingLogger(LocalFirehoseFactory.class);
+
+ private final File baseDir;
+ private final String filter;
+ private final StringInputRowParser parser;
+
+ @JsonCreator
+ public LocalFirehoseFactory(
+ @JsonProperty("baseDir") File baseDir,
+ @JsonProperty("filter") String filter,
+ // Backwards compatible
+ @JsonProperty("parser") StringInputRowParser parser)
+ {
+ this.baseDir = baseDir;
+ this.filter = filter;
+ this.parser = parser;
+ }
+
+ @JsonProperty
+ public File getBaseDir()
+ {
+ return baseDir;
+ }
+
+ @JsonProperty
+ public String getFilter()
+ {
+ return filter;
+ }
+
+ @JsonProperty
+ public StringInputRowParser getParser()
+ {
+ return parser;
+ }
+
+ @Override
+ public Firehose connect(StringInputRowParser firehoseParser) throws
IOException
+ {
+ if (baseDir == null)
+ {
+ throw new IAE("baseDir is null");
+ }
+ log.info("Searching for all [%s] in and beneath [%s]", filter,
baseDir.getAbsoluteFile());
+
+ Collection<File> foundFiles = FileUtils.listFiles(
+ baseDir.getAbsoluteFile(),
+ new WildcardFileFilter(filter),
+ TrueFileFilter.INSTANCE);
+
+ if (foundFiles == null || foundFiles.isEmpty())
+ {
+ throw new ISE("Found no files to ingest! Check your
schema.");
+ }
+ log.info("Found files: " + foundFiles);
+
+ final LinkedList<File> files = Lists.newLinkedList(
+ foundFiles);
+
+ return new FileIteratingFirehose(
+ new Iterator<LineIterator>()
+ {
+ @Override
+ public boolean hasNext()
+ {
+ return !files.isEmpty();
+ }
+
+ @Override
+ public LineIterator next()
+ {
+ final File f = files.poll();
+ InputStream rawInputStream = null;
+ try
+ {
+ rawInputStream = new
FileInputStream(f);
+ final InputStream inputStream;
+ String logMessage;
+ if
(CompressionUtils.isGz(f.getName()))
+ {
+ logMessage = "Reading
gzipped file [%s]";
+ inputStream =
CompressionUtils.gzipInputStream(rawInputStream);
+ } else
+ {
+ logMessage = "Reading file
[%s]";
+ inputStream =
rawInputStream;
+ }
+
+ log.info(logMessage, f.getName());
+
+ return IOUtils.lineIterator(
+ new BufferedReader(
+ new InputStreamReader(inputStream,
Charsets.UTF_8)));
+ } catch (Exception e)
+ {
+ log.warn(e, "Failed to read file
[%s]", f.getName());
+ if (rawInputStream != null)
+ {
+ try
+ {
+
rawInputStream.close();
+ } catch (IOException ioe)
+ {
+
Throwables.propagate(ioe);
+ }
+ }
+ throw Throwables.propagate(e);
+ }
+ }
+
+ @Override
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+ },
+ firehoseParser);
+ }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
