This is an automated email from the ASF dual-hosted git repository.
wylee pushed a commit to branch tea9
in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git
commit 75af1934e90fa3ef474a3f1de24f2988e8f6bff5
Merge: 88d595e 1124353
Author: WooYeon <wylee.x...@gmail.com>
AuthorDate: Thu Jan 16 18:49:46 2020 +0900
Merge branch 'master' of github.com:apache/incubator-nemo into tea9
.../java/org/apache/nemo/client/JobLauncher.java | 29 +-------
.../src/main/java/org/apache/nemo/common/Pair.java | 1 +
.../src/main/java/org/apache/nemo/common/Util.java | 24 +++----
.../nemo/common/coder/BytesDecoderFactory.java | 2 +-
.../main/java/org/apache/nemo/common/dag/DAG.java | 2 +-
.../org/apache/nemo/common/dag/DAGInterface.java | 4 +-
.../main/java/org/apache/nemo/common/ir/IRDAG.java | 3 +-
.../java/org/apache/nemo/common/ir/Readable.java | 6 +-
.../apache/nemo/common/ir/vertex/LoopVertex.java | 6 +-
.../java/org/apache/nemo/common/pass/Pass.java | 3 +-
.../test/java/org/apache/nemo/common/DAGTest.java | 78 +++++++++++-----------
.../frontend/beam/InMemorySideInputReader.java | 6 +-
.../compiler/frontend/beam/PipelineTranslator.java | 6 +-
.../frontend/beam/coder/BeamDecoderFactory.java | 2 +-
.../beam/transform/PushBackDoFnTransform.java | 2 +-
.../frontend/spark/core/SparkFrontendUtils.java | 1 +
.../source/SparkDatasetBoundedSourceVertex.java | 1 +
.../compiler/frontend/spark/sql/SparkSession.java | 4 +-
.../frontend/spark/transform/CollectTransform.java | 3 +-
.../spark/transform/HDFSTextFileTransform.java | 4 +-
.../compiletime/reshaping/LoopOptimizations.java | 4 +-
.../reshaping/SamplingSkewReshapingPass.java | 4 +-
.../compiletime/reshaping/SkewReshapingPass.java | 7 +-
.../optimizer/pass/runtime/SkewRunTimePass.java | 2 +-
.../java/org/apache/nemo/conf/DataPlaneConf.java | 4 --
.../main/java/org/apache/nemo/conf/JobConf.java | 36 +++++-----
.../nemo/examples/beam/AlternatingLeastSquare.java | 4 +-
.../beam/AlternatingLeastSquareInefficient.java | 5 +-
pom.xml | 2 +-
.../nemo/runtime/common/metric/TaskMetric.java | 2 +-
.../java/org/apache/nemo/driver/NemoContext.java | 2 +-
.../nemo/runtime/executor/MetricManagerWorker.java | 3 +-
.../nemo/runtime/executor/TaskStateManager.java | 6 +-
.../executor/bytetransfer/ByteTransport.java | 4 +-
.../runtime/executor/data/BlockManagerWorker.java | 2 +-
.../runtime/executor/data/MemoryPoolAssigner.java | 5 +-
.../executor/data/block/SerializedMemoryBlock.java | 14 ++--
.../executor/data/stores/LocalFileStore.java | 4 +-
.../task/MultiThreadParentTaskDataFetcher.java | 6 +-
.../executor/task/SourceVertexDataFetcher.java | 6 +-
.../nemo/runtime/executor/data/BlockStoreTest.java | 13 ++--
.../nemo/runtime/executor/data/BlockTest.java | 2 +-
.../data/DirectByteBufferOutputStreamTest.java | 2 +-
.../executor/data/MemoryPoolAssignerTest.java | 2 +-
.../executor/datatransfer/DataTransferTest.java | 3 +-
.../apache/nemo/runtime/master/RuntimeMaster.java | 25 +++++--
.../runtime/master/resource/ContainerManager.java | 29 ++++++--
.../master/resource/ResourceSpecification.java | 18 +++--
.../runtime/common/plan/TestPlanGenerator.java | 2 +-
49 files changed, 209 insertions(+), 196 deletions(-)
diff --cc
examples/beam/src/main/java/org/apache/nemo/examples/beam/AlternatingLeastSquareInefficient.java
index c5f901e,3aa95c4..1b7092b
---
a/examples/beam/src/main/java/org/apache/nemo/examples/beam/AlternatingLeastSquareInefficient.java
+++
b/examples/beam/src/main/java/org/apache/nemo/examples/beam/AlternatingLeastSquareInefficient.java
@@@ -102,9 -102,8 +102,8 @@@ public final class AlternatingLeastSqua
* Main function for the ALS BEAM program.
*
* @param args arguments.
- * @throws ClassNotFoundException exception.
*/
- public static void main(final String[] args) {
+ public static void main(final String[] args){
final Long start = System.currentTimeMillis();
LOG.info(Arrays.toString(args));
final String inputFilePath = args[0];
