You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/02/25 20:30:43 UTC
[1/3] storm git commit: storm-hdfs : change visibility of create and
closeOutputFile methods to protected
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 <ju...@digitalpebble.com>
Authored: Thu Feb 18 16:25:40 2016 +0000
Committer: Julien Nioche <ju...@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();
}
}
[3/3] storm git commit: Merge branch 'master' of
https://github.com/DigitalPebble/storm into PULL-1122
Posted by bo...@apache.org.
Merge branch 'master' of https://github.com/DigitalPebble/storm into PULL-1122
PULL-1122: 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/f1dbe42b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f1dbe42b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f1dbe42b
Branch: refs/heads/master
Commit: f1dbe42b3213a4a040a5b4ca169421020fccc5a7
Parents: dd00bc0 fe547cc
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Feb 25 13:04:18 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Feb 25 13:04:18 2016 -0600
----------------------------------------------------------------------
.../java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java | 10 +++++-----
.../org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java | 8 ++++----
.../main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java | 8 ++++----
.../java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java | 8 ++++----
4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[2/3] storm git commit: All abstract methods in AbstractHdfsBolt and
subclasses are now protected
Posted by bo...@apache.org.
All abstract methods in AbstractHdfsBolt and subclasses are now protected
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fe547cc6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fe547cc6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fe547cc6
Branch: refs/heads/master
Commit: fe547cc629e2933ad66605d549efaa7dcd7247b1
Parents: bcb40e4
Author: Julien Nioche <ju...@digitalpebble.com>
Authored: Fri Feb 19 22:28:29 2016 +0000
Committer: Julien Nioche <ju...@digitalpebble.com>
Committed: Fri Feb 19 22:28:29 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java | 6 +++---
.../java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java | 6 +++---
.../src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java | 4 ++--
.../main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fe547cc6/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 c8dbf71..c56f486 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
@@ -231,7 +231,7 @@ public abstract class AbstractHdfsBolt extends BaseRichBolt {
* @param tuple
* @throws IOException
*/
- abstract void writeTuple(Tuple tuple) throws IOException;
+ abstract protected void writeTuple(Tuple tuple) throws IOException;
/**
* Make the best effort to sync written data to the underlying file system. Concrete classes should very clearly
@@ -240,12 +240,12 @@ public abstract class AbstractHdfsBolt extends BaseRichBolt {
*
* @throws IOException
*/
- abstract void syncTuples() throws IOException;
+ abstract protected void syncTuples() throws IOException;
abstract protected void closeOutputFile() throws IOException;
abstract protected Path createOutputFile() throws IOException;
- abstract void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException;
+ abstract protected void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/fe547cc6/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 8440fa0..cdeb2f8 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
@@ -92,7 +92,7 @@ public class AvroGenericRecordBolt extends AbstractHdfsBolt{
}
@Override
- void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException {
+ protected void doPrepare(Map conf, TopologyContext topologyContext, OutputCollector collector) throws IOException {
LOG.info("Preparing AvroGenericRecord Bolt...");
this.fs = FileSystem.get(URI.create(this.fsUrl), hdfsConfig);
Schema.Parser parser = new Schema.Parser();
@@ -100,14 +100,14 @@ public class AvroGenericRecordBolt extends AbstractHdfsBolt{
}
@Override
- void writeTuple(Tuple tuple) throws IOException {
+ protected void writeTuple(Tuple tuple) throws IOException {
GenericRecord avroRecord = (GenericRecord) tuple.getValue(0);
avroWriter.append(avroRecord);
offset = this.out.getPos();
}
@Override
- void syncTuples() throws IOException {
+ protected void syncTuples() throws IOException {
avroWriter.flush();
LOG.debug("Attempting to sync all data to filesystem");
http://git-wip-us.apache.org/repos/asf/storm/blob/fe547cc6/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 495f49d..0299f43 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
@@ -96,7 +96,7 @@ public class HdfsBolt extends AbstractHdfsBolt{
}
@Override
- void syncTuples() throws IOException {
+ protected void syncTuples() throws IOException {
LOG.debug("Attempting to sync all data to filesystem");
if (this.out instanceof HdfsDataOutputStream) {
((HdfsDataOutputStream) this.out).hsync(EnumSet.of(SyncFlag.UPDATE_LENGTH));
@@ -106,7 +106,7 @@ public class HdfsBolt extends AbstractHdfsBolt{
}
@Override
- void writeTuple(Tuple tuple) throws IOException {
+ protected void writeTuple(Tuple tuple) throws IOException {
byte[] bytes = this.format.format(tuple);
out.write(bytes);
this.offset += bytes.length;
http://git-wip-us.apache.org/repos/asf/storm/blob/fe547cc6/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 b62b6d4..e0db7c9 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
@@ -114,13 +114,13 @@ public class SequenceFileBolt extends AbstractHdfsBolt {
}
@Override
- void syncTuples() throws IOException {
+ protected void syncTuples() throws IOException {
LOG.debug("Attempting to sync all data to filesystem");
this.writer.hsync();
}
@Override
- void writeTuple(Tuple tuple) throws IOException {
+ protected void writeTuple(Tuple tuple) throws IOException {
this.writer.append(this.format.key(tuple), this.format.value(tuple));
this.offset = this.writer.getLength();
}