Merge master
Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/03bacdc6 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/03bacdc6 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/03bacdc6 Branch: refs/heads/samza-fluent-api-v1 Commit: 03bacdc60e938179d59c2787a18eb144c5327909 Parents: 674e523 b5ea877 Author: Jacob Maes <jm...@linkedin.com> Authored: Thu Feb 23 11:26:23 2017 -0800 Committer: Jacob Maes <jm...@linkedin.com> Committed: Thu Feb 23 11:26:23 2017 -0800 ---------------------------------------------------------------------- docs/_config.yml | 2 +- docs/_layouts/default.html | 1 + docs/archive/index.html | 8 + docs/contribute/contributors-corner.md | 2 +- .../versioned/jobs/split-deployment.md | 4 +- .../versioned/deploy-samza-job-from-hdfs.md | 2 +- .../tutorials/versioned/deploy-samza-to-CDH.md | 4 +- .../versioned/remote-debugging-samza.md | 2 +- .../versioned/run-in-multi-node-yarn.md | 16 +- .../versioned/samza-rest-getting-started.md | 4 +- docs/startup/download/index.md | 39 ++-- docs/startup/hello-samza/versioned/index.md | 2 +- gradle.properties | 2 +- .../grouper/task/GroupByContainerIds.java | 97 +++++++++ .../task/GroupByContainerIdsFactory.java | 34 +++ .../container/grouper/task/TaskNameGrouper.java | 5 + .../standalone/StandaloneJobCoordinator.java | 2 +- .../system/RemoteExecutionEnvironment.java | 3 +- .../samza/coordinator/JobModelManager.scala | 18 +- .../grouper/task/TestGroupByContainerIds.java | 207 +++++++++++++++++++ samza-test/src/main/python/configs/tests.json | 2 +- 21 files changed, 412 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/03bacdc6/samza-core/src/main/java/org/apache/samza/system/RemoteExecutionEnvironment.java ---------------------------------------------------------------------- diff --cc samza-core/src/main/java/org/apache/samza/system/RemoteExecutionEnvironment.java index 851c7f3,fafa2cb..ce129aa --- a/samza-core/src/main/java/org/apache/samza/system/RemoteExecutionEnvironment.java +++ b/samza-core/src/main/java/org/apache/samza/system/RemoteExecutionEnvironment.java @@@ -33,12 -24,7 +33,13 @@@ import org.slf4j.LoggerFactory /** * This class implements the {@link ExecutionEnvironment} that runs the applications in YARN environment */ -public class RemoteExecutionEnvironment implements ExecutionEnvironment { +public class RemoteExecutionEnvironment extends AbstractExecutionEnvironment { ++ ++ private static final Logger log = LoggerFactory.getLogger(RemoteExecutionEnvironment.class); + + public RemoteExecutionEnvironment(Config config) { + super(config); + } - private static final Logger log = LoggerFactory.getLogger(RemoteExecutionEnvironment.class); @Override public void run(StreamGraphBuilder app, Config config) { // TODO: add description of ProcessContext that is going to create a sub-DAG of the {@code graph}
