You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/10/08 21:34:13 UTC
[1/3] git commit: Merge pull request #5 from apache/master
Repository: incubator-streams
Updated Branches:
refs/heads/master 27980edf9 -> 379dd39a8
Merge pull request #5 from apache/master
apache master merge 2014/09/30
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c4839414
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c4839414
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c4839414
Branch: refs/heads/master
Commit: c483941405f3ef1792c35ea7e9495980eb6e8b96
Parents: 507e679 f90d913
Author: Ryan Ebanks <ry...@raveldata.com>
Authored: Tue Sep 30 14:50:52 2014 -0500
Committer: Ryan Ebanks <ry...@raveldata.com>
Committed: Tue Sep 30 14:50:52 2014 -0500
----------------------------------------------------------------------
pom.xml | 31 +++++-
.../org/apache/streams/s3/S3PersistReader.java | 19 +++-
streams-contrib/streams-persist-hbase/pom.xml | 1 -
streams-contrib/streams-persist-hdfs/pom.xml | 4 +-
.../regex/AbstractRegexExtensionExtractor.java | 6 +-
.../streams/urls/LinkResolverProcessor.java | 8 +-
.../streams/urls/TestLinkUnwinderProcessor.java | 4 +-
.../google-gmail/pom.xml | 2 +-
.../gmail/provider/GMailImapProviderTask.java | 15 +--
.../processor/InstagramTypeConverter.java | 5 +-
.../serializer/util/InstagramActivityUtil.java | 66 +++++++++++-
.../test/InstagramActivitySerDeTest.java | 53 +++++++++-
.../src/test/resources/testUserInfoData.txt | 2 +
.../local/builders/LocalStreamBuilder.java | 3 +-
...amOnUnhandleThrowableThreadPoolExecutor.java | 46 +++++++++
...nhandledThrowableThreadPoolExecutorTest.java | 103 +++++++++++++++++++
16 files changed, 328 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Changed provider task to sleep only if provider has
no data
Posted by mf...@apache.org.
Changed provider task to sleep only if provider has no data
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e74682e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e74682e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e74682e4
Branch: refs/heads/master
Commit: e74682e4de41d0358fcac81fc6811adaef80397e
Parents: c483941
Author: Ryan Ebanks <ry...@gmail.com>
Authored: Tue Oct 7 15:48:31 2014 -0500
Committer: Ryan Ebanks <ry...@gmail.com>
Committed: Tue Oct 7 15:48:31 2014 -0500
----------------------------------------------------------------------
.../apache/streams/local/tasks/StreamsProviderTask.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e74682e4/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
index d040c4b..83ad04a 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
@@ -155,7 +155,8 @@ public class StreamsProviderTask extends BaseStreamsTask implements DatumStatusC
// the way this works needs to change...
if(zeros > maxZeros)
this.keepRunning.set(false);
- Thread.sleep(sleepTime);
+ if(zeros > 0)
+ Thread.sleep(sleepTime);
} catch (InterruptedException e) {
LOGGER.warn("Thread interrupted");
this.keepRunning.set(false);
@@ -218,14 +219,6 @@ public class StreamsProviderTask extends BaseStreamsTask implements DatumStatusC
DatumUtils.addErrorToMetadata(datum, e, this.provider.getClass());
}
}
- else {
- try {
- Thread.sleep(sleepTime);
- } catch (InterruptedException e) {
- LOGGER.warn("Thread interrupted");
- this.keepRunning.set(false);
- }
- }
}
this.flushing.set(false);
}
[3/3] git commit: Merge PR#98 from 'rbnks/STREAMS-189'
Posted by mf...@apache.org.
Merge PR#98 from 'rbnks/STREAMS-189'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/379dd39a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/379dd39a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/379dd39a
Branch: refs/heads/master
Commit: 379dd39a83514b554aefa50077b2533fc68c45d8
Parents: 27980ed e74682e
Author: Matt Franklin <mf...@apache.org>
Authored: Wed Oct 8 14:50:32 2014 -0400
Committer: Matt Franklin <mf...@apache.org>
Committed: Wed Oct 8 14:50:32 2014 -0400
----------------------------------------------------------------------
.../apache/streams/local/tasks/StreamsProviderTask.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------