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/927adff0 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/927adff0 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/927adff0 Branch: refs/heads/NewKafkaSystemConsumer Commit: 927adff0b1d65baec79d8b1ca8b8e4cce63be032 Parents: 952dbbe c48bcd2 Author: Boris S <[email protected]> Authored: Thu Sep 20 09:38:51 2018 -0700 Committer: Boris S <[email protected]> Committed: Thu Sep 20 09:38:51 2018 -0700 ---------------------------------------------------------------------- .travis.yml | 4 +- build.gradle | 1 + gradle/dependency-versions.gradle | 1 + .../samza/metadatastore/MetadataStore.java | 6 +- .../samza/config/ClusterManagerConfig.java | 1 - .../apache/samza/container/LocalityManager.java | 2 +- .../grouper/task/GroupByContainerCount.java | 6 +- .../grouper/task/GroupByContainerIds.java | 4 +- .../task/SingleContainerGrouperFactory.java | 2 +- .../grouper/task/TaskAssignmentManager.java | 2 +- .../metadatastore/CoordinatorStreamStore.java | 2 +- .../samza/execution/ExecutionPlanner.java | 178 +++-- .../org/apache/samza/execution/JobGraph.java | 82 +- .../samza/execution/JobGraphJsonGenerator.java | 4 +- .../org/apache/samza/execution/JobNode.java | 5 +- .../apache/samza/job/model/ContainerModel.java | 31 +- .../org/apache/samza/job/model/JobModel.java | 2 - .../apache/samza/processor/StreamProcessor.java | 2 +- .../model/JsonContainerModelMixIn.java | 38 +- .../serializers/model/JsonJobModelMixIn.java | 2 + .../serializers/model/JsonTaskModelMixIn.java | 2 + .../serializers/model/SamzaObjectMapper.java | 41 +- .../apache/samza/storage/StorageRecovery.java | 2 +- .../samza/system/inmemory/InMemoryManager.java | 6 +- .../system/inmemory/InMemorySystemAdmin.java | 4 - .../system/inmemory/InMemorySystemConsumer.java | 4 - .../system/inmemory/InMemorySystemFactory.java | 4 - .../system/inmemory/InMemorySystemProducer.java | 4 - .../org/apache/samza/table/TableManager.java | 34 +- .../table/remote/RemoteReadWriteTable.java | 2 +- .../samza/table/remote/RemoteReadableTable.java | 2 +- .../table/remote/RemoteTableDescriptor.java | 46 +- .../samza/table/remote/RemoteTableProvider.java | 42 +- .../samza/table/remote/TableReadFunction.java | 7 + .../samza/table/remote/TableWriteFunction.java | 7 + .../samza/table/retry/FailsafeAdapter.java | 103 +++ .../table/retry/RetriableReadFunction.java | 102 +++ .../table/retry/RetriableWriteFunction.java | 120 +++ .../apache/samza/table/retry/RetryMetrics.java | 59 ++ .../samza/table/retry/TableRetryPolicy.java | 257 +++++++ .../java/org/apache/samza/zk/ProcessorData.java | 19 +- .../samza/zk/ZkJobCoordinatorFactory.java | 17 +- .../java/org/apache/samza/zk/ZkKeyBuilder.java | 30 +- .../org/apache/samza/zk/ZkMetadataStore.java | 132 ++++ .../apache/samza/zk/ZkMetadataStoreFactory.java | 36 + .../org/apache/samza/config/JobConfig.scala | 1 + .../apache/samza/container/SamzaContainer.scala | 26 +- .../samza/coordinator/JobModelManager.scala | 2 +- .../grouper/task/TestGroupByContainerCount.java | 89 +-- .../grouper/task/TestGroupByContainerIds.java | 37 +- .../samza/container/mock/ContainerMocks.java | 6 +- .../coordinator/JobModelManagerTestUtil.java | 13 +- .../TestCoordinatorStreamStore.java | 2 +- .../samza/execution/TestExecutionPlanner.java | 100 +-- .../apache/samza/execution/TestJobGraph.java | 38 +- .../apache/samza/job/model/TestJobModel.java | 50 ++ .../operators/impl/TestOperatorImplGraph.java | 8 +- .../model/TestSamzaObjectMapper.java | 205 +++-- .../apache/samza/table/TestTableManager.java | 11 +- .../samza/table/remote/TestRemoteTable.java | 116 ++- .../table/remote/TestRemoteTableDescriptor.java | 10 +- .../retry/TestRetriableTableFunctions.java | 316 ++++++++ .../samza/table/retry/TestTableRetryPolicy.java | 82 ++ .../org/apache/samza/zk/TestZkKeyBuilder.java | 2 +- .../apache/samza/zk/TestZkMetadataStore.java | 121 +++ .../samza/container/TestSamzaContainer.scala | 741 ++++--------------- .../samza/container/TestTaskInstance.scala | 526 ++++--------- .../TestTaskInstanceExceptionHandler.scala | 144 ++++ .../samza/coordinator/TestJobCoordinator.scala | 12 +- .../samza/system/chooser/MockSystemAdmin.scala | 30 + .../chooser/TestBootstrappingChooser.scala | 3 +- .../system/chooser/TestDefaultChooser.scala | 1 - .../samza/system/hdfs/HdfsSystemAdmin.java | 12 + .../samza/sql/translator/JoinTranslator.java | 4 +- .../samza/example/PageViewCounterExample.java | 1 - .../samza/test/framework/StreamAssert.java | 73 +- .../apache/samza/test/framework/TestRunner.java | 289 ++++---- .../test/framework/stream/CollectionStream.java | 204 ----- .../system/CollectionStreamSystemSpec.java | 90 --- .../system/InMemoryInputDescriptor.java | 42 ++ .../system/InMemoryOutputDescriptor.java | 46 ++ .../system/InMemorySystemDescriptor.java | 118 +++ .../AsyncStreamTaskIntegrationTest.java | 108 +-- .../StreamApplicationIntegrationTest.java | 45 +- .../framework/StreamTaskIntegrationTest.java | 112 ++- .../processor/TestZkLocalApplicationRunner.java | 6 +- .../table/TestLocalTableWithSideInputs.java | 38 +- .../samza/test/table/TestRemoteTable.java | 27 +- .../table/TestTableDescriptorsProvider.java | 18 +- .../webapp/TestApplicationMasterRestClient.java | 2 +- 90 files changed, 3299 insertions(+), 2085 deletions(-) ----------------------------------------------------------------------
