You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/05/06 13:43:36 UTC
[3/3] incubator-ignite git commit: # IGNITE-831 Remove
RingEndAwareCustomMessage.
# IGNITE-831 Remove RingEndAwareCustomMessage.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/657afd09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/657afd09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/657afd09
Branch: refs/heads/ignite-836_2
Commit: 657afd09024978d1c50eb1b0a5db19298f0e1edc
Parents: 880b59b
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 6 13:28:59 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 6 14:43:16 2015 +0300
----------------------------------------------------------------------
.../discovery/DiscoveryCustomMessage.java | 7 +++++
.../discovery/RingEndAwareCustomMessage.java | 31 --------------------
.../cache/DynamicCacheChangeBatch.java | 6 ++++
.../StartRoutineAckDiscoveryMessage.java | 6 ++++
.../StartRoutineDiscoveryMessage.java | 4 +--
.../StopRoutineAckDiscoveryMessage.java | 6 ++++
.../continuous/StopRoutineDiscoveryMessage.java | 4 +--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++----
8 files changed, 32 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/657afd09/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
index dcb0cea..49a791e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
@@ -17,6 +17,8 @@
package org.apache.ignite.internal.managers.discovery;
+import org.jetbrains.annotations.*;
+
import java.io.*;
/**
@@ -29,4 +31,9 @@ public interface DiscoveryCustomMessage extends Serializable {
* @return {@code true} if minor topology version should be increased.
*/
public boolean forwardMinorVersion();
+
+ /**
+ * Called when message passed the ring.
+ */
+ @Nullable public DiscoveryCustomMessage newMessageOnRingEnd();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/657afd09/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/RingEndAwareCustomMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/RingEndAwareCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/RingEndAwareCustomMessage.java
deleted file mode 100644
index 41cee8e..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/RingEndAwareCustomMessage.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.managers.discovery;
-
-import org.apache.ignite.spi.*;
-import org.jetbrains.annotations.*;
-
-/**
- *
- */
-public interface RingEndAwareCustomMessage extends DiscoveryCustomMessage {
- /**
- *
- */
- @Nullable public DiscoveryCustomMessage newMessageOnRingEnd(IgniteSpiContext ctx);
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/657afd09/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
index 0257307..330f822 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.internal.managers.discovery.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
import java.util.*;
@@ -77,4 +78,9 @@ public class DynamicCacheChangeBatch implements DiscoveryCustomMessage {
@Override public boolean forwardMinorVersion() {
return true;
}
+
+ /** {@inheritDoc} */
+ @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd() {
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/657afd09/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
index 4e5bb9c..2050811 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.continuous;
import org.apache.ignite.*;
import org.apache.ignite.internal.managers.discovery.*;
+import org.jetbrains.annotations.*;
import java.util.*;
@@ -46,6 +47,11 @@ public class StartRoutineAckDiscoveryMessage implements DiscoveryCustomMessage {
return false;
}
+ /** {@inheritDoc} */
+ @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd() {
+ return null;
+ }
+
/**
* @return Routine ID.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/657afd09/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
index 492a1e7..1866901 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
@@ -27,7 +27,7 @@ import java.util.*;
/**
*
*/
-public class StartRoutineDiscoveryMessage implements RingEndAwareCustomMessage {
+public class StartRoutineDiscoveryMessage implements DiscoveryCustomMessage {
/** Routine ID. */
private final UUID routineId;
@@ -81,7 +81,7 @@ public class StartRoutineDiscoveryMessage implements RingEndAwareCustomMessage {
}
/** {@inheritDoc} */
- @Override public DiscoveryCustomMessage newMessageOnRingEnd(IgniteSpiContext ctx) {
+ @Override public DiscoveryCustomMessage newMessageOnRingEnd() {
return new StartRoutineAckDiscoveryMessage(routineId, errs);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/657afd09/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
index 755552b..2e3002b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.continuous;
import org.apache.ignite.internal.managers.discovery.*;
+import org.jetbrains.annotations.*;
import java.util.*;
@@ -40,6 +41,11 @@ public class StopRoutineAckDiscoveryMessage implements DiscoveryCustomMessage {
return false;
}
+ /** {@inheritDoc} */
+ @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd() {
+ return null;
+ }
+
/**
* @return Routine ID.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/657afd09/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
index 9c480a0..8b08960 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
@@ -26,7 +26,7 @@ import java.util.*;
/**
*
*/
-public class StopRoutineDiscoveryMessage implements RingEndAwareCustomMessage {
+public class StopRoutineDiscoveryMessage implements DiscoveryCustomMessage {
/** Routine ID. */
private final UUID routineId;
@@ -50,7 +50,7 @@ public class StopRoutineDiscoveryMessage implements RingEndAwareCustomMessage {
}
/** {@inheritDoc} */
- @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd(IgniteSpiContext ctx) {
+ @Nullable @Override public DiscoveryCustomMessage newMessageOnRingEnd() {
return new StopRoutineAckDiscoveryMessage(routineId);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/657afd09/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index d13a6d8..f8236f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -4481,13 +4481,10 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
try {
DiscoveryCustomMessage msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader());
- if (msgObj instanceof RingEndAwareCustomMessage) {
- DiscoveryCustomMessage nextMsg = ((RingEndAwareCustomMessage)msgObj)
- .newMessageOnRingEnd(getSpiContext());
+ DiscoveryCustomMessage nextMsg = msgObj.newMessageOnRingEnd();
- if (nextMsg != null)
- addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), marsh.marshal(nextMsg)));
- }
+ if (nextMsg != null)
+ addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), marsh.marshal(nextMsg)));
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to unmarshal discovery custom message.", e);