ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [1/2] ignite git commit: WIP.
Date Thu, 08 Sep 2016 07:46:50 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2649 9c7746d33 -> c3d4f03f1


WIP.


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

Branch: refs/heads/ignite-2649
Commit: eed52beb82d05d1e7d6f06a5f46f90d44656b3fb
Parents: 9c7746d
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Sep 8 10:31:32 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Sep 8 10:31:32 2016 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/GridKernalContextImpl.java     | 1 +
 .../src/main/java/org/apache/ignite/internal/GridLoggerProxy.java  | 1 +
 .../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java  | 2 +-
 .../org/apache/ignite/internal/cluster/ClusterGroupAdapter.java    | 1 +
 .../apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java    | 2 ++
 .../apache/ignite/internal/processors/cache/GridCacheAdapter.java  | 1 +
 .../apache/ignite/internal/processors/cache/GridCacheContext.java  | 1 +
 .../test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java | 2 +-
 .../internal/processors/continuous/GridMessageListenSelfTest.java  | 2 --
 9 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 9a3fda2..90edc77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -875,6 +875,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
      */
     protected Object readResolve() throws ObjectStreamException {
         try {
+//            return IgnitionEx.gridx(stash.get()).context();
             return IgnitionEx.localIgnite().context();
         }
         catch (IllegalStateException e) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
index b1da577..df7ca0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
@@ -206,6 +206,7 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware,
Externaliz
             String gridNameR = t.get1();
             Object ctgrR = t.get2();
 
+//            IgniteLogger log = IgnitionEx.gridx(gridNameR).log();
             IgniteLogger log = IgnitionEx.localIgnite().log();
 
             return ctgrR != null ? log.getLogger(ctgrR) : log;

http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 6791afc..666d01a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1303,7 +1303,7 @@ public class IgnitionEx {
      * @param name Grid name.
      * @return Grid instance.
      */
-    private static IgniteKernal gridx(@Nullable String name) {
+    public static IgniteKernal gridx(@Nullable String name) {
         IgniteNamedInstance grid = name != null ? grids.get(name) : dfltGrid;
 
         IgniteKernal res;

http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index 648c86d..7ad8e8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -727,6 +727,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable
{
      */
     protected Object readResolve() throws ObjectStreamException {
         try {
+//            IgniteKernal g = IgnitionEx.gridx(gridName);
             IgniteKernal g = IgnitionEx.localIgnite();
 
             return ids != null ? new ClusterGroupAdapter(g.context(), subjId, ids) :

http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
index 26a9013..e2307aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
@@ -26,6 +26,7 @@ import java.io.ObjectStreamException;
 import java.util.concurrent.ConcurrentMap;
 import org.apache.ignite.IgniteCluster;
 import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.IgnitionEx;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -89,6 +90,7 @@ public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K,
V> impl
      */
     protected Object readResolve() throws ObjectStreamException {
         try {
+//            return IgnitionEx.gridx(stash.get()).cluster().nodeLocalMap();
             return IgnitionEx.localIgnite().cluster().nodeLocalMap();
         }
         catch (IllegalStateException e) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 84d3fdf..885f8c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4770,6 +4770,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
         try {
             IgniteBiTuple<String, String> t = stash.get();
 
+//            return IgnitionEx.gridx(t.get1()).cachex(t.get2());
             return IgnitionEx.localIgnite().cachex(t.get2());
         }
         catch (IllegalStateException e) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 91ace02..eb803ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -2045,6 +2045,7 @@ public class GridCacheContext<K, V> implements Externalizable
{
         try {
             IgniteBiTuple<String, String> t = stash.get();
 
+//            IgniteKernal grid = IgnitionEx.gridx(t.get1());
             IgniteKernal grid = IgnitionEx.localIgnite();
 
             GridCacheAdapter<K, V> cache = grid.internalCache(t.get2());

http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
index 18eb3b7..9c74bd8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
@@ -211,7 +211,7 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
      * @throws Exception If failed.
      */
     public void testAgeClusterGroupSerialization() throws Exception {
-        Marshaller marshaller = getConfiguration().getMarshaller();
+        Marshaller marshaller = ignite.configuration().getMarshaller();
 
         ClusterGroup grp = ignite.cluster().forYoungest();
         ClusterNode node = grp.node();

http://git-wip-us.apache.org/repos/asf/ignite/blob/eed52beb/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
index ea18f69..1132c3c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridMessageListenSelfTest.java
@@ -454,7 +454,6 @@ public class GridMessageListenSelfTest extends GridCommonAbstractTest
{
 
             X.println("Received message [nodeId=" + nodeId + ", locNodeId=" + ignite.cluster().localNode().id()
+ ']');
 
-            assertEquals(prj.ignite().cluster().localNode().id(), nodeId);
             assertEquals(MSG, msg);
 
             nodes.add(ignite.configuration().getNodeId());
@@ -485,7 +484,6 @@ public class GridMessageListenSelfTest extends GridCommonAbstractTest
{
 
             X.println("Received message [nodeId=" + nodeId + ", locNodeId=" + locNodeId +
']');
 
-            assertEquals(prj.ignite().cluster().localNode().id(), nodeId);
             assertEquals(MSG, msg);
 
             nodes.add(locNodeId);


Mime
View raw message