You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/15 08:51:59 UTC
[15/50] [abbrv] ignite git commit: ignite-split2 - messages
ignite-split2 - messages
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9c110e89
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c110e89
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9c110e89
Branch: refs/heads/ignite-1232
Commit: 9c110e8937a9a5b7931ed49d29080af6bf817c85
Parents: 94db68a
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Dec 8 03:16:24 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Dec 8 03:16:24 2015 +0300
----------------------------------------------------------------------
.../ignite/codegen/MessageCodeGenerator.java | 6 ++--
.../cache/query/GridCacheSqlQuery.java | 2 +-
.../messages/GridQueryCancelRequest.java | 2 +-
.../twostep/messages/GridQueryFailResponse.java | 2 +-
.../messages/GridQueryNextPageRequest.java | 2 +-
.../h2/twostep/msg/GridH2IndexRangeRequest.java | 24 ++++++++++++---
.../twostep/msg/GridH2IndexRangeResponse.java | 32 ++++++++++++++------
7 files changed, 48 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c110e89/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 7b98375..011eece 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -43,9 +43,6 @@ import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectMap;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomicUpdateRequest;
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry;
-import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
@@ -170,7 +167,7 @@ public class MessageCodeGenerator {
// gen.generateAll(true);
- gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
+// gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
// gen.generateAndWrite(DataStreamerEntry.class);
@@ -228,6 +225,7 @@ public class MessageCodeGenerator {
// gen.generateAndWrite(GridH2IndexRangeResponse.class);
// gen.generateAndWrite(GridH2RowRange.class);
// gen.generateAndWrite(GridH2RowRangeBounds.class);
+// gen.generateAndWrite(GridH2QueryRequest.class);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c110e89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
index 1127d7e..1870e66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
@@ -269,4 +269,4 @@ public class GridCacheSqlQuery implements Message, GridCacheQueryMarshallable {
return cp;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c110e89/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
index e7e1493..bd5d8e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
@@ -112,4 +112,4 @@ public class GridQueryCancelRequest implements Message {
@Override public byte fieldsCount() {
return 1;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c110e89/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
index 5f47649..4503049 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
@@ -138,4 +138,4 @@ public class GridQueryFailResponse implements Message {
@Override public byte fieldsCount() {
return 2;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c110e89/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
index 5ed6502..6597db5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
@@ -165,4 +165,4 @@ public class GridQueryNextPageRequest implements Message {
@Override public byte fieldsCount() {
return 3;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c110e89/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
index 91220c5..e72ff1e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
@@ -112,18 +112,24 @@ public class GridH2IndexRangeRequest implements Message {
switch (writer.state()) {
case 0:
- if (!writer.writeCollection("bounds", bounds, MessageCollectionItemType.MSG))
+ if (!writer.writeInt("batchLookupId", batchLookupId))
return false;
writer.incrementState();
case 1:
- if (!writer.writeUuid("originNodeId", originNodeId))
+ if (!writer.writeCollection("bounds", bounds, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 2:
+ if (!writer.writeUuid("originNodeId", originNodeId))
+ return false;
+
+ writer.incrementState();
+
+ case 3:
if (!writer.writeLong("qryId", qryId))
return false;
@@ -143,7 +149,7 @@ public class GridH2IndexRangeRequest implements Message {
switch (reader.state()) {
case 0:
- bounds = reader.readCollection("bounds", MessageCollectionItemType.MSG);
+ batchLookupId = reader.readInt("batchLookupId");
if (!reader.isLastRead())
return false;
@@ -151,7 +157,7 @@ public class GridH2IndexRangeRequest implements Message {
reader.incrementState();
case 1:
- originNodeId = reader.readUuid("originNodeId");
+ bounds = reader.readCollection("bounds", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -159,6 +165,14 @@ public class GridH2IndexRangeRequest implements Message {
reader.incrementState();
case 2:
+ originNodeId = reader.readUuid("originNodeId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 3:
qryId = reader.readLong("qryId");
if (!reader.isLastRead())
@@ -178,6 +192,6 @@ public class GridH2IndexRangeRequest implements Message {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 3;
+ return 4;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c110e89/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
index ee15636..cb8c1a4 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
@@ -155,30 +155,36 @@ public class GridH2IndexRangeResponse implements Message {
switch (writer.state()) {
case 0:
- if (!writer.writeString("err", err))
+ if (!writer.writeInt("batchLookupId", batchLookupId))
return false;
writer.incrementState();
case 1:
- if (!writer.writeUuid("originNodeId", originNodeId))
+ if (!writer.writeString("err", err))
return false;
writer.incrementState();
case 2:
- if (!writer.writeLong("qryId", qryId))
+ if (!writer.writeUuid("originNodeId", originNodeId))
return false;
writer.incrementState();
case 3:
- if (!writer.writeCollection("ranges", ranges, MessageCollectionItemType.MSG))
+ if (!writer.writeLong("qryId", qryId))
return false;
writer.incrementState();
case 4:
+ if (!writer.writeCollection("ranges", ranges, MessageCollectionItemType.MSG))
+ return false;
+
+ writer.incrementState();
+
+ case 5:
if (!writer.writeByte("status", status))
return false;
@@ -198,7 +204,7 @@ public class GridH2IndexRangeResponse implements Message {
switch (reader.state()) {
case 0:
- err = reader.readString("err");
+ batchLookupId = reader.readInt("batchLookupId");
if (!reader.isLastRead())
return false;
@@ -206,7 +212,7 @@ public class GridH2IndexRangeResponse implements Message {
reader.incrementState();
case 1:
- originNodeId = reader.readUuid("originNodeId");
+ err = reader.readString("err");
if (!reader.isLastRead())
return false;
@@ -214,7 +220,7 @@ public class GridH2IndexRangeResponse implements Message {
reader.incrementState();
case 2:
- qryId = reader.readLong("qryId");
+ originNodeId = reader.readUuid("originNodeId");
if (!reader.isLastRead())
return false;
@@ -222,7 +228,7 @@ public class GridH2IndexRangeResponse implements Message {
reader.incrementState();
case 3:
- ranges = reader.readCollection("ranges", MessageCollectionItemType.MSG);
+ qryId = reader.readLong("qryId");
if (!reader.isLastRead())
return false;
@@ -230,6 +236,14 @@ public class GridH2IndexRangeResponse implements Message {
reader.incrementState();
case 4:
+ ranges = reader.readCollection("ranges", MessageCollectionItemType.MSG);
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 5:
status = reader.readByte("status");
if (!reader.isLastRead())
@@ -249,6 +263,6 @@ public class GridH2IndexRangeResponse implements Message {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 5;
+ return 6;
}
}