Merge branch 'NewConsumer2' of https://github.com/sborya/samza into 
NewKafkaSystemConsumer


Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/36159631
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/36159631
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/36159631

Branch: refs/heads/NewKafkaSystemConsumer
Commit: 361596317a990a047282669ab93c1a1eb7810ae5
Parents: 40f7430 74b6cfa
Author: Boris S <[email protected]>
Authored: Tue Sep 18 15:56:52 2018 -0700
Committer: Boris S <[email protected]>
Committed: Tue Sep 18 15:56:52 2018 -0700

----------------------------------------------------------------------
 .../samza/system/IncomingMessageEnvelope.java   |   3 +-
 .../ClusterBasedJobCoordinator.java             |   2 +-
 .../apache/samza/storage/StorageRecovery.java   |   2 +-
 .../samza/checkpoint/CheckpointTool.scala       |   2 +-
 .../apache/samza/container/SamzaContainer.scala |   2 +-
 .../samza/coordinator/JobModelManager.scala     |   6 +-
 .../samza/job/local/ProcessJobFactory.scala     |   3 +-
 .../samza/job/local/ThreadJobFactory.scala      |  20 +-
 .../samza/coordinator/TestJobCoordinator.scala  |   4 +-
 .../clients/consumer/KafkaConsumerConfig.java   | 194 ++++++++
 .../org/apache/samza/config/KafkaConfig.scala   |   5 +-
 .../apache/samza/system/kafka/BrokerProxy.scala | 332 --------------
 .../samza/system/kafka/KafkaConsumerProxy.java  | 456 +++++++++++++++++++
 .../samza/system/kafka/KafkaSystemConsumer.java | 391 ++++++++++++++++
 .../system/kafka/KafkaSystemConsumer.scala      | 309 -------------
 .../kafka/KafkaSystemConsumerMetrics.scala      |  68 ++-
 .../samza/system/kafka/KafkaSystemFactory.scala |  81 ++--
 .../consumer/TestKafkaConsumerConfig.java       | 137 ++++++
 .../samza/system/kafka/TestBrokerProxy.scala    | 434 ------------------
 .../system/kafka/TestKafkaSystemConsumer.java   | 224 +++++++++
 .../system/kafka/TestKafkaSystemConsumer.scala  | 191 --------
 .../test/integration/StreamTaskTestUtil.scala   |  17 +-
 .../integration/TestShutdownStatefulTask.scala  |   4 +-
 .../samza/validation/YarnJobValidationTool.java |   2 +-
 .../yarn/TestSamzaYarnAppMasterService.scala    |   4 +-
 25 files changed, 1511 insertions(+), 1382 deletions(-)
----------------------------------------------------------------------


Reply via email to