You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2017/01/25 11:39:28 UTC
[6/6] ignite git commit: Merge branch 'master' into ignite-2.0
Merge branch 'master' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/490e9a13
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/490e9a13
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/490e9a13
Branch: refs/heads/ignite-2.0
Commit: 490e9a138d5ed0da505f4de7f57bb0e14c540fea
Parents: e219bad 885dc32
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Wed Jan 25 14:38:57 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Wed Jan 25 14:38:57 2017 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 3 +
assembly/dependencies-fabric-lgpl.xml | 1 +
assembly/dependencies-fabric.xml | 1 +
.../ignite/platform/PlatformExceptionTask.java | 78 +++++++
.../io/BytesWritablePartiallyRawComparator.java | 51 +++++
.../hadoop/io/TextPartiallyRawComparator.java | 68 +-----
.../processors/hadoop/impl/HadoopUtils.java | 66 ++++++
.../hadoop/impl/v2/HadoopV2TaskContext.java | 13 +-
.../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 38 ++++
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 6 +-
modules/web-console/backend/app/agent.js | 12 +-
.../web-agent/bin/ignite-web-agent.bat | 4 +-
.../web-agent/bin/ignite-web-agent.sh | 2 +
.../ignite/console/agent/AgentLauncher.java | 90 +++++++-
modules/yardstick/DEVNOTES.txt | 16 ++
modules/yardstick/README.txt | 10 +-
modules/yardstick/pom-standalone.xml | 209 +++++++++++++++++++
modules/yardstick/pom.xml | 10 +-
pom.xml | 95 ++++++++-
19 files changed, 685 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/490e9a13/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
----------------------------------------------------------------------
diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
index a9c0bb7,b8d4cac..6127822
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
@@@ -44,11 -46,10 +46,10 @@@ import org.apache.ignite.hadoop.io.Part
import org.apache.ignite.hadoop.io.TextPartiallyRawComparator;
import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils;
import org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit;
-import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit;
-import org.apache.ignite.internal.processors.hadoop.HadoopJob;
+import org.apache.ignite.hadoop.HadoopInputSplit;
+import org.apache.ignite.internal.processors.hadoop.HadoopJobEx;
import org.apache.ignite.internal.processors.hadoop.HadoopJobId;
import org.apache.ignite.internal.processors.hadoop.HadoopJobProperty;
- import org.apache.ignite.internal.processors.hadoop.HadoopMapperAwareTaskOutput;
import org.apache.ignite.internal.processors.hadoop.HadoopPartitioner;
import org.apache.ignite.internal.processors.hadoop.HadoopSerialization;
import org.apache.ignite.internal.processors.hadoop.HadoopSplitWrapper;