You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/14 10:29:04 UTC
ignite git commit: Ack message is now created from init message.
Repository: ignite
Updated Branches:
refs/heads/ignite-4565-ddl f6d2ff0c6 -> 09d102806
Ack message is now created from init message.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09d10280
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09d10280
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09d10280
Branch: refs/heads/ignite-4565-ddl
Commit: 09d1028060aa340b3106d40fa00c7a357fe18ee7
Parents: f6d2ff0
Author: devozerov <vo...@gridgain.com>
Authored: Tue Mar 14 13:28:56 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Mar 14 13:28:56 2017 +0300
----------------------------------------------------------------------
.../query/ddl/IndexAbstractDiscoveryMessage.java | 2 +-
.../processors/query/ddl/IndexAckDiscoveryMessage.java | 11 ++++++++---
.../processors/query/ddl/IndexInitDiscoveryMessage.java | 5 ++---
3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/09d10280/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 2912986..5d26074 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
@@ -34,7 +34,7 @@ public abstract class IndexAbstractDiscoveryMessage implements DiscoveryCustomMe
/** Operation. */
@GridToStringInclude
- private final AbstractIndexOperation op;
+ protected final AbstractIndexOperation op;
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/09d10280/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAckDiscoveryMessage.java
index 4fb224d..96b6dcd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexAckDiscoveryMessage.java
@@ -31,18 +31,23 @@ public class IndexAckDiscoveryMessage extends IndexAbstractDiscoveryMessage {
private static final long serialVersionUID = 0L;
/** Node reported an error. */
- private UUID errNodeId;
+ private final UUID errNodeId;
/** Error message. */
- private String errMsg;
+ private final String errMsg;
/**
* Constructor.
*
* @param op Original operation.
+ * @param errNodeId Node reported an error.
+ * @param errMsg Error message.
*/
- public IndexAckDiscoveryMessage(AbstractIndexOperation op) {
+ public IndexAckDiscoveryMessage(AbstractIndexOperation op, UUID errNodeId, String errMsg) {
super(op);
+
+ this.errNodeId = errNodeId;
+ this.errMsg = errMsg;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/09d10280/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexInitDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexInitDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexInitDiscoveryMessage.java
index bbae107..e47c901 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexInitDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/ddl/IndexInitDiscoveryMessage.java
@@ -33,6 +33,7 @@ public class IndexInitDiscoveryMessage extends IndexAbstractDiscoveryMessage imp
/** */
private static final long serialVersionUID = 0L;
+ // TODO: Do we really need it?
/** Kernal context. */
@GridToStringExclude
private transient GridKernalContext ctx;
@@ -54,9 +55,7 @@ public class IndexInitDiscoveryMessage extends IndexAbstractDiscoveryMessage imp
/** {@inheritDoc} */
@Nullable @Override public DiscoveryCustomMessage ackMessage() {
- // TODO: Ask indexing for ack message
-
- return null;
+ return new IndexAckDiscoveryMessage(op, errNodeId, errMsg);
}
/** {@inheritDoc} */