You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by jm...@apache.org on 2017/03/07 00:18:58 UTC
[9/9] samza git commit: Merge master
Merge master
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/72fc185a
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/72fc185a
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/72fc185a
Branch: refs/heads/samza-fluent-api-v1
Commit: 72fc185a052815ae604ec9d50aa47dc6b2d94d92
Parents: a83c69a e6c1eed
Author: Jacob Maes <jm...@linkedin.com>
Authored: Mon Mar 6 15:40:28 2017 -0800
Committer: Jacob Maes <jm...@linkedin.com>
Committed: Mon Mar 6 16:18:13 2017 -0800
----------------------------------------------------------------------
docs/learn/documentation/versioned/index.html | 2 +-
.../versioned/jobs/configuration-table.html | 225 ++++++++++++++-----
.../documentation/versioned/jobs/logging.md | 5 +
.../versioned/yarn/yarn-security.md | 2 +-
.../samza/system/ExecutionEnvironment.java | 29 ++-
.../org/apache/samza/system/StreamProvider.java | 78 -------
.../org/apache/samza/system/StreamSpec.java | 2 +-
.../processor/SamzaContainerController.java | 1 +
.../apache/samza/processor/StreamProcessor.java | 10 +-
.../system/AbstractExecutionEnvironment.java | 52 +++--
.../samza/zk/BarrierForVersionUpgrade.java | 46 ++++
.../samza/zk/ScheduleAfterDebounceTime.java | 8 +-
.../samza/zk/ZkBarrierForVersionUpgrade.java | 166 ++++++++++++++
.../java/org/apache/samza/zk/ZkController.java | 32 +++
.../org/apache/samza/zk/ZkControllerImpl.java | 163 ++++++++++++++
.../apache/samza/zk/ZkControllerListener.java | 34 +++
.../java/org/apache/samza/zk/ZkKeyBuilder.java | 24 +-
.../org/apache/samza/zk/ZkLeaderElector.java | 36 ++-
.../main/java/org/apache/samza/zk/ZkUtils.java | 129 ++++++++++-
.../org/apache/samza/config/JobConfig.scala | 8 -
.../org/apache/samza/config/StreamConfig.scala | 136 +++++++----
.../apache/samza/task/ReadableCoordinator.scala | 1 +
.../samza/example/TestBasicStreamGraphs.java | 7 +-
.../samza/example/TestBroadcastExample.java | 9 +-
.../apache/samza/example/TestJoinExample.java | 2 +-
.../apache/samza/example/TestWindowExample.java | 2 +-
.../TestAbstractExecutionEnvironment.java | 60 ++---
.../zk/TestZkBarrierForVersionUpgrade.java | 148 ++++++++++++
.../org/apache/samza/zk/TestZkKeyBuilder.java | 16 +-
.../apache/samza/zk/TestZkLeaderElector.java | 163 +++++++++++---
.../java/org/apache/samza/zk/TestZkUtils.java | 143 ++++++++++--
.../apache/samza/config/Log4jSystemConfig.java | 12 +-
32 files changed, 1430 insertions(+), 321 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/72fc185a/samza-core/src/main/scala/org/apache/samza/config/JobConfig.scala
----------------------------------------------------------------------
diff --cc samza-core/src/main/scala/org/apache/samza/config/JobConfig.scala
index fbfe90f,9d6cbc2..5f22409
--- a/samza-core/src/main/scala/org/apache/samza/config/JobConfig.scala
+++ b/samza-core/src/main/scala/org/apache/samza/config/JobConfig.scala
@@@ -43,9 -43,7 +43,8 @@@ object JobConfig
val SAMZA_FWK_PATH = "samza.fwk.path"
val SAMZA_FWK_VERSION = "samza.fwk.version"
val JOB_COORDINATOR_SYSTEM = "job.coordinator.system"
- val JOB_METADATA_DEFAULT_SYSTEM = "job.metadata.system"
val JOB_DEFAULT_SYSTEM = "job.default.system"
+ val JOB_DEFAULT_PARTITIONS = "job.default.partitions"
val JOB_CONTAINER_COUNT = "job.container.count"
val jOB_CONTAINER_THREAD_POOL_SIZE = "job.container.thread.pool.size"
val JOB_CONTAINER_SINGLE_THREAD_MODE = "job.container.single.thread.mode"
http://git-wip-us.apache.org/repos/asf/samza/blob/72fc185a/samza-core/src/test/java/org/apache/samza/example/TestBasicStreamGraphs.java
----------------------------------------------------------------------
diff --cc samza-core/src/test/java/org/apache/samza/example/TestBasicStreamGraphs.java
index 8ecd44f,8ecd44f..f817379
--- a/samza-core/src/test/java/org/apache/samza/example/TestBasicStreamGraphs.java
+++ b/samza-core/src/test/java/org/apache/samza/example/TestBasicStreamGraphs.java
@@@ -21,6 -21,6 +21,7 @@@ package org.apache.samza.example
import java.lang.reflect.Field;
import org.apache.samza.Partition;
import org.apache.samza.config.Config;
++import org.apache.samza.config.MapConfig;
import org.apache.samza.operators.impl.OperatorGraph;
import org.apache.samza.system.SystemStreamPartition;
import org.apache.samza.task.StreamOperatorTask;
@@@ -47,7 -47,7 +48,7 @@@ public class TestBasicStreamGraphs
@Test
public void testUserTask() throws Exception {
-- Config mockConfig = mock(Config.class);
++ Config mockConfig = spy(new MapConfig());
TaskContext mockContext = mock(TaskContext.class);
when(mockContext.getSystemStreamPartitions()).thenReturn(this.inputPartitions);
TestWindowExample userTask = new TestWindowExample(this.inputPartitions);
@@@ -64,7 -64,7 +65,7 @@@
@Test
public void testSplitTask() throws Exception {
-- Config mockConfig = mock(Config.class);
++ Config mockConfig = spy(new MapConfig());
TaskContext mockContext = mock(TaskContext.class);
when(mockContext.getSystemStreamPartitions()).thenReturn(this.inputPartitions);
TestBroadcastExample splitTask = new TestBroadcastExample(this.inputPartitions);
@@@ -81,7 -81,7 +82,7 @@@
@Test
public void testJoinTask() throws Exception {
-- Config mockConfig = mock(Config.class);
++ Config mockConfig = spy(new MapConfig());
TaskContext mockContext = mock(TaskContext.class);
when(mockContext.getSystemStreamPartitions()).thenReturn(this.inputPartitions);
TestJoinExample joinTask = new TestJoinExample(this.inputPartitions);
http://git-wip-us.apache.org/repos/asf/samza/blob/72fc185a/samza-core/src/test/java/org/apache/samza/zk/TestZkLeaderElector.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/72fc185a/samza-core/src/test/java/org/apache/samza/zk/TestZkUtils.java
----------------------------------------------------------------------