You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/02/20 05:35:51 UTC
[1/3] storm git commit: storm-hdfs test-jar build is missing in
pom.xml
Repository: storm
Updated Branches:
refs/heads/master 9a33c3d31 -> 7d8196ceb
storm-hdfs test-jar build is missing in pom.xml
Conflicts:
external/storm-hdfs/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d819db1e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d819db1e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d819db1e
Branch: refs/heads/master
Commit: d819db1eb3ecb0d7c31b35607e59def1a78da441
Parents: 8036109
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Sep 7 14:41:41 2014 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Tue Feb 10 13:26:39 2015 -0800
----------------------------------------------------------------------
external/storm-hdfs/pom.xml | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d819db1e/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index fec626a..dcbfb7a 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -64,5 +64,21 @@
</exclusion>
</exclusions>
</dependency>
- </dependencies>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[2/3] storm git commit: STORM-649:HDFS topologies should write to
/tmp.
Posted by sr...@apache.org.
STORM-649:HDFS topologies should write to /tmp.
Conflicts:
external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/PersistentWordCount.java
external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5cf2a549
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5cf2a549
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5cf2a549
Branch: refs/heads/master
Commit: 5cf2a549210a31b853af32d94da8eaafacf8787f
Parents: d819db1
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Fri Oct 24 16:44:31 2014 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Tue Feb 10 13:32:14 2015 -0800
----------------------------------------------------------------------
.../test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java | 6 ++----
.../java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java | 4 ++--
.../org/apache/storm/hdfs/trident/TridentFileTopology.java | 2 +-
.../org/apache/storm/hdfs/trident/TridentSequenceTopology.java | 6 +++---
4 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5cf2a549/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
index 4fc6fb3..32f1f2d 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java
@@ -68,11 +68,9 @@ public class HdfsFileTopology {
FileRotationPolicy rotationPolicy = new TimedRotationPolicy(1.0f, TimedRotationPolicy.TimeUnit.MINUTES);
FileNameFormat fileNameFormat = new DefaultFileNameFormat()
- .withPath("/foo/")
+ .withPath("/tmp/foo/")
.withExtension(".txt");
-
-
// use "|" instead of "," for field delimiter
RecordFormat format = new DelimitedRecordFormat()
.withFieldDelimiter("|");
@@ -90,7 +88,7 @@ public class HdfsFileTopology {
.withRecordFormat(format)
.withRotationPolicy(rotationPolicy)
.withSyncPolicy(syncPolicy)
- .addRotationAction(new MoveFileAction().toDestination("/dest2/"));
+ .addRotationAction(new MoveFileAction().toDestination("/tmp/dest2/"));
TopologyBuilder builder = new TopologyBuilder();
http://git-wip-us.apache.org/repos/asf/storm/blob/5cf2a549/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
index e3cbac9..2351cd3 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java
@@ -63,7 +63,7 @@ public class SequenceFileTopology {
FileRotationPolicy rotationPolicy = new FileSizeRotationPolicy(5.0f, Units.MB);
FileNameFormat fileNameFormat = new DefaultFileNameFormat()
- .withPath("/source/")
+ .withPath("/tmp/source/")
.withExtension(".seq");
// create sequence format instance.
@@ -77,7 +77,7 @@ public class SequenceFileTopology {
.withSyncPolicy(syncPolicy)
.withCompressionType(SequenceFile.CompressionType.RECORD)
.withCompressionCodec("deflate")
- .addRotationAction(new MoveFileAction().toDestination("/dest/"));
+ .addRotationAction(new MoveFileAction().toDestination("/tmp/dest/"));
http://git-wip-us.apache.org/repos/asf/storm/blob/5cf2a549/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java
index cef9783..b0a22df 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java
@@ -49,7 +49,7 @@ public class TridentFileTopology {
Fields hdfsFields = new Fields("sentence", "key");
FileNameFormat fileNameFormat = new DefaultFileNameFormat()
- .withPath("/trident")
+ .withPath("/tmp/trident")
.withPrefix("trident")
.withExtension(".txt");
http://git-wip-us.apache.org/repos/asf/storm/blob/5cf2a549/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java
index ee9f1f0..711811e 100644
--- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java
+++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java
@@ -49,7 +49,7 @@ public class TridentSequenceTopology {
Fields hdfsFields = new Fields("sentence", "key");
FileNameFormat fileNameFormat = new DefaultFileNameFormat()
- .withPath("/trident")
+ .withPath("/tmp/trident")
.withPrefix("trident")
.withExtension(".seq");
@@ -60,8 +60,8 @@ public class TridentSequenceTopology {
.withSequenceFormat(new DefaultSequenceFormat("key", "sentence"))
.withRotationPolicy(rotationPolicy)
.withFsUrl(hdfsUrl)
- .addRotationAction(new MoveFileAction().toDestination("/dest2/"));
-
+ .withConfigKey("hdfs.config")
+ .addRotationAction(new MoveFileAction().toDestination("/tmp/dest2/"));
StateFactory factory = new HdfsStateFactory().withOptions(seqOpts);
TridentState state = stream
[3/3] storm git commit: Merge branch 'STORM-649' of
https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-649
Posted by sr...@apache.org.
Merge branch 'STORM-649' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-649
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7d8196ce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7d8196ce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7d8196ce
Branch: refs/heads/master
Commit: 7d8196ceb167e30e4f48abc8b1b3f085602d5a58
Parents: 9a33c3d 5cf2a54
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Feb 19 20:24:33 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Feb 19 20:24:33 2015 -0800
----------------------------------------------------------------------
external/storm-hdfs/pom.xml | 18 +++++++++++++++++-
.../apache/storm/hdfs/bolt/HdfsFileTopology.java | 6 ++----
.../storm/hdfs/bolt/SequenceFileTopology.java | 4 ++--
.../storm/hdfs/trident/TridentFileTopology.java | 2 +-
.../hdfs/trident/TridentSequenceTopology.java | 6 +++---
5 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------