You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by ja...@apache.org on 2018/10/12 02:48:04 UTC
[20/32] samza git commit: Merge branch 'master' of https://github.com/apache/samza

Merge branch 'master' of https://github.com/apache/samza


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

Branch: refs/heads/master
Commit: ace5c653ecd37d5cdd1c0206c21dd119cf733a19
Parents: 531b668 1eb4c26
Author: Jagadish <jv...@linkedin.com>
Authored: Thu Oct 11 15:04:22 2018 -0700
Committer: Jagadish <jv...@linkedin.com>
Committed: Thu Oct 11 15:04:22 2018 -0700

----------------------------------------------------------------------
 .../samza/table/TableDescriptorsProvider.java   |   2 +-
 .../samza/application/ApplicationUtil.java      |   1 -
 .../table/caching/CachingTableDescriptor.java   |  47 +-
 .../org/apache/samza/config/SystemConfig.scala  |   2 +-
 .../samza/table/caching/TestCachingTable.java   |  13 +-
 .../samza/config/KafkaConsumerConfig.java       | 194 ++++++
 .../samza/system/kafka/KafkaSystemAdmin.java    | 665 +++++++++++++++++++
 .../samza/system/kafka/KafkaSystemConsumer.java | 366 ++++++++++
 .../org/apache/samza/config/KafkaConfig.scala   |   5 +
 .../samza/config/KafkaConsumerConfig.java       | 201 ------
 .../samza/system/kafka/KafkaConsumerProxy.java  |   2 +
 .../samza/system/kafka/KafkaSystemAdmin.scala   | 608 -----------------
 .../kafka/KafkaSystemAdminUtilsScala.scala      | 192 ++++++
 .../samza/system/kafka/KafkaSystemConsumer.java | 371 -----------
 .../samza/system/kafka/KafkaSystemFactory.scala |  63 +-
 .../scala/org/apache/samza/util/KafkaUtil.scala |  11 -
 .../samza/config/TestKafkaConsumerConfig.java   |  60 +-
 .../system/kafka/TestKafkaSystemAdminJava.java  | 185 ++++--
 .../kafka/TestKafkaSystemAdminWithMock.java     | 317 +++++++++
 .../system/kafka/TestKafkaSystemConsumer.java   | 225 +++++++
 .../kafka/TestKafkaSystemConsumerMetrics.java   | 109 +++
 .../system/kafka/TestKafkaSystemAdmin.scala     | 109 ++-
 .../system/kafka/TestKafkaSystemConsumer.java   | 220 ------
 .../operator/TestRepartitionJoinWindowApp.java  |  18 +-
 .../samza/test/table/TestRemoteTable.java       |   6 +-
 .../AbstractIntegrationTestHarness.scala        |  60 +-
 26 files changed, 2399 insertions(+), 1653 deletions(-)
----------------------------------------------------------------------