You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/07/20 14:11:50 UTC
[1/4] git commit: Merge branch 'S4-11' into piper
Updated Branches:
refs/heads/piper 6f8ad9294 -> 54c5fa232
Merge branch 'S4-11' into piper
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/54c5fa23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/54c5fa23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/54c5fa23
Branch: refs/heads/piper
Commit: 54c5fa232b6bead60f2c2f27286cf2c81f18d4ea
Parents: 6f8ad92 726580b
Author: Matthieu Morel <mm...@apache.org>
Authored: Fri Jul 20 15:45:41 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Fri Jul 20 15:45:41 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/base/Event.java | 12 +
.../java/org/apache/s4/base/util/S4RLoader.java | 7 +-
.../java/org/apache/s4/comm/QueueingListener.java | 1 +
.../java/org/apache/s4/comm/tcp/TCPEmitter.java | 3 +-
.../java/org/apache/s4/comm/tcp/TCPListener.java | 3 +-
.../java/org/apache/s4/comm/udp/UDPListener.java | 1 +
.../java/org/apache/s4/fixtures/CommTestUtils.java | 29 +--
subprojects/s4-core/s4-core.gradle | 1 +
.../src/main/java/org/apache/s4/core/App.java | 18 +-
.../java/org/apache/s4/core/DefaultCoreModule.java | 6 +
.../src/main/java/org/apache/s4/core/Main.java | 2 +-
.../java/org/apache/s4/core/ProcessingElement.java | 232 ++++++++++---
.../src/main/java/org/apache/s4/core/Stream.java | 7 +-
.../java/org/apache/s4/core/ft/CheckpointId.java | 124 +++++++
.../org/apache/s4/core/ft/CheckpointingConfig.java | 55 +++
.../apache/s4/core/ft/CheckpointingFramework.java | 52 +++
.../org/apache/s4/core/ft/CheckpointingTask.java | 33 ++
.../s4/core/ft/DefaultFileSystemStateStorage.java | 179 +++++++++
.../main/java/org/apache/s4/core/ft/FetchTask.java | 36 ++
.../ft/FileSystemBackendCheckpointingModule.java | 15 +
.../s4/core/ft/LoggingStorageCallbackFactory.java | 54 +++
.../s4/core/ft/NoOpCheckpointingFramework.java | 26 ++
.../java/org/apache/s4/core/ft/SafeKeeper.java | 282 +++++++++++++++
.../java/org/apache/s4/core/ft/SaveStateTask.java | 76 ++++
.../java/org/apache/s4/core/ft/SerializeTask.java | 46 +++
.../java/org/apache/s4/core/ft/StateStorage.java | 72 ++++
.../org/apache/s4/core/ft/StorageCallback.java | 37 ++
.../apache/s4/core/ft/StorageCallbackFactory.java | 35 ++
.../test/java/org/apache/s4/core/TriggerTest.java | 12 +-
...duleWithUnrespondingFetchingStorageBackend.java | 20 +
.../org/apache/s4/core/ft/CheckpointingTest.java | 153 ++++++++
.../java/org/apache/s4/core/ft/FTWordCountApp.java | 18 +
.../org/apache/s4/core/ft/FTWordCountTest.java | 131 +++++++
...ndWithZKStorageCallbackCheckpointingModule.java | 50 +++
.../java/org/apache/s4/core/ft/RecoveryTest.java | 158 ++++++++
.../core/ft/S4AppWithCountBasedCheckpointing.java | 24 ++
.../s4/core/ft/S4AppWithManualCheckpointing.java | 29 ++
.../core/ft/S4AppWithTimeBasedCheckpointing.java | 28 ++
.../java/org/apache/s4/core/ft/StatefulTestPE.java | 97 +++++
.../core/ft/StorageWithUnrespondingFetching.java | 45 +++
.../org/apache/s4/core/triggers/TriggerablePE.java | 6 +-
.../org/apache/s4/core/triggers/TriggeredApp.java | 12 +-
.../apache/s4/deploy/TestAutomaticDeployment.java | 62 ++--
.../java/org/apache/s4/fixtures/CoreTestUtils.java | 5 -
.../java/org/apache/s4/fixtures/SocketAdapter.java | 101 -----
.../org/apache/s4/wordcount/SentenceKeyFinder.java | 12 +-
.../java/org/apache/s4/wordcount/WordCountApp.java | 32 +--
.../org/apache/s4/wordcount/WordCountTest.java | 62 ++--
.../org/apache/s4/wordcount/WordSplitterPE.java | 15 +-
.../java/org/apache/s4/deploy/SocketAdapter.java | 80 ----
.../main/java/org/apache/s4/deploy/TestApp.java | 27 +-
.../org/apache/s4/example/twitter/TopNTopicPE.java | 4 +
.../s4/example/twitter/TopicCountAndReportPE.java | 8 +-
.../s4/example/twitter/TwitterCounterApp.java | 30 +-
54 files changed, 2245 insertions(+), 420 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/54c5fa23/subprojects/s4-core/src/main/java/org/apache/s4/core/Stream.java
----------------------------------------------------------------------