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/04/08 01:26:08 UTC
[36/36] 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/1b66a91b
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/1b66a91b
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/1b66a91b
Branch: refs/heads/samza-sql
Commit: 1b66a91b4772266394b93ed807e9c940151243f9
Parents: 7267ad3 edc2c78
Author: Chris Riccomini <cr...@apache.org>
Authored: Tue Apr 7 16:20:01 2015 -0700
Committer: Chris Riccomini <cr...@apache.org>
Committed: Tue Apr 7 16:20:01 2015 -0700
----------------------------------------------------------------------
.travis.yml | 46 ----
KEYS | 60 ++++-
README.md | 2 -
build.gradle | 11 +
docs/_config.yml | 2 +-
docs/_layouts/default.html | 11 +-
docs/archive/index.html | 8 +
docs/contribute/tests.md | 6 -
.../versioned/container/metrics.md | 2 +-
.../versioned/jobs/configuration-table.html | 13 +
.../versioned/jobs/configuration.md | 5 +-
.../documentation/versioned/jobs/job-runner.md | 2 +-
.../documentation/versioned/jobs/logging.md | 13 +-
.../versioned/run-in-multi-node-yarn.md | 14 +-
docs/startup/download/index.md | 25 +-
gradle.properties | 2 +-
gradle/dependency-versions.gradle | 4 +-
gradle/release.gradle | 4 +-
.../java/org/apache/samza/config/Config.java | 5 +
.../java/org/apache/samza/config/MapConfig.java | 21 +-
.../java/org/apache/samza/task/TaskContext.java | 13 +
.../org/apache/samza/config/TestConfig.java | 21 +-
.../apache/samza/config/SerializerConfig.scala | 3 +-
.../org/apache/samza/config/StorageConfig.scala | 16 +-
.../org/apache/samza/container/RunLoop.scala | 31 ++-
.../apache/samza/container/SamzaContainer.scala | 8 +-
.../apache/samza/container/TaskInstance.scala | 6 +
.../samza/serializers/ByteBufferSerde.scala | 49 ++++
.../apache/samza/serializers/ByteSerde.scala | 3 +-
.../apache/samza/serializers/StringSerde.scala | 1 -
.../apache/samza/serializers/UUIDSerde.scala | 47 ++++
.../apache/samza/system/SystemConsumers.scala | 7 +-
.../apache/samza/config/TestStorageConfig.scala | 40 +++
.../apache/samza/container/TestRunLoop.scala | 38 ++-
.../samza/container/TestSamzaContainer.scala | 5 +-
.../samza/container/TestTaskInstance.scala | 68 ++++-
.../samza/serializers/TestByteBufferSerde.scala | 41 ++++
.../samza/serializers/TestIntegerSerde.scala | 3 -
.../samza/serializers/TestUUIDSerde.scala | 53 ++++
.../samza/system/TestStreamMetadataCache.scala | 4 +-
.../kafka/KafkaCheckpointManager.scala | 7 +-
.../kafka/KafkaCheckpointManagerFactory.scala | 4 +-
.../apache/samza/config/KafkaSerdeConfig.scala | 12 +
.../apache/samza/serializers/KafkaSerde.scala | 20 +-
.../apache/samza/system/kafka/BrokerProxy.scala | 31 ++-
.../apache/samza/system/kafka/GetOffset.scala | 7 +-
.../samza/system/kafka/KafkaSystemAdmin.scala | 10 +-
.../system/kafka/KafkaSystemConsumer.scala | 27 +-
.../samza/system/kafka/KafkaSystemFactory.scala | 12 +-
.../system/kafka/KafkaSystemProducer.scala | 10 +-
.../samza/system/kafka/TopicMetadataCache.scala | 12 +-
.../scala/org/apache/samza/util/KafkaUtil.scala | 39 ++-
.../samza/system/kafka/MockKafkaProducer.java | 246 +++++++++++++++++++
.../java/org/apache/samza/utils/TestUtils.java | 112 +++++++++
.../samza/config/TestKafkaSerdeConfig.scala | 7 +
.../samza/system/kafka/MockKafkaProducer.java | 246 -------------------
.../samza/system/kafka/TestBrokerProxy.scala | 59 +++++
.../system/kafka/TestKafkaSystemAdmin.scala | 8 +-
.../system/kafka/TestKafkaSystemFactory.scala | 13 +
.../system/kafka/TestKafkaSystemProducer.scala | 33 ++-
.../system/kafka/TestTopicMetadataCache.scala | 14 +-
.../org/apache/samza/utils/TestKafkaUtil.scala | 33 +++
.../scala/org/apache/samza/utils/TestUtils.java | 112 ---------
.../RocksDbKeyValueStorageEngineFactory.scala | 4 +-
.../samza/storage/kv/RocksDbKeyValueStore.scala | 11 +-
.../apache/samza/storage/kv/CachedStore.scala | 15 ++
.../samza/storage/kv/TestCachedStore.scala | 35 +++
.../apache/samza/config/Log4jSystemConfig.java | 67 +++--
.../samza/logging/log4j/StreamAppender.java | 36 +--
.../serializers/LoggingEventJsonSerde.java | 192 +++++++++++++++
.../LoggingEventJsonSerdeFactory.java | 38 +++
.../samza/config/TestLog4jSystemConfig.java | 22 +-
.../samza/logging/log4j/TestStreamAppender.java | 54 +++-
samza-test/src/main/config/join/checker.samza | 1 +
.../src/main/config/perf/kv-perf.properties | 28 ++-
samza-test/src/main/python/configs/tests.json | 2 +-
.../performance/TestKeyValuePerformance.scala | 175 ++++++++-----
.../test/integration/TestStatefulTask.scala | 8 +-
.../webapp/ApplicationMasterRestServlet.scala | 2 +-
.../webapp/ApplicationMasterWebServlet.scala | 2 +-
80 files changed, 1790 insertions(+), 689 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/1b66a91b/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/1b66a91b/gradle/dependency-versions.gradle
----------------------------------------------------------------------