ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: IGNITE-426 Fixed tests.
Date Fri, 06 Nov 2015 15:01:09 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-426-2 c141fe49e -> e281e3480


IGNITE-426 Fixed tests.


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

Branch: refs/heads/ignite-426-2
Commit: e281e34800cf19ee1b0cf366006f969e2788fd5f
Parents: c141fe4
Author: Tikhonov Nikolay <tikhonovnicolay@gmail.com>
Authored: Fri Nov 6 18:04:18 2015 +0300
Committer: Tikhonov Nikolay <tikhonovnicolay@gmail.com>
Committed: Fri Nov 6 18:04:18 2015 +0300

----------------------------------------------------------------------
 .../distributed/dht/GridDhtTxFinishRequest.java | 29 +++++++--------
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  | 38 ++++++++++----------
 .../CacheContinuousQueryBatchAck.java           |  6 ++--
 .../continuous/CacheContinuousQueryEntry.java   | 32 ++++++++---------
 4 files changed, 53 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e281e348/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index de6326e..65f1cb4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -370,46 +370,47 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
                 writer.incrementState();
 
             case 22:
-                if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
+                if (!writer.writeMessage("partUpdateCnt", partUpdateCnt))
                     return false;
 
                 writer.incrementState();
 
             case 23:
-                if (!writer.writeUuid("subjId", subjId))
+                if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
                     return false;
 
                 writer.incrementState();
 
             case 24:
-                if (!writer.writeBoolean("sysInvalidate", sysInvalidate))
+                if (!writer.writeUuid("subjId", subjId))
                     return false;
 
                 writer.incrementState();
 
             case 25:
-                if (!writer.writeInt("taskNameHash", taskNameHash))
+                if (!writer.writeBoolean("sysInvalidate", sysInvalidate))
                     return false;
 
                 writer.incrementState();
 
             case 26:
-                if (!writer.writeMessage("topVer", topVer))
+                if (!writer.writeInt("taskNameHash", taskNameHash))
                     return false;
 
                 writer.incrementState();
 
             case 27:
-                if (!writer.writeMessage("writeVer", writeVer))
+                if (!writer.writeMessage("topVer", topVer))
                     return false;
 
                 writer.incrementState();
 
             case 28:
-                if (!writer.writeMessage("partUpdateCnt", partUpdateCnt))
+                if (!writer.writeMessage("writeVer", writeVer))
                     return false;
 
                 writer.incrementState();
+
         }
 
         return true;
@@ -463,7 +464,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
                 reader.incrementState();
 
             case 22:
-                pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
+                partUpdateCnt = reader.readMessage("partUpdateCnt");
 
                 if (!reader.isLastRead())
                     return false;
@@ -471,7 +472,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
                 reader.incrementState();
 
             case 23:
-                subjId = reader.readUuid("subjId");
+                pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -479,7 +480,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
                 reader.incrementState();
 
             case 24:
-                sysInvalidate = reader.readBoolean("sysInvalidate");
+                subjId = reader.readUuid("subjId");
 
                 if (!reader.isLastRead())
                     return false;
@@ -487,7 +488,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
                 reader.incrementState();
 
             case 25:
-                taskNameHash = reader.readInt("taskNameHash");
+                sysInvalidate = reader.readBoolean("sysInvalidate");
 
                 if (!reader.isLastRead())
                     return false;
@@ -495,7 +496,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
                 reader.incrementState();
 
             case 26:
-                topVer = reader.readMessage("topVer");
+                taskNameHash = reader.readInt("taskNameHash");
 
                 if (!reader.isLastRead())
                     return false;
@@ -503,7 +504,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
                 reader.incrementState();
 
             case 27:
-                writeVer = reader.readMessage("writeVer");
+                topVer = reader.readMessage("topVer");
 
                 if (!reader.isLastRead())
                     return false;
@@ -511,7 +512,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
                 reader.incrementState();
 
             case 28:
-                partUpdateCnt = reader.readMessage("partUpdateCnt");
+                writeVer = reader.readMessage("writeVer");
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/ignite/blob/e281e348/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 0f29a90..82a7313 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -442,7 +442,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements
Grid
      * @return Update counter.
      */
     public Long updateIdx(int idx) {
-        if (idx < updateCntrs.size())
+        if (updateCntrs != null && idx < updateCntrs.size())
             return updateCntrs.get(idx);
 
         return null;
@@ -733,43 +733,43 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements
Grid
                 writer.incrementState();
 
             case 16:
-                if (!writer.writeMessage("updateCntrs", updateCntrs))
+                if (!writer.writeCollection("prevVals", prevVals, MessageCollectionItemType.MSG))
                     return false;
 
                 writer.incrementState();
 
             case 17:
-                if (!writer.writeCollection("prevVals", prevVals, MessageCollectionItemType.MSG))
+                if (!writer.writeUuid("subjId", subjId))
                     return false;
 
                 writer.incrementState();
 
             case 18:
-                if (!writer.writeUuid("subjId", subjId))
+                if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal()
: -1))
                     return false;
 
                 writer.incrementState();
 
             case 19:
-                if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal()
: -1))
+                if (!writer.writeInt("taskNameHash", taskNameHash))
                     return false;
 
                 writer.incrementState();
 
             case 20:
-                if (!writer.writeInt("taskNameHash", taskNameHash))
+                if (!writer.writeMessage("topVer", topVer))
                     return false;
 
                 writer.incrementState();
 
             case 21:
-                if (!writer.writeMessage("topVer", topVer))
+                if (!writer.writeMessage("ttls", ttls))
                     return false;
 
                 writer.incrementState();
 
             case 22:
-                if (!writer.writeMessage("ttls", ttls))
+                if (!writer.writeMessage("updateCntrs", updateCntrs))
                     return false;
 
                 writer.incrementState();
@@ -907,7 +907,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements
Grid
                 reader.incrementState();
 
             case 16:
-                updateCntrs = reader.readMessage("updateCntrs");
+                prevVals = reader.readCollection("prevVals", MessageCollectionItemType.MSG);
 
                 if (!reader.isLastRead())
                     return false;
@@ -915,7 +915,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements
Grid
                 reader.incrementState();
 
             case 17:
-                prevVals = reader.readCollection("prevVals", MessageCollectionItemType.MSG);
+                subjId = reader.readUuid("subjId");
 
                 if (!reader.isLastRead())
                     return false;
@@ -923,27 +923,27 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements
Grid
                 reader.incrementState();
 
             case 18:
-                subjId = reader.readUuid("subjId");
+                byte syncModeOrd;
+
+                syncModeOrd = reader.readByte("syncMode");
 
                 if (!reader.isLastRead())
                     return false;
 
+                syncMode = CacheWriteSynchronizationMode.fromOrdinal(syncModeOrd);
+
                 reader.incrementState();
 
             case 19:
-                byte syncModeOrd;
-
-                syncModeOrd = reader.readByte("syncMode");
+                taskNameHash = reader.readInt("taskNameHash");
 
                 if (!reader.isLastRead())
                     return false;
 
-                syncMode = CacheWriteSynchronizationMode.fromOrdinal(syncModeOrd);
-
                 reader.incrementState();
 
             case 20:
-                taskNameHash = reader.readInt("taskNameHash");
+                topVer = reader.readMessage("topVer");
 
                 if (!reader.isLastRead())
                     return false;
@@ -951,7 +951,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements
Grid
                 reader.incrementState();
 
             case 21:
-                topVer = reader.readMessage("topVer");
+                ttls = reader.readMessage("ttls");
 
                 if (!reader.isLastRead())
                     return false;
@@ -959,7 +959,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements
Grid
                 reader.incrementState();
 
             case 22:
-                ttls = reader.readMessage("ttls");
+                updateCntrs = reader.readMessage("updateCntrs");
 
                 if (!reader.isLastRead())
                     return false;

http://git-wip-us.apache.org/repos/asf/ignite/blob/e281e348/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
index 3ad311f..9ffadd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
@@ -128,8 +128,8 @@ public class CacheContinuousQueryBatchAck extends GridCacheMessage {
                 reader.incrementState();
 
             case 4:
-                updateCntrs = reader.readMap("updateCntrs", MessageCollectionItemType.INT,
MessageCollectionItemType.LONG,
-                    false);
+                updateCntrs = reader.readMap("updateCntrs", MessageCollectionItemType.INT,
+                    MessageCollectionItemType.LONG, false);
 
                 if (!reader.isLastRead())
                     return false;
@@ -138,7 +138,7 @@ public class CacheContinuousQueryBatchAck extends GridCacheMessage {
 
         }
 
-        return true;
+        return reader.afterMessageRead(CacheContinuousQueryBatchAck.class);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/e281e348/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
index a3c53ff..0495e6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
@@ -310,49 +310,49 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 writer.incrementState();
 
             case 2:
-                if (!writer.writeMessage("key", key))
+                if (!writer.writeMessage("filteredEvts", filteredEvts))
                     return false;
 
                 writer.incrementState();
 
             case 3:
-                if (!writer.writeMessage("newVal", newVal))
+                if (!writer.writeByte("flags", flags))
                     return false;
 
                 writer.incrementState();
 
             case 4:
-                if (!writer.writeMessage("oldVal", oldVal))
+                if (!writer.writeMessage("key", key))
                     return false;
 
                 writer.incrementState();
 
             case 5:
-                if (!writer.writeInt("part", part))
+                if (!writer.writeMessage("newVal", newVal))
                     return false;
 
                 writer.incrementState();
 
             case 6:
-                if (!writer.writeLong("updateCntr", updateCntr))
+                if (!writer.writeMessage("oldVal", oldVal))
                     return false;
 
                 writer.incrementState();
 
             case 7:
-                if (!writer.writeByte("flags", flags))
+                if (!writer.writeInt("part", part))
                     return false;
 
                 writer.incrementState();
 
             case 8:
-                if (!writer.writeMessage("filteredEvts", filteredEvts))
+                if (!writer.writeMessage("topVer", topVer))
                     return false;
 
                 writer.incrementState();
 
             case 9:
-                if (!writer.writeMessage("topVer", topVer))
+                if (!writer.writeLong("updateCntr", updateCntr))
                     return false;
 
                 writer.incrementState();
@@ -391,7 +391,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 reader.incrementState();
 
             case 2:
-                key = reader.readMessage("key");
+                filteredEvts = reader.readMessage("filteredEvts");
 
                 if (!reader.isLastRead())
                     return false;
@@ -399,7 +399,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 reader.incrementState();
 
             case 3:
-                newVal = reader.readMessage("newVal");
+                flags = reader.readByte("flags");
 
                 if (!reader.isLastRead())
                     return false;
@@ -407,7 +407,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 reader.incrementState();
 
             case 4:
-                oldVal = reader.readMessage("oldVal");
+                key = reader.readMessage("key");
 
                 if (!reader.isLastRead())
                     return false;
@@ -415,7 +415,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 reader.incrementState();
 
             case 5:
-                part = reader.readInt("part");
+                newVal = reader.readMessage("newVal");
 
                 if (!reader.isLastRead())
                     return false;
@@ -423,7 +423,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 reader.incrementState();
 
             case 6:
-                updateCntr = reader.readLong("updateCntr");
+                oldVal = reader.readMessage("oldVal");
 
                 if (!reader.isLastRead())
                     return false;
@@ -431,7 +431,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 reader.incrementState();
 
             case 7:
-                flags = reader.readByte("flags");
+                part = reader.readInt("part");
 
                 if (!reader.isLastRead())
                     return false;
@@ -439,7 +439,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 reader.incrementState();
 
             case 8:
-                filteredEvts = reader.readMessage("filteredEvts");
+                topVer = reader.readMessage("topVer");
 
                 if (!reader.isLastRead())
                     return false;
@@ -447,7 +447,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable,
Message {
                 reader.incrementState();
 
             case 9:
-                topVer = reader.readMessage("topVer");
+                updateCntr = reader.readLong("updateCntr");
 
                 if (!reader.isLastRead())
                     return false;


Mime
View raw message