Skip to content

Commit

Permalink
# ignite-51 merge from sprint-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@sboikov
sboikov committed Mar 11, 2015
1 parent b37bd35 commit 9b288fa
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 77 deletions.
2 changes: 1 addition & 1 deletion ...g/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
View file
Expand Up @@ -302,7 +302,7 @@ public boolean groupLock() {
writer.incrementState();

case 14:
if (!writer.writeByte("plc", plc != null ? (byte) plc.ordinal() : -1))
if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1))
return false;

writer.incrementState();
Expand Down
56 changes: 41 additions & 15 deletions .../apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
View file
Expand Up @@ -421,54 +421,60 @@ public boolean onePhaseCommit() {
writer.incrementState();

case 15:
if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1))
if (!writer.writeBoolean("partLock", partLock))
return false;

writer.incrementState();

case 16:
if (!writer.writeCollection("reads", reads, MessageCollectionItemType.MSG))
if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1))
return false;

writer.incrementState();

case 17:
if (!writer.writeBoolean("sys", sys))
if (!writer.writeCollection("reads", reads, MessageCollectionItemType.MSG))
return false;

writer.incrementState();

case 18:
if (!writer.writeLong("threadId", threadId))
if (!writer.writeBoolean("sys", sys))
return false;

writer.incrementState();

case 19:
if (!writer.writeLong("timeout", timeout))
if (!writer.writeLong("threadId", threadId))
return false;

writer.incrementState();

case 20:
if (!writer.writeByteArray("txNodesBytes", txNodesBytes))
if (!writer.writeLong("timeout", timeout))
return false;

writer.incrementState();

case 21:
if (!writer.writeInt("txSize", txSize))
if (!writer.writeByteArray("txNodesBytes", txNodesBytes))
return false;

writer.incrementState();

case 22:
if (!writer.writeMessage("writeVer", writeVer))
if (!writer.writeInt("txSize", txSize))
return false;

writer.incrementState();

case 23:
if (!writer.writeMessage("writeVer", writeVer))
return false;

writer.incrementState();

case 24:
if (!writer.writeCollection("writes", writes, MessageCollectionItemType.MSG))
return false;

Expand Down Expand Up @@ -563,54 +569,74 @@ public boolean onePhaseCommit() {
reader.incrementState();

case 16:
sys = reader.readBoolean("sys");
byte plcOrd;

plcOrd = reader.readByte("plc");

if (!reader.isLastRead())
return false;

plc = GridIoPolicy.fromOrdinal(plcOrd);

reader.incrementState();

case 17:
threadId = reader.readLong("threadId");
reads = reader.readCollection("reads", MessageCollectionItemType.MSG);

if (!reader.isLastRead())
return false;

reader.incrementState();

case 18:
timeout = reader.readLong("timeout");
sys = reader.readBoolean("sys");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 19:
threadId = reader.readLong("threadId");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 20:
txNodesBytes = reader.readByteArray("txNodesBytes");
timeout = reader.readLong("timeout");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 21:
txSize = reader.readInt("txSize");
txNodesBytes = reader.readByteArray("txNodesBytes");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 22:
writeVer = reader.readMessage("writeVer");
txSize = reader.readInt("txSize");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 23:
writeVer = reader.readMessage("writeVer");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 24:
writes = reader.readCollection("writes", MessageCollectionItemType.MSG);

if (!reader.isLastRead())
Expand All @@ -630,7 +656,7 @@ public boolean onePhaseCommit() {

/** {@inheritDoc} */
@Override public byte fieldsCount() {
return 24;
return 25;
}

/** {@inheritDoc} */
Expand Down
54 changes: 27 additions & 27 deletions .../org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
View file
Expand Up @@ -336,79 +336,79 @@ public Map<IgniteTxKey, GridCacheVersion> owned() {
}

switch (writer.state()) {
case 24:
case 25:
if (!writer.writeIgniteUuid("futId", futId))
return false;

writer.incrementState();

case 25:
case 26:
if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries))
return false;

writer.incrementState();

case 26:
case 27:
if (!writer.writeBoolean("last", last))
return false;

writer.incrementState();

case 27:
case 28:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;

writer.incrementState();

case 28:
case 29:
if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;

writer.incrementState();

case 29:
case 30:
if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG))
return false;

writer.incrementState();

case 30:
case 31:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;

writer.incrementState();

case 31:
case 32:
if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
return false;

writer.incrementState();

case 32:
case 33:
if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG))
return false;

writer.incrementState();

case 33:
case 34:
if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;

writer.incrementState();

case 34:
case 35:
if (!writer.writeUuid("subjId", subjId))
return false;

writer.incrementState();

case 35:
case 36:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;

writer.incrementState();

case 36:
case 37:
if (!writer.writeLong("topVer", topVer))
return false;

Expand All @@ -430,103 +430,103 @@ public Map<IgniteTxKey, GridCacheVersion> owned() {
return false;

switch (reader.state()) {
case 24:
case 25:
futId = reader.readIgniteUuid("futId");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 25:
case 26:
invalidateNearEntries = reader.readBitSet("invalidateNearEntries");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 26:
case 27:
last = reader.readBoolean("last");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 27:
case 28:
miniId = reader.readIgniteUuid("miniId");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 28:
case 29:
nearNodeId = reader.readUuid("nearNodeId");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 29:
case 30:
nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG);

if (!reader.isLastRead())
return false;

reader.incrementState();

case 30:
case 31:
nearXidVer = reader.readMessage("nearXidVer");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 31:
case 32:
ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG);

if (!reader.isLastRead())
return false;

reader.incrementState();

case 32:
case 33:
ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG);

if (!reader.isLastRead())
return false;

reader.incrementState();

case 33:
case 34:
preloadKeys = reader.readBitSet("preloadKeys");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 34:
case 35:
subjId = reader.readUuid("subjId");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 35:
case 36:
taskNameHash = reader.readInt("taskNameHash");

if (!reader.isLastRead())
return false;

reader.incrementState();

case 36:
case 37:
topVer = reader.readLong("topVer");

if (!reader.isLastRead())
Expand All @@ -546,6 +546,6 @@ public Map<IgniteTxKey, GridCacheVersion> owned() {

/** {@inheritDoc} */
@Override public byte fieldsCount() {
return 37;
return 38;
}
}

0 comments on commit 9b288fa

Please sign in to comment.