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/01/03 11:19:16 UTC

[49/50] [abbrv] git commit: Merge remote branch 'checkpoint/master'

Merge remote branch 'checkpoint/master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/5dbbaec7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/5dbbaec7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/5dbbaec7

Branch: refs/heads/dev
Commit: 5dbbaec7069cf68e51109e98c4df400e840cc825
Parents: b2bf958 e89e295
Author: Bruce Robbins <ro...@thosespent.corp.yahoo.com>
Authored: Sun Sep 25 14:09:34 2011 -0700
Committer: Bruce Robbins <ro...@thosespent.corp.yahoo.com>
Committed: Sun Sep 25 14:09:34 2011 -0700

----------------------------------------------------------------------
 .gitignore                                         |    4 +
 build.gradle                                       |  152 +++---
 s4-comm/build.gradle                               |   42 +-
 s4-core/.gitignore                                 |    5 +
 s4-core/build.gradle                               |    9 +
 s4-core/src/main/java/io/s4/MainApp.java           |    9 +-
 .../src/main/java/io/s4/dispatcher/Dispatcher.java |    4 +
 .../partitioner/LoopbackPartitioner.java           |   54 ++
 .../main/java/io/s4/emitter/CommLayerEmitter.java  |    4 +
 .../src/main/java/io/s4/ft/CheckpointingEvent.java |   38 ++
 .../io/s4/ft/DefaultFileSystemStateStorage.java    |  227 +++++++
 .../java/io/s4/ft/InitiateCheckpointingEvent.java  |   20 +
 .../io/s4/ft/LoggingStorageCallbackFactory.java    |   39 ++
 s4-core/src/main/java/io/s4/ft/RecoveryEvent.java  |   18 +
 .../src/main/java/io/s4/ft/RedisStateStorage.java  |  112 ++++
 s4-core/src/main/java/io/s4/ft/SafeKeeper.java     |  242 ++++++++
 s4-core/src/main/java/io/s4/ft/SafeKeeperId.java   |  104 ++++
 s4-core/src/main/java/io/s4/ft/SaveStateTask.java  |   28 +
 s4-core/src/main/java/io/s4/ft/StateStorage.java   |   52 ++
 .../src/main/java/io/s4/ft/StorageCallback.java    |   19 +
 .../main/java/io/s4/ft/StorageCallbackFactory.java |   18 +
 s4-core/src/main/java/io/s4/ft/package.html        |   23 +
 .../src/main/java/io/s4/listener/EventHandler.java |    1 +
 .../src/main/java/io/s4/processor/AbstractPE.java  |  464 ++++++++++++---
 .../src/main/java/io/s4/processor/PEContainer.java |  131 +++--
 .../java/io/s4/processor/PrototypeWrapper.java     |    8 +
 .../src/main/java/io/s4/util/LoadGenerator.java    |   10 +-
 .../main/resources/s4-core/conf/default/log4j.xml  |    4 +
 s4-core/src/main/resources/scripts/run-adapter.sh  |    2 +-
 .../main/resources/scripts/run-client-adapter.sh   |    2 +-
 .../src/test/java/io/s4/ft/CheckpointingTest.java  |  108 ++++
 s4-core/src/test/java/io/s4/ft/EventGenerator.java |   63 ++
 s4-core/src/test/java/io/s4/ft/KeyValue.java       |   33 +
 s4-core/src/test/java/io/s4/ft/RecoveryTest.java   |  113 ++++
 s4-core/src/test/java/io/s4/ft/S4App.java          |  201 +++++++
 s4-core/src/test/java/io/s4/ft/S4TestCase.java     |   52 ++
 .../test/java/io/s4/ft/SimpleEventProducer.java    |   54 ++
 s4-core/src/test/java/io/s4/ft/StatefulTestPE.java |  136 +++++
 .../test/java/io/s4/ft/TestRedisStateStorage.java  |  146 +++++
 s4-core/src/test/java/io/s4/ft/TestUtils.java      |  399 +++++++++++++
 s4-core/src/test/java/io/s4/ft/adapter.properties  |    2 +
 s4-core/src/test/java/io/s4/ft/adapter_conf.xml    |   40 ++
 .../src/test/java/io/s4/ft/app_adapter_conf.xml    |   14 +
 s4-core/src/test/java/io/s4/ft/app_conf.xml        |   26 +
 .../test/java/io/s4/ft/s4_core_conf_bk_backend.xml |  198 ++++++
 .../test/java/io/s4/ft/s4_core_conf_fs_backend.xml |  196 ++++++
 s4-core/src/test/java/io/s4/ft/wall_clock.xml      |    6 +
 .../java/io/s4/ft/wordcount/FTWordCountTest.java   |  159 +++++
 .../src/test/java/io/s4/ft/wordcount/app_conf.xml  |   94 +++
 .../io/s4/ft/wordcount/s4_core_conf_fs_backend.xml |  196 ++++++
 .../s4/ft/wordcount/s4_core_conf_redis_backend.xml |  198 ++++++
 .../test/java/io/s4/ft/wordcount/wall_clock.xml    |    6 +
 .../java/io/s4/processor/TestPrototypeWrapper.java |    3 +-
 s4-core/src/test/java/io/s4/wordcount/Word.java    |   22 +
 .../test/java/io/s4/wordcount/WordClassifier.java  |  109 ++++
 .../src/test/java/io/s4/wordcount/WordCount.java   |   43 ++
 .../test/java/io/s4/wordcount/WordCountTest.java   |   83 +++
 .../src/test/java/io/s4/wordcount/WordCounter.java |   60 ++
 .../test/java/io/s4/wordcount/WordSplitter.java    |   61 ++
 s4-core/src/test/java/io/s4/wordcount/app_conf.xml |   92 +++
 .../src/test/java/io/s4/wordcount/s4_core_conf.xml |  194 ++++++
 .../src/test/java/io/s4/wordcount/wall_clock.xml   |    6 +
 s4-core/src/test/resources/clusters.xml            |   16 +
 .../src/test/resources/linux/redis-server-32bits   |  Bin 0 -> 321760 bytes
 s4-core/src/test/resources/log4j.xml               |   33 +-
 .../src/test/resources/macosx/redis-server-64bits  |  Bin 0 -> 321760 bytes
 s4-core/src/test/resources/s4_core.properties      |   10 +
 s4-examples/twittertopiccount-ft/build.gradle      |   22 +
 .../twittertopiccount/DirectToFilePersister.java   |  118 ++++
 .../io/s4/example/twittertopiccount/Status.java    |  154 +++++
 .../s4/example/twittertopiccount/TopNTopicPE.java  |  178 ++++++
 .../twittertopiccount/TopicCountAndReportPE.java   |   76 +++
 .../twittertopiccount/TopicExtractorPE.java        |  114 ++++
 .../io/s4/example/twittertopiccount/TopicSeen.java |   67 ++
 .../twittertopiccount/TwitterFeedListener.java     |  355 +++++++++++
 .../twittertopiccount/TwitterFeedReader.java       |   66 ++
 .../java/io/s4/example/twittertopiccount/User.java |  280 +++++++++
 .../src/main/resources/adapter-conf.xml            |   32 +
 .../src/main/resources/s4-core-conf.xml            |  185 ++++++
 .../s4-example-twittertopiccount-ft-conf.xml       |  121 ++++
 settings.gradle                                    |    2 +
 81 files changed, 6524 insertions(+), 263 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/5dbbaec7/build.gradle
----------------------------------------------------------------------