You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/08/25 20:16:49 UTC
[1/4] incubator-streams git commit: resolves STREAMS-354
Repository: incubator-streams
Updated Branches:
refs/heads/master 942fb7dbf -> e52cb25df
resolves STREAMS-354
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/67325e7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/67325e7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/67325e7b
Branch: refs/heads/master
Commit: 67325e7bf62ad1775daceeec0c87a932e20478b3
Parents: 776a224
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Aug 18 14:28:53 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Aug 18 14:28:53 2015 -0500
----------------------------------------------------------------------
streams-pojo/src/main/jsonschema/collection.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/67325e7b/streams-pojo/src/main/jsonschema/collection.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/collection.json b/streams-pojo/src/main/jsonschema/collection.json
index 3833009..c4cfd57 100644
--- a/streams-pojo/src/main/jsonschema/collection.json
+++ b/streams-pojo/src/main/jsonschema/collection.json
@@ -15,7 +15,7 @@
"description": "An IRI [RFC3987] referencing a JSON document containing the full listing of objects in the collection."
},
"totalItems": {
- "type": "number",
+ "type": "integer",
"description": "Non-negative integer specifying the total number of activities within the stream. The Stream serialization MAY contain a count property."
},
"items": {
[3/4] incubator-streams git commit: Merge branch 'STREAMS-354'
Posted by sb...@apache.org.
Merge branch 'STREAMS-354'
* STREAMS-354:
resolves STREAMS-354
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/43dc13eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/43dc13eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/43dc13eb
Branch: refs/heads/master
Commit: 43dc13eb51cda67e95023bf9d24bb80f5c9dc5cf
Parents: 942fb7d 67325e7
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Aug 25 11:32:26 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Aug 25 11:32:26 2015 -0500
----------------------------------------------------------------------
streams-pojo/src/main/jsonschema/collection.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] incubator-streams git commit: resolves STREAMS-355
Posted by sb...@apache.org.
resolves STREAMS-355
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/306d5afe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/306d5afe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/306d5afe
Branch: refs/heads/master
Commit: 306d5afe4c8011ca9cdf3678d464102e263d1561
Parents: 776a224
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Wed Aug 19 15:24:05 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Wed Aug 19 15:24:05 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java | 3 ++-
.../main/java/org/apache/streams/core/DatumStatusCounter.java | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/306d5afe/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
index f1432a5..0312c37 100644
--- a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
+++ b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
@@ -68,7 +68,7 @@ public class WebHdfsPersistReader implements StreamsPersistReader, DatumStatusCo
protected volatile Queue<StreamsDatum> persistQueue;
- protected ObjectMapper mapper = StreamsJacksonMapper.getInstance();
+ protected ObjectMapper mapper;
protected HdfsReaderConfiguration hdfsConfiguration;
protected StreamsConfiguration streamsConfiguration;
@@ -177,6 +177,7 @@ public class WebHdfsPersistReader implements StreamsPersistReader, DatumStatusCo
persistQueue = Queues.synchronizedQueue(new LinkedBlockingQueue<StreamsDatum>(streamsConfiguration.getBatchSize().intValue()));
//persistQueue = Queues.synchronizedQueue(new ConcurrentLinkedQueue());
executor = Executors.newSingleThreadExecutor();
+ mapper = StreamsJacksonMapper.getInstance();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/306d5afe/streams-core/src/main/java/org/apache/streams/core/DatumStatusCounter.java
----------------------------------------------------------------------
diff --git a/streams-core/src/main/java/org/apache/streams/core/DatumStatusCounter.java b/streams-core/src/main/java/org/apache/streams/core/DatumStatusCounter.java
index ad50e3b..2e598ce 100644
--- a/streams-core/src/main/java/org/apache/streams/core/DatumStatusCounter.java
+++ b/streams-core/src/main/java/org/apache/streams/core/DatumStatusCounter.java
@@ -17,8 +17,11 @@
*/
package org.apache.streams.core;
+
+import java.io.Serializable;
+
@Deprecated
-public class DatumStatusCounter
+public class DatumStatusCounter implements Serializable
{
private volatile int attempted = 0;
private volatile int success = 0;
[4/4] incubator-streams git commit: Merge branch 'STREAMS-355'
Posted by sb...@apache.org.
Merge branch 'STREAMS-355'
* STREAMS-355:
resolves STREAMS-355
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e52cb25d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e52cb25d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e52cb25d
Branch: refs/heads/master
Commit: e52cb25df0f9be949e7b62af1b5f322161462748
Parents: 43dc13e 306d5af
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Aug 25 11:32:33 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Aug 25 11:32:33 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java | 3 ++-
.../main/java/org/apache/streams/core/DatumStatusCounter.java | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e52cb25d/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
----------------------------------------------------------------------