Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into
ignite-gg-9998
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
modules/core/src/main/resources/META-INF/classnames.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7621aaef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7621aaef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7621aaef
Branch: refs/heads/ignite-gg-9998
Commit: 7621aaef7aee8c0823cc13497eb6a6fcdb811f0b
Parents: 8012b0b
Author: ivasilinets <[email protected]>
Authored: Tue Apr 28 14:27:45 2015 +0300
Committer: ivasilinets <[email protected]>
Committed: Tue Apr 28 14:27:45 2015 +0300
----------------------------------------------------------------------
.../ignite/codegen/MessageCodeGenerator.java | 4 +-
.../distributed/GridDistributedLockRequest.java | 72 ++++++++++++--------
.../distributed/dht/GridDhtLockRequest.java | 38 +++++------
.../distributed/near/GridNearLockRequest.java | 54 +++++++--------
4 files changed, 92 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7621aaef/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 f0a5e7f..fd056d5 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
@@ -18,6 +18,8 @@
package org.apache.ignite.codegen;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.distributed.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.internal.processors.datastreamer.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -141,7 +143,7 @@ public class MessageCodeGenerator {
MessageCodeGenerator gen = new MessageCodeGenerator(srcDir);
- gen.generateAndWrite(GridNearTxPrepareRequest.class);
+ gen.generateAndWrite(GridNearLockRequest.class);
// gen.generateAndWrite(GridDistributedLockRequest.class);
// gen.generateAndWrite(GridDistributedLockResponse.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7621aaef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 5adfb5d..2b44a39 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -362,85 +362,91 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
}
switch (writer.state()) {
- case 8:
+ case 9:
+ if (!writer.writeByte("flags", flags))
+ return false;
+
+ writer.incrementState();
+
+ case 10:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 9:
+ case 11:
if (!writer.writeMessage("grpLockKey", grpLockKey))
return false;
writer.incrementState();
- case 10:
+ case 12:
if (!writer.writeBoolean("isInTx", isInTx))
return false;
writer.incrementState();
- case 11:
+ case 13:
if (!writer.writeBoolean("isInvalidate", isInvalidate))
return false;
writer.incrementState();
- case 12:
+ case 14:
if (!writer.writeBoolean("isRead", isRead))
return false;
writer.incrementState();
- case 13:
+ case 15:
if (!writer.writeByte("isolation", isolation != null ?
(byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
- case 14:
+ case 16:
if (!writer.writeCollection("keys", keys,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 15:
+ case 17:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
- case 16:
+ case 18:
if (!writer.writeUuid("nodeId", nodeId))
return false;
writer.incrementState();
- case 17:
+ case 19:
if (!writer.writeBoolean("partLock", partLock))
return false;
writer.incrementState();
- case 18:
+ case 20:
if (!writer.writeBooleanArray("retVals", retVals))
return false;
writer.incrementState();
- case 19:
+ case 21:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 20:
+ case 22:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 21:
+ case 23:
if (!writer.writeInt("txSize", txSize))
return false;
@@ -462,7 +468,15 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
return false;
switch (reader.state()) {
- case 8:
+ case 9:
+ flags = reader.readByte("flags");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 10:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -470,7 +484,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 9:
+ case 11:
grpLockKey = reader.readMessage("grpLockKey");
if (!reader.isLastRead())
@@ -478,7 +492,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 10:
+ case 12:
isInTx = reader.readBoolean("isInTx");
if (!reader.isLastRead())
@@ -486,7 +500,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 11:
+ case 13:
isInvalidate = reader.readBoolean("isInvalidate");
if (!reader.isLastRead())
@@ -494,7 +508,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 12:
+ case 14:
isRead = reader.readBoolean("isRead");
if (!reader.isLastRead())
@@ -502,7 +516,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 13:
+ case 15:
byte isolationOrd;
isolationOrd = reader.readByte("isolation");
@@ -514,7 +528,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 14:
+ case 16:
keys = reader.readCollection("keys",
MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -522,7 +536,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 15:
+ case 17:
nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
@@ -530,7 +544,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 16:
+ case 18:
nodeId = reader.readUuid("nodeId");
if (!reader.isLastRead())
@@ -538,7 +552,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 17:
+ case 19:
partLock = reader.readBoolean("partLock");
if (!reader.isLastRead())
@@ -546,7 +560,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 18:
+ case 20:
retVals = reader.readBooleanArray("retVals");
if (!reader.isLastRead())
@@ -554,7 +568,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 19:
+ case 21:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -562,7 +576,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 20:
+ case 22:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -570,7 +584,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
reader.incrementState();
- case 21:
+ case 23:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -590,7 +604,7 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 22;
+ return 24;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7621aaef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 9b69571..80ca5af 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -331,55 +331,55 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
}
switch (writer.state()) {
- case 23:
+ case 24:
if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeBitSet("invalidateEntries",
invalidateEntries))
return false;
writer.incrementState();
- case 25:
+ case 26:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 26:
+ case 27:
if (!writer.writeCollection("nearKeys", nearKeys,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 27:
+ case 28:
if (!writer.writeByteArray("ownedBytes", ownedBytes))
return false;
writer.incrementState();
- case 28:
+ case 29:
if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
- case 29:
+ case 30:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 30:
+ case 31:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 31:
+ case 32:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -401,7 +401,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
return false;
switch (reader.state()) {
- case 23:
+ case 24:
accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
@@ -409,7 +409,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 24:
+ case 25:
invalidateEntries = reader.readBitSet("invalidateEntries");
if (!reader.isLastRead())
@@ -417,7 +417,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 25:
+ case 26:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -425,7 +425,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 26:
+ case 27:
nearKeys = reader.readCollection("nearKeys",
MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -433,7 +433,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 27:
+ case 28:
ownedBytes = reader.readByteArray("ownedBytes");
if (!reader.isLastRead())
@@ -441,7 +441,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 28:
+ case 29:
preloadKeys = reader.readBitSet("preloadKeys");
if (!reader.isLastRead())
@@ -449,7 +449,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 29:
+ case 30:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -457,7 +457,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 30:
+ case 31:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -465,7 +465,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 31:
+ case 32:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -485,7 +485,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 32;
+ return 33;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7621aaef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 1ba4bfe..101a38e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -356,79 +356,79 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
}
switch (writer.state()) {
- case 23:
+ case 24:
if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeObjectArray("dhtVers", dhtVers,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 25:
+ case 26:
if (!writer.writeObjectArray("filter", filter,
MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 26:
+ case 27:
if (!writer.writeBoolean("hasTransforms", hasTransforms))
return false;
writer.incrementState();
- case 27:
+ case 28:
if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx))
return false;
writer.incrementState();
- case 28:
+ case 29:
if (!writer.writeBoolean("implicitTx", implicitTx))
return false;
writer.incrementState();
- case 29:
+ case 30:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 30:
+ case 31:
if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
return false;
writer.incrementState();
- case 31:
+ case 32:
if (!writer.writeBoolean("retVal", retVal))
return false;
writer.incrementState();
- case 32:
+ case 33:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 33:
+ case 34:
if (!writer.writeBoolean("syncCommit", syncCommit))
return false;
writer.incrementState();
- case 34:
+ case 35:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 35:
+ case 36:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -450,7 +450,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
return false;
switch (reader.state()) {
- case 23:
+ case 24:
accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
@@ -458,7 +458,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 24:
+ case 25:
dhtVers = reader.readObjectArray("dhtVers",
MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -466,7 +466,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 25:
+ case 26:
filter = reader.readObjectArray("filter",
MessageCollectionItemType.MSG, CacheEntryPredicate.class);
if (!reader.isLastRead())
@@ -474,7 +474,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 26:
+ case 27:
hasTransforms = reader.readBoolean("hasTransforms");
if (!reader.isLastRead())
@@ -482,7 +482,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 27:
+ case 28:
implicitSingleTx = reader.readBoolean("implicitSingleTx");
if (!reader.isLastRead())
@@ -490,7 +490,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 28:
+ case 29:
implicitTx = reader.readBoolean("implicitTx");
if (!reader.isLastRead())
@@ -498,7 +498,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 29:
+ case 30:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -506,7 +506,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 30:
+ case 31:
onePhaseCommit = reader.readBoolean("onePhaseCommit");
if (!reader.isLastRead())
@@ -514,7 +514,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 31:
+ case 32:
retVal = reader.readBoolean("retVal");
if (!reader.isLastRead())
@@ -522,7 +522,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 32:
+ case 33:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -530,7 +530,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 33:
+ case 34:
syncCommit = reader.readBoolean("syncCommit");
if (!reader.isLastRead())
@@ -538,7 +538,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 34:
+ case 35:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -546,7 +546,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
reader.incrementState();
- case 35:
+ case 36:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -566,7 +566,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 36;
+ return 37;
}
/** {@inheritDoc} */
