You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/03/05 04:13:38 UTC

[1/6] incubator-ignite git commit: # IGNITE-70 remove "todo IGNITE-70".

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-187 e5f05c2ed -> 5eba59daa


# IGNITE-70 remove "todo IGNITE-70".


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6cf7b46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6cf7b46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6cf7b46

Branch: refs/heads/ignite-187
Commit: d6cf7b4626c41b744493454b0531c24db93a64ae
Parents: 9b2a034
Author: sevdokimov <se...@gridgain.com>
Authored: Wed Mar 4 19:57:37 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed Mar 4 19:57:37 2015 +0300

----------------------------------------------------------------------
 .../internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java    | 3 +--
 .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java  | 2 +-
 .../external/communication/GridHadoopExternalCommunication.java   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6cf7b46/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
index 865886c..8c2fcb0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
@@ -42,8 +42,7 @@ import java.util.concurrent.atomic.*;
  */
 public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
     /** IPC error message. */
-    public static final String OUT_OF_RESOURCES_MSG = "Failed to allocate shared memory segment"; // todo IGNITE-70 Add
-                                                                                                // link to documentation
+    public static final String OUT_OF_RESOURCES_MSG = "Failed to allocate shared memory segment";
 
     /** Default endpoint port number. */
     public static final int DFLT_IPC_PORT = 10500;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6cf7b46/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 19fe5c5..cadd75c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -147,7 +147,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
     implements CommunicationSpi<Message>, TcpCommunicationSpiMBean {
     /** 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).";
 
     /** Node attribute that is mapped to node IP addresses (value is <tt>comm.tcp.addrs</tt>). */
     public static final String ATTR_ADDRS = "comm.tcp.addrs";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6cf7b46/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 f5ddced..e3457a9 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).";
 
     /** Default port which node sets listener to (value is <tt>47100</tt>). */
     public static final int DFLT_PORT = 27100;


[2/6] incubator-ignite git commit: # sprint-2 Fixed replace in build script.

Posted by ak...@apache.org.
# sprint-2 Fixed replace in build script.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96d91090
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96d91090
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96d91090

Branch: refs/heads/ignite-187
Commit: 96d91090900e556c0d845744e2d5d9d54a2f0f4d
Parents: d6cf7b4
Author: anovikov <an...@gridgain.com>
Authored: Thu Mar 5 08:16:29 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Thu Mar 5 08:16:29 2015 +0700

----------------------------------------------------------------------
 bin/ignitevisorcmd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96d91090/bin/ignitevisorcmd.sh
----------------------------------------------------------------------
diff --git a/bin/ignitevisorcmd.sh b/bin/ignitevisorcmd.sh
index 3242531..12235a0 100755
--- a/bin/ignitevisorcmd.sh
+++ b/bin/ignitevisorcmd.sh
@@ -20,7 +20,7 @@
 # Import common functions.
 #
 if [ "${IGNITE_HOME}" = "" ];
-    then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";IGNITE_HOME_TMP="$(dirname "${IGNITE_HOME_TMP}")" # Will be removed in release.
+    then IGNITE_HOME_TMP="$(dirname "$(cd "$(dirname "$0")"; "pwd")")";
     else IGNITE_HOME_TMP=${IGNITE_HOME};
 fi
 


[3/6] incubator-ignite git commit: # sprint-2 Fixed javadoc.

Posted by ak...@apache.org.
# sprint-2 Fixed javadoc.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/64394eba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/64394eba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/64394eba

Branch: refs/heads/ignite-187
Commit: 64394ebae9db270818cbc71c8af856e3c9cc2e3c
Parents: 96d9109
Author: anovikov <an...@gridgain.com>
Authored: Thu Mar 5 08:36:10 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Thu Mar 5 08:36:10 2015 +0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64394eba/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java b/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java
index 384053d..df1fb3f 100644
--- a/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java
+++ b/modules/visor-plugins/src/main/java/org/apache/ignite/visor/plugin/VisorPlugin.java
@@ -24,7 +24,7 @@ import ro.fortsoft.pf4j.*;
  */
 public abstract class VisorPlugin extends Plugin {
     /** {@inheritDoc} */
-    public VisorPlugin(PluginWrapper wrapper) {
+    protected VisorPlugin(PluginWrapper wrapper) {
         super(wrapper);
     }
 


[5/6] incubator-ignite git commit: Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187

Posted by ak...@apache.org.
Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1837b888
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1837b888
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1837b888

Branch: refs/heads/ignite-187
Commit: 1837b8883d8dd8247a4114c84d0fa92d6fcf65a3
Parents: e5f05c2 162760b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Mar 5 10:01:16 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Mar 5 10:01:16 2015 +0700

----------------------------------------------------------------------
 bin/ignitevisorcmd.sh                                          | 2 +-
 .../internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java | 3 +--
 .../ignite/spi/communication/tcp/TcpCommunicationSpi.java      | 2 +-
 .../org/apache/ignite/testsuites/IgniteCacheTestSuite.java     | 6 ++++--
 .../communication/GridHadoopExternalCommunication.java         | 2 +-
 .../main/java/org/apache/ignite/visor/plugin/VisorPlugin.java  | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------



[6/6] incubator-ignite git commit: # IGNITE-187 Minor javadocs changes.

Posted by ak...@apache.org.
# IGNITE-187 Minor javadocs changes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5eba59da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5eba59da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5eba59da

Branch: refs/heads/ignite-187
Commit: 5eba59daa140662b391db3b6741acf368c2fd66f
Parents: 1837b88
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Mar 5 10:13:24 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Mar 5 10:13:24 2015 +0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java   | 2 +-
 .../java/org/apache/ignite/internal/managers/GridManager.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5eba59da/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 9fd2920..f782e69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2673,7 +2673,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
     }
 
     /**
-     * @param comp Grid component class.
+     * @param comp Grid component.
      * @return {@code true} if node running in daemon mode and component marked by {@code SkipDaemon} annotation.
      */
     private boolean skipDaemon(GridComponent comp) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5eba59da/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java
index 39f9925..a71a6b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java
@@ -33,12 +33,12 @@ public interface GridManager extends GridComponent {
     public boolean enabled();
 
     /**
-     * This method is called before manager will start SPI.
+     * This method executed before manager will start SPI.
      */
     public void onBeforeSpiStart();
 
     /**
-     * This method is called after manager started SPI.
+     * This method executed after manager started SPI.
      */
     public void onAfterSpiStart();
 }


[4/6] incubator-ignite git commit: # Temporarily disabled tests

Posted by ak...@apache.org.
# Temporarily disabled tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/162760b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/162760b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/162760b6

Branch: refs/heads/ignite-187
Commit: 162760b65b18ba09e50c428d73cc130ee5c770db
Parents: 64394eb
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Wed Mar 4 18:34:20 2015 -0800
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Wed Mar 4 18:34:20 2015 -0800

----------------------------------------------------------------------
 .../org/apache/ignite/testsuites/IgniteCacheTestSuite.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/162760b6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index 24c8e04..1b85f4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -359,8 +359,10 @@ public class IgniteCacheTestSuite extends TestSuite {
         suite.addTestSuite(IgniteCacheTxLoadAllTest.class);
         suite.addTestSuite(IgniteCacheTxLocalLoadAllTest.class);
 
-        suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class);
-        suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class);
+        // TODO: IGNITE-402
+//        suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class);
+//        suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class);
+
         suite.addTestSuite(IgniteCacheAtomicStoreSessionTest.class);
         suite.addTestSuite(IgniteCacheTxStoreSessionTest.class);