You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/02 10:50:03 UTC
[18/50] [abbrv] incubator-ignite git commit: # IGNITE-350: Applied
patch from Ivan V..
# IGNITE-350: Applied patch from Ivan V..
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55c093d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55c093d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55c093d4
Branch: refs/heads/ignite-342
Commit: 55c093d409be131637ab295ac2ec8939f7b1a1a3
Parents: 23bee41
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 27 13:49:28 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 27 13:49:28 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/igfs/IgfsMode.java | 6 +++---
.../client/hadoop/GridHadoopClientProtocol.java | 6 +++---
.../ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java | 2 +-
.../ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java | 2 +-
.../ignite/internal/igfs/hadoop/IgfsHadoopUtils.java | 4 ++--
.../processors/hadoop/GridHadoopClassLoader.java | 2 +-
.../internal/processors/hadoop/GridHadoopUtils.java | 4 ++--
.../collections/GridHadoopHashMultimapBase.java | 2 +-
.../GridHadoopExternalCommunication.java | 14 +++++++++++++-
.../processors/hadoop/v1/GridHadoopV1MapTask.java | 6 +++++-
.../hadoop/v2/GridHadoopV2JobResourceManager.java | 2 +-
.../processors/hadoop/GridHadoopGroupingTest.java | 4 ++--
.../loadtests/igfs/IgfsPerformanceBenchmark.java | 9 ++++++++-
13 files changed, 43 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
index 5c5aa57..3c440ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java
@@ -39,7 +39,7 @@ public enum IgfsMode {
* through to secondary Hadoop file system. If this mode is enabled, then
* secondary Hadoop file system must be configured.
*
- * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+ * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
*/
PROXY,
@@ -50,7 +50,7 @@ public enum IgfsMode {
* If secondary Hadoop file system is not configured, then this mode behaves like
* {@link #PRIMARY} mode.
*
- * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+ * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
*/
DUAL_SYNC,
@@ -61,7 +61,7 @@ public enum IgfsMode {
* If secondary Hadoop file system is not configured, then this mode behaves like
* {@link #PRIMARY} mode.
*
- * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryHadoopFileSystemUri()
+ * @see org.apache.ignite.configuration.IgfsConfiguration#getSecondaryFileSystem()
*/
DUAL_ASYNC;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
index b058961..1a70593 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@ -57,7 +57,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
/** Configuration. */
private final Configuration conf;
- /** GG client. */
+ /** Ignite client. */
private volatile GridClient cli;
/** Last received version. */
@@ -70,7 +70,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
* Constructor.
*
* @param conf Configuration.
- * @param cli GG client.
+ * @param cli Ignite client.
*/
GridHadoopClientProtocol(Configuration conf, GridClient cli) {
assert cli != null;
@@ -311,7 +311,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
/**
* Process received status update.
*
- * @param status GG status.
+ * @param status Hadoop map-reduce job status.
* @return Hadoop status.
*/
private JobStatus processStatus(GridHadoopJobStatus status) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
index 2f8b013..1648bdc 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java
@@ -228,7 +228,7 @@ public class IgfsHadoopFileSystem extends FileSystem {
if (seqReadsBeforePrefetch > 0)
seqReadsBeforePrefetchOverride = true;
- // In GG replication factor is controlled by data cache affinity.
+ // In Ignite replication factor is controlled by data cache affinity.
// We use replication factor to force the whole file to be stored on local node.
dfltReplication = (short)cfg.getInt("dfs.replication", 3);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
index ff8c50c..5475cf4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java
@@ -224,7 +224,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl
if (seqReadsBeforePrefetch > 0)
seqReadsBeforePrefetchOverride = true;
- // In GG replication factor is controlled by data cache affinity.
+ // In Ignite replication factor is controlled by data cache affinity.
// We use replication factor to force the whole file to be stored on local node.
dfltReplication = (short)cfg.getInt("dfs.replication", 3);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
index f8bf1ae..bd96e60 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java
@@ -87,7 +87,7 @@ public class IgfsHadoopUtils {
}
/**
- * Cast GG exception to appropriate IO exception.
+ * Cast Ignite exception to appropriate IO exception.
*
* @param e Exception to cast.
* @return Casted exception.
@@ -97,7 +97,7 @@ public class IgfsHadoopUtils {
}
/**
- * Cast GG exception to appropriate IO exception.
+ * Cast Ignite exception to appropriate IO exception.
*
* @param e Exception to cast.
* @param path Path for exceptions.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
index 11f8358..4a81bba 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
@@ -100,7 +100,7 @@ public class GridHadoopClassLoader extends URLClassLoader {
return loadClassExplicitly(name, resolve);
}
- if (isIgfsOrGgHadoop(name)) { // For GG Hadoop and IGFS classes we have to check if they depend on Hadoop.
+ if (isIgfsOrGgHadoop(name)) { // For Ignite Hadoop and IGFS classes we have to check if they depend on Hadoop.
Boolean hasDeps = cache.get(name);
if (hasDeps == null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
index b94b561..763f45a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
@@ -98,9 +98,9 @@ public class GridHadoopUtils {
}
/**
- * Convert GG job status to Hadoop job status.
+ * Convert Ignite job status to Hadoop job status.
*
- * @param status GG job status.
+ * @param status Ignite job status.
* @return Hadoop job status.
*/
public static JobStatus status(GridHadoopJobStatus status, Configuration conf) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
index f7e1362..92854f1 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/collections/GridHadoopHashMultimapBase.java
@@ -160,8 +160,8 @@ public abstract class GridHadoopHashMultimapBase extends GridHadoopMultimapBase
private final Reader valReader;
/**
- * @throws IgniteCheckedException If failed.
* @param taskCtx Task context.
+ * @throws IgniteCheckedException If failed.
*/
public Input(GridHadoopTaskContext taskCtx) throws IgniteCheckedException {
cap = capacity();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
index 6726bab..f5ddced 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java
@@ -45,7 +45,7 @@ import java.util.concurrent.*;
public class GridHadoopExternalCommunication {
/** IPC error message. */
public static final String OUT_OF_RESOURCES_TCP_MSG = "Failed to allocate shared memory segment " +
- "(switching to TCP, may be slower)."; // todo IGNITE-70 Add link to documentation
+ "(switching to TCP, may be slower)."; // TODO IGNITE-70 Add link to documentation
/** Default port which node sets listener to (value is <tt>47100</tt>). */
public static final int DFLT_PORT = 27100;
@@ -687,6 +687,11 @@ public class GridHadoopExternalCommunication {
locPort + ", portRange=" + locPortRange + ", locHost=" + locHost + ']', lastEx);
}
+ /**
+ * Stops the server.
+ *
+ * @throws IgniteCheckedException
+ */
public void stop() throws IgniteCheckedException {
// Stop TCP server.
if (nioSrvr != null)
@@ -710,6 +715,13 @@ public class GridHadoopExternalCommunication {
boundTcpPort = -1;
}
+ /**
+ * Sends message to Hadoop process.
+ *
+ * @param desc
+ * @param msg
+ * @throws IgniteCheckedException
+ */
public void sendMessage(GridHadoopProcessDescriptor desc, GridHadoopMessage msg) throws
IgniteCheckedException {
assert desc != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
index 16c2b8c..878b61b 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/GridHadoopV1MapTask.java
@@ -31,7 +31,11 @@ public class GridHadoopV1MapTask extends GridHadoopV1Task {
/** */
private static final String[] EMPTY_HOSTS = new String[0];
- /** {@inheritDoc} */
+ /**
+ * Constructor.
+ *
+ * @param taskInfo
+ */
public GridHadoopV1MapTask(GridHadoopTaskInfo taskInfo) {
super(taskInfo);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
index b288089..be619c7 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
@@ -73,8 +73,8 @@ public class GridHadoopV2JobResourceManager {
/**
* Set working directory in local file system.
*
- * @throws IOException If fails.
* @param dir Working directory.
+ * @throws IOException If fails.
*/
private void setLocalFSWorkingDirectory(File dir) throws IOException {
JobConf cfg = ctx.getJobConf();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
index 7f56995..49099fc 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopGroupingTest.java
@@ -144,12 +144,12 @@ public class GridHadoopGroupingTest extends GridHadoopAbstractSelfTest {
}
public static class YearComparator implements RawComparator<YearTemperature> { // Grouping comparator.
- /** {@inheritDoc */
+ /** {@inheritDoc} */
@Override public int compare(YearTemperature o1, YearTemperature o2) {
return Integer.compare(o1.year, o2.year);
}
- /** {@inheritDoc */
+ /** {@inheritDoc} */
@Override public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
throw new IllegalStateException();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c093d4/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
index 7b54561..00dc4f5 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java
@@ -202,7 +202,14 @@ public class IgfsPerformanceBenchmark {
return args[idx];
}
- /** {@inheritDoc} */
+ /**
+ * Get IGFS FileSystem.
+ *
+ * @param home Home path.
+ * @param cfgPath Config path.
+ * @return FileSystem.
+ * @throws IOException If failed.
+ */
private static FileSystem igfs(Path home, String cfgPath) throws IOException {
Configuration cfg = new Configuration();