WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b35568e4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b35568e4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b35568e4 Branch: refs/heads/ignite-4565-ddl Commit: b35568e46dd25adaf60ad9d89f55ddeef6648416 Parents: f1419d7 Author: devozerov <[email protected]> Authored: Wed Mar 22 12:53:43 2017 +0300 Committer: devozerov <[email protected]> Committed: Wed Mar 22 12:53:43 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheProcessor.java | 4 ---- .../query/ddl/IndexAbstractDiscoveryMessage.java | 16 ++-------------- .../query/ddl/IndexAcceptDiscoveryMessage.java | 5 +++++ .../query/ddl/IndexFinishDiscoveryMessage.java | 5 +++++ .../query/ddl/IndexProposeDiscoveryMessage.java | 5 +++++ 5 files changed, 17 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b35568e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index bde7ff9..a173177 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2808,8 +2808,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { msg.onError("Cache was stopped concurrently."); else desc.tryAccept(msg); - - msg.exchange(true); } /** @@ -2826,8 +2824,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { return; desc.tryFinish(msg); - - msg.exchange(true); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b35568e4/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAbstractDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAbstractDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAbstractDiscoveryMessage.java index 3de525b..314202e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAbstractDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAbstractDiscoveryMessage.java @@ -38,9 +38,6 @@ public abstract class IndexAbstractDiscoveryMessage implements DiscoveryCustomMe @GridToStringInclude protected final AbstractIndexOperation op; - /** Whether request must be propagated to exchange worker for final processing. */ - private transient boolean exchange; - /** * Constructor. * @@ -63,18 +60,9 @@ public abstract class IndexAbstractDiscoveryMessage implements DiscoveryCustomMe } /** - * @return Whether request must be propagated to exchange worker for final processing. - */ - public boolean exchange() { - return exchange; - } - - /** - * @param exchange Whether request must be propagated to exchange worker for final processing. + * @return Whether request must be propagated to exchange thread. */ - public void exchange(boolean exchange) { - this.exchange = exchange; - } + public abstract boolean exchange(); /** {@inheritDoc} */ @Override public String toString() { http://git-wip-us.apache.org/repos/asf/ignite/blob/b35568e4/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAcceptDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAcceptDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAcceptDiscoveryMessage.java index a7c756f..935e683 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAcceptDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAcceptDiscoveryMessage.java @@ -52,6 +52,11 @@ public class IndexAcceptDiscoveryMessage extends IndexAbstractDiscoveryMessage { return false; } + /** {@inheritDoc} */ + @Override public boolean exchange() { + return true; + } + /** * @return Error message. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b35568e4/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexFinishDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexFinishDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexFinishDiscoveryMessage.java index 5a2d66c..c3ce40c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexFinishDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexFinishDiscoveryMessage.java @@ -59,6 +59,11 @@ public class IndexFinishDiscoveryMessage extends IndexAbstractDiscoveryMessage { return false; } + /** {@inheritDoc} */ + @Override public boolean exchange() { + return true; + } + /** * @return {@code True} if error was reported during init. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b35568e4/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexProposeDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexProposeDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexProposeDiscoveryMessage.java index 6d6c72e..f619fe8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexProposeDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexProposeDiscoveryMessage.java @@ -66,6 +66,11 @@ public class IndexProposeDiscoveryMessage extends IndexAbstractDiscoveryMessage } /** {@inheritDoc} */ + @Override public boolean exchange() { + return false; + } + + /** {@inheritDoc} */ @Override public void context(GridKernalContext ctx) { this.ctx = ctx; }
