You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by cr...@apache.org on 2015/03/02 01:20:48 UTC
[8/8] samza git commit: Merge branch 'master' into samza-sql
Merge branch 'master' into samza-sql
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/7267ad37
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/7267ad37
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/7267ad37
Branch: refs/heads/samza-sql
Commit: 7267ad37d5b0169ba10ec3b847a36999b993b18b
Parents: 2239ba5 c6fa8ed
Author: Chris Riccomini <cr...@apache.org>
Authored: Sun Mar 1 16:11:04 2015 -0800
Committer: Chris Riccomini <cr...@apache.org>
Committed: Sun Mar 1 16:11:04 2015 -0800
----------------------------------------------------------------------
bin/integration-tests.sh | 2 +-
bin/setup-int-test.sh | 49 ++++++
build.gradle | 10 +-
.../apache/samza/container/SamzaContainer.scala | 2 +
.../SamzaContainerExceptionHandler.scala | 1 +
.../scala/org/apache/samza/job/JobRunner.scala | 2 +-
.../samza/job/local/ProcessJobFactory.scala | 8 +-
.../apache/samza/system/kafka/BrokerProxy.scala | 4 +-
.../system/kafka/KafkaSystemConsumer.scala | 60 ++++---
.../apache/samza/system/kafka/MessageSink.scala | 5 +-
.../samza/system/kafka/TestBrokerProxy.scala | 2 +
.../system/kafka/TestKafkaSystemConsumer.scala | 2 +-
.../src/main/config/hello-stateful-world.samsa | 31 ----
samza-test/src/main/config/join/README | 77 +++++++++
samza-test/src/main/config/join/checker.samsa | 36 ----
samza-test/src/main/config/join/checker.samza | 38 +++++
.../src/main/config/join/common.properties | 46 +++++
samza-test/src/main/config/join/emitter.samsa | 33 ----
samza-test/src/main/config/join/emitter.samza | 35 ++++
samza-test/src/main/config/join/joiner.samsa | 31 ----
samza-test/src/main/config/join/joiner.samza | 32 ++++
samza-test/src/main/config/join/reset.sh | 47 ++++++
samza-test/src/main/config/join/watcher.samsa | 31 ----
samza-test/src/main/config/join/watcher.samza | 28 ++++
.../perf/container-performance.properties | 32 ++++
.../test/integration/SimpleStatefulTask.java | 5 +
.../test/integration/StatePerfTestTask.java | 3 +
.../samza/test/integration/join/Checker.java | 48 ++++--
.../samza/test/integration/join/Emitter.java | 29 ++--
.../test/integration/join/EpochPartitioner.java | 5 +-
.../samza/test/integration/join/Joiner.java | 23 ++-
.../samza/test/integration/join/Watcher.java | 42 +----
samza-test/src/main/python/integration_tests.py | 30 ++++
.../src/main/python/samza_failure_testing.py | 166 +++++++++++++++++++
samza-test/src/main/python/tests.py | 30 ----
.../src/main/python/tests/performance_tests.py | 21 ++-
samza-test/src/main/python/tests/util.py | 13 +-
.../main/resources/hello-stateful-world.samza | 31 ++++
samza-test/src/main/resources/log4j.xml | 11 +-
.../TestSamzaContainerPerformance.scala | 106 ------------
40 files changed, 794 insertions(+), 413 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/7267ad37/build.gradle
----------------------------------------------------------------------
diff --cc build.gradle
index bbd94e1,0a268ac..d2869c4
--- a/build.gradle
+++ b/build.gradle
@@@ -85,8 -78,9 +85,9 @@@ rat
'gradlew',
'gradlew.bat',
'samza-test/state/mystore/**',
- 'README.md',
+ '**/README.md',
'RELEASE.md',
+ 'samza-test/src/main/resources/**'
]
}