Repository: samza Updated Branches: refs/heads/master 1676eabc2 -> 628f0d08b
Resolve unit test compilation issue due to conflicting commits at the same time Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/628f0d08 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/628f0d08 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/628f0d08 Branch: refs/heads/master Commit: 628f0d08b9896d518b599c6d69cc62ae562369d8 Parents: 1676eab Author: Xinyu Liu <[email protected]> Authored: Thu Mar 16 15:18:37 2017 -0700 Committer: Xinyu Liu <[email protected]> Committed: Thu Mar 16 15:18:37 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/samza/execution/TestExecutionPlanner.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/628f0d08/samza-core/src/test/java/org/apache/samza/execution/TestExecutionPlanner.java ---------------------------------------------------------------------- diff --git a/samza-core/src/test/java/org/apache/samza/execution/TestExecutionPlanner.java b/samza-core/src/test/java/org/apache/samza/execution/TestExecutionPlanner.java index ee73195..46250d7 100644 --- a/samza-core/src/test/java/org/apache/samza/execution/TestExecutionPlanner.java +++ b/samza-core/src/test/java/org/apache/samza/execution/TestExecutionPlanner.java @@ -19,6 +19,7 @@ package org.apache.samza.execution; +import java.time.Duration; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -162,8 +163,8 @@ public class TestExecutionPlanner { MessageStream m2 = streamGraph.createInStream(input2, null, null).partitionBy(m -> "haha").filter(m -> true); MessageStream m3 = streamGraph.createInStream(input3, null, null).filter(m -> true).partitionBy(m -> "hehe").map(m -> m); - m1.join(m2, createJoin()).sendTo(streamGraph.createOutStream(output1, null, null)); - m3.join(m2, createJoin()).sendTo(streamGraph.createOutStream(output2, null, null)); + m1.join(m2, createJoin(), Duration.ofHours(1)).sendTo(streamGraph.createOutStream(output1, null, null)); + m3.join(m2, createJoin(), Duration.ofHours(1)).sendTo(streamGraph.createOutStream(output2, null, null)); return streamGraph; }
