Repository: storm Updated Branches: refs/heads/master dd00bc0a2 -> f1dbe42b3
storm-hdfs : change visibility of create and closeOutputFile methods to protected Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bcb40e48 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bcb40e48 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bcb40e48 Branch: refs/heads/master Commit: bcb40e481f189cc9f77ddcaeddf7d4daa556113b Parents: bb60f11 Author: Julien Nioche <jul...@digitalpebble.com> Authored: Thu Feb 18 16:25:40 2016 +0000 Committer: Julien Nioche <jul...@digitalpebble.com> Committed: Thu Feb 18 16:25:40 2016 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java | 4 ++-- .../java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java | 2 +- .../src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java | 4 ++-- .../main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/bcb40e48/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java index ae5d5d7..c8dbf71 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java @@ -242,9 +242,9 @@ public abstract class AbstractHdfsBolt extends BaseRichBolt { */ abstract void syncTuples() throws IOException; - abstract void closeOutputFile() throws IOException; + abstract protected void closeOutputFile() throws IOException; - abstract Path createOutputFile() throws IOException; + abstract protected Path createOutputFile() throws IOException; abstract void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException; http://git-wip-us.apache.org/repos/asf/storm/blob/bcb40e48/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java index 1fd2e2f..8440fa0 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java @@ -127,7 +127,7 @@ public class AvroGenericRecordBolt extends AbstractHdfsBolt{ } @Override - Path createOutputFile() throws IOException { + protected Path createOutputFile() throws IOException { Path path = new Path(this.fileNameFormat.getPath(), this.fileNameFormat.getName(this.rotation, System.currentTimeMillis())); this.out = this.fs.create(path); http://git-wip-us.apache.org/repos/asf/storm/blob/bcb40e48/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java index b351adc..495f49d 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java @@ -113,12 +113,12 @@ public class HdfsBolt extends AbstractHdfsBolt{ } @Override - void closeOutputFile() throws IOException { + protected void closeOutputFile() throws IOException { this.out.close(); } @Override - Path createOutputFile() throws IOException { + protected Path createOutputFile() throws IOException { Path path = new Path(this.fileNameFormat.getPath(), this.fileNameFormat.getName(this.rotation, System.currentTimeMillis())); this.out = this.fs.create(path); return path; http://git-wip-us.apache.org/repos/asf/storm/blob/bcb40e48/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java index 2a266c1..b62b6d4 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java @@ -125,7 +125,7 @@ public class SequenceFileBolt extends AbstractHdfsBolt { this.offset = this.writer.getLength(); } - Path createOutputFile() throws IOException { + protected Path createOutputFile() throws IOException { Path p = new Path(this.fsUrl + this.fileNameFormat.getPath(), this.fileNameFormat.getName(this.rotation, System.currentTimeMillis())); this.writer = SequenceFile.createWriter( this.hdfsConfig, @@ -137,7 +137,7 @@ public class SequenceFileBolt extends AbstractHdfsBolt { return p; } - void closeOutputFile() throws IOException { + protected void closeOutputFile() throws IOException { this.writer.close(); } }
