ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [49/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Date Sun, 15 Feb 2015 08:42:31 GMT
Merge remote-tracking branch 'origin/sprint-1' into sprint-1

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java


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

Branch: refs/heads/sprint-1
Commit: ac3769be71940f11914733c9572db7391d02c504
Parents: 497fc87 73bc9d3
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Sun Feb 15 00:37:02 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Sun Feb 15 00:37:02 2015 -0800

----------------------------------------------------------------------
 .../datagrid/CacheDataLoaderExample.java        |   1 -
 .../CommunicationMessageCodeGenerator.java      |  24 +
 .../org/apache/ignite/IgniteDataLoader.java     |  22 +-
 .../communication/GridIoMessageFactory.java     |  10 -
 .../affinity/GridAffinityProcessor.java         |  36 +-
 .../processors/cache/CacheMetricsImpl.java      |   8 +-
 .../processors/cache/GridCacheAdapter.java      |  35 +-
 .../processors/cache/GridCacheContext.java      |  30 +-
 .../processors/cache/GridCacheEntryInfo.java    |   9 +
 .../processors/cache/GridCacheMapEntry.java     | 159 ++---
 .../processors/cache/GridCacheMvcc.java         |   8 +-
 .../cache/GridCacheMvccCandidate.java           |  18 -
 .../processors/cache/GridCacheReturn.java       |  57 ++
 .../cache/GridCacheSharedContext.java           |   2 +
 .../processors/cache/GridCacheUtils.java        |  15 -
 .../distributed/GridCacheCommittedTxInfo.java   |   2 -
 .../GridCachePerThreadTxCommitBuffer.java       | 186 -----
 ...dCachePessimisticCheckCommittedTxFuture.java | 383 -----------
 ...CachePessimisticCheckCommittedTxRequest.java | 282 --------
 ...achePessimisticCheckCommittedTxResponse.java | 228 ------
 .../distributed/GridCacheTxCommitBuffer.java    |  60 --
 .../distributed/GridDistributedLockRequest.java | 201 +-----
 .../GridDistributedTxFinishRequest.java         | 158 +----
 .../distributed/GridDistributedTxMapping.java   |   6 +-
 .../GridDistributedTxPrepareRequest.java        | 122 +---
 .../GridDistributedTxRemoteAdapter.java         |  58 +-
 .../distributed/dht/GridDhtCacheEntry.java      |  12 +-
 .../distributed/dht/GridDhtLockFuture.java      | 156 +----
 .../distributed/dht/GridDhtLockRequest.java     |  74 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  20 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |  44 +-
 .../distributed/dht/GridDhtTxFinishRequest.java | 270 +-------
 .../cache/distributed/dht/GridDhtTxLocal.java   |  56 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  | 109 +--
 .../distributed/dht/GridDhtTxPrepareFuture.java | 654 ++++++++++++------
 .../dht/GridDhtTxPrepareRequest.java            |  59 +-
 .../dht/GridDhtTxPrepareResponse.java           |   2 +
 .../cache/distributed/dht/GridDhtTxRemote.java  |  12 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   2 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  41 --
 .../dht/preloader/GridDhtPreloader.java         |   2 +-
 .../distributed/near/GridNearLockFuture.java    |   8 -
 .../distributed/near/GridNearLockRequest.java   |  87 +--
 .../near/GridNearTransactionalCache.java        |   3 +-
 .../near/GridNearTxFinishFuture.java            |   2 -
 .../near/GridNearTxFinishRequest.java           |  54 +-
 .../cache/distributed/near/GridNearTxLocal.java |  68 +-
 .../near/GridNearTxPrepareFuture.java           | 421 ++++++++----
 .../near/GridNearTxPrepareRequest.java          |  86 +--
 .../near/GridNearTxPrepareResponse.java         |  77 ++-
 .../cache/transactions/IgniteInternalTx.java    |   7 -
 .../cache/transactions/IgniteTxAdapter.java     |  60 +-
 .../cache/transactions/IgniteTxEntry.java       |  17 -
 .../cache/transactions/IgniteTxHandler.java     | 688 ++++---------------
 .../transactions/IgniteTxLocalAdapter.java      | 260 +++----
 .../cache/transactions/IgniteTxLocalEx.java     |   5 +
 .../cache/transactions/IgniteTxManager.java     | 210 ++----
 .../cache/transactions/IgniteTxProxyImpl.java   |  14 +-
 .../dataload/IgniteDataLoaderImpl.java          | 101 ++-
 .../util/GridBoundedConcurrentOrderedMap.java   |  20 +-
 .../optimized/optimized-classnames.properties   |  42 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 171 +++--
 .../cache/GridCacheAbstractMetricsSelfTest.java |   4 +-
 .../cache/GridCacheAbstractSelfTest.java        |   2 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   3 +-
 .../processors/cache/GridCacheTestStore.java    |  16 +-
 .../cache/IgniteCacheInvokeAbstractTest.java    |   6 +-
 ...gniteCacheTransactionalStopBusySelfTest.java |   8 +-
 .../IgniteClientAffinityAssignmentSelfTest.java | 164 +++++
 .../cache/IgnitePutAllLargeBatchSelfTest.java   | 301 ++++++++
 ...tAllUpdateNonPreloadedPartitionSelfTest.java | 129 ++++
 .../IgniteTxExceptionAbstractSelfTest.java      |  37 +-
 .../GridCacheAbstractJobExecutionTest.java      |  13 +-
 .../distributed/GridCacheEventAbstractTest.java |   2 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |  29 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |   2 +-
 .../near/GridCacheNearMetricsSelfTest.java      |   8 +-
 .../near/GridCacheNearReadersSelfTest.java      |   2 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |   2 +-
 ...eReplicatedGetAndTransformStoreSelfTest.java |   8 +-
 ...ssimisticOriginatingNodeFailureSelfTest.java |   5 +-
 ...heConcurrentEvictionConsistencySelfTest.java |   8 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |   6 +-
 ...iteCacheNoLoadPreviousValueAbstractTest.java |   5 +-
 .../GridDataLoaderProcessorSelfTest.java        |  95 ++-
 .../testsuites/IgniteCacheRestartTestSuite.java |   2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |  17 +-
 87 files changed, 2778 insertions(+), 4130 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index e144279,a280849..13832d0
--- 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
@@@ -436,105 -393,93 +356,71 @@@ public class GridDistributedLockRequest
              if (!writer.writeByte(null, directType()))
                  return false;
  
 -            typeWritten = true;
 +            writer.onTypeWritten();
          }
  
 -        switch (state) {
 -            case 8:
 -                if (!writer.writeIgniteUuid("futId", futId))
 -                    return false;
 -
 -                state++;
 -
 +        switch (writer.state()) {
-             case 8:
-                 if (!writer.writeObjectArray("drVersByIdx", drVersByIdx, Type.MSG))
-                     return false;
- 
-                 writer.incrementState();
- 
              case 9:
-                 if (!writer.writeIgniteUuid("futId", futId))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 10:
                  if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 11:
+             case 10:
                  if (!writer.writeBoolean("isInTx", isInTx))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 12:
+             case 11:
                  if (!writer.writeBoolean("isInvalidate", isInvalidate))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 13:
+             case 12:
                  if (!writer.writeBoolean("isRead", isRead))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
 -            case 13:
 -                if (!writer.writeEnum("isolation", isolation))
 -                    return false;
 -
 -                state++;
 -
--            case 14:
-                 if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
 -                if (!writer.writeCollection("keyBytes", keyBytes, byte[].class))
--                    return false;
--
-                 writer.incrementState();
 -                state++;
--
--            case 15:
-                 if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR))
 -                if (!writer.writeMessage("nearXidVer", nearXidVer))
--                    return false;
--
-                 writer.incrementState();
 -                state++;
  
              case 16:
-                 if (!writer.writeMessage("nearXidVer", nearXidVer))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 17:
                  if (!writer.writeUuid("nodeId", nodeId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 18:
+             case 17:
                  if (!writer.writeBoolean("partLock", partLock))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 19:
+             case 18:
                  if (!writer.writeBooleanArray("retVals", retVals))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 20:
+             case 19:
                  if (!writer.writeLong("threadId", threadId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 21:
+             case 20:
                  if (!writer.writeLong("timeout", timeout))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 22:
+             case 21:
                  if (!writer.writeInt("txSize", txSize))
                      return false;
  
 -                state++;
 +                writer.incrementState();
 +
-             case 23:
-                 if (!writer.writeByteArray("writeEntriesBytes", writeEntriesBytes))
-                     return false;
- 
-                 writer.incrementState();
  
          }
  
@@@ -548,138 -494,118 +434,81 @@@
          if (!super.readFrom(buf))
              return false;
  
 -        switch (state) {
 -            case 8:
 -                futId = reader.readIgniteUuid("futId");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 9:
 -                grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 +        switch (readState) {
-             case 8:
-                 drVersByIdx = reader.readObjectArray("drVersByIdx", Type.MSG, GridCacheVersion.class);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 9:
-                 futId = reader.readIgniteUuid("futId");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
  
              case 10:
-                 grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 11:
                  isInTx = reader.readBoolean("isInTx");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 12:
+             case 11:
                  isInvalidate = reader.readBoolean("isInvalidate");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 13:
+             case 12:
                  isRead = reader.readBoolean("isRead");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 -
 -            case 13:
 -                isolation = reader.readEnum("isolation", IgniteTxIsolation.class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 14:
 -                keyBytes = reader.readCollection("keyBytes", byte[].class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +                readState++;
  
-             case 14:
-                 byte isolationOrd;
- 
-                 isolationOrd = reader.readByte("isolation");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 isolation = IgniteTxIsolation.fromOrdinal(isolationOrd);
- 
-                 readState++;
 -                state++;
  
              case 15:
-                 keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 16:
                  nearXidVer = reader.readMessage("nearXidVer");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 17:
+             case 16:
                  nodeId = reader.readUuid("nodeId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 18:
+             case 17:
                  partLock = reader.readBoolean("partLock");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 19:
+             case 18:
                  retVals = reader.readBooleanArray("retVals");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 20:
+             case 19:
                  threadId = reader.readLong("threadId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 21:
+             case 20:
                  timeout = reader.readLong("timeout");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 -
 -            case 21:
 -                txSize = reader.readInt("txSize");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +                readState++;
  
-             case 22:
-                 txSize = reader.readInt("txSize");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 23:
-                 writeEntriesBytes = reader.readByteArray("writeEntriesBytes");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
 -                state++;
  
          }
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 30ad331,df4cbbe..b89ee8c
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@@ -392,50 -326,38 +294,33 @@@ public class GridDistributedTxFinishReq
                  if (!writer.writeBoolean("invalidate", invalidate))
                      return false;
  
 -                state++;
 -
 -            case 14:
 -                if (!writer.writeBoolean("syncCommit", syncCommit))
 -                    return false;
 +                writer.incrementState();
  
-             case 14:
-                 if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, Type.BYTE_ARR))
-                     return false;
- 
-                 writer.incrementState();
 -                state++;
  
              case 15:
-                 if (!writer.writeBoolean("syncCommit", syncCommit))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 16:
                  if (!writer.writeBoolean("syncRollback", syncRollback))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 17:
+             case 16:
                  if (!writer.writeBoolean("sys", sys))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 18:
+             case 17:
                  if (!writer.writeLong("threadId", threadId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 19:
+             case 18:
                  if (!writer.writeInt("txSize", txSize))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 20:
-                 if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, Type.BYTE_ARR))
-                     return false;
- 
-                 writer.incrementState();
- 
          }
  
          return true;
@@@ -495,63 -418,47 +380,32 @@@
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 -
 -            case 14:
 -                syncCommit = reader.readBoolean("syncCommit");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 +                readState++;
  
-             case 14:
-                 recoveryWritesBytes = reader.readCollection("recoveryWritesBytes", Type.BYTE_ARR);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
              case 15:
-                 syncCommit = reader.readBoolean("syncCommit");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 16:
                  syncRollback = reader.readBoolean("syncRollback");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 17:
+             case 16:
                  sys = reader.readBoolean("sys");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 18:
+             case 17:
                  threadId = reader.readLong("threadId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 -
 -            case 18:
 -                txSize = reader.readInt("txSize");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +                readState++;
  
-             case 19:
-                 txSize = reader.readInt("txSize");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 20:
-                 writeEntriesBytes = reader.readCollection("writeEntriesBytes", Type.BYTE_ARR);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
 -                state++;
  
          }
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 41a55ba,065e963..4afe678
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@@ -412,45 -465,45 +425,11 @@@ public class GridDistributedTxPrepareRe
              if (!writer.writeByte(null, directType()))
                  return false;
  
 -            typeWritten = true;
 +            writer.onTypeWritten();
          }
  
 -        switch (state) {
 -            case 8:
 -                if (!writer.writeEnum("concurrency", concurrency))
 -                    return false;
 -
 -                state++;
 -
 -            case 9:
 -                if (!writer.writeByteArray("dhtVersBytes", dhtVersBytes))
 -                    return false;
 -
 -                state++;
 -
 -            case 10:
 -                if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes))
 -                    return false;
 -
 -                state++;
 -
 -            case 11:
 -                if (!writer.writeBoolean("invalidate", invalidate))
 -                    return false;
 -
 -                state++;
 +        switch (writer.state()) {
-             case 8:
-                 if (!writer.writeMessage("commitVer", commitVer))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 9:
-                 if (!writer.writeByte("concurrency", concurrency != null ? (byte)concurrency.ordinal() : -1))
-                     return false;
  
-                 writer.incrementState();
- 
-             case 10:
-                 if (!writer.writeByteArray("dhtVersBytes", dhtVersBytes))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 11:
-                 if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes))
-                     return false;
- 
-                 writer.incrementState();
- 
--            case 12:
-                 if (!writer.writeBoolean("invalidate", invalidate))
 -                if (!writer.writeEnum("isolation", isolation))
--                    return false;
--
-                 writer.incrementState();
 -                state++;
--
--            case 13:
-                 if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
 -                if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
--                    return false;
--
-                 writer.incrementState();
 -                state++;
  
              case 14:
                  if (!writer.writeBoolean("partLock", partLock))
@@@ -492,13 -545,19 +471,8 @@@
                  if (!writer.writeInt("txSize", txSize))
                      return false;
  
 -                state++;
 -
 -            case 21:
 -                if (!writer.writeMessage("writeVer", writeVer))
 -                    return false;
 +                writer.incrementState();
  
-             case 21:
-                 if (!writer.writeCollection("writesBytes", writesBytes, Type.BYTE_ARR))
 -                state++;
 -
 -            case 22:
 -                if (!writer.writeCollection("writesBytes", writesBytes, byte[].class))
--                    return false;
--
-                 writer.incrementState();
 -                state++;
  
          }
  
@@@ -512,62 -572,54 +486,8 @@@
          if (!super.readFrom(buf))
              return false;
  
 -        switch (state) {
 -            case 8:
 -                concurrency = reader.readEnum("concurrency", IgniteTxConcurrency.class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +        switch (readState) {
-             case 8:
-                 commitVer = reader.readMessage("commitVer");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 9:
-                 byte concurrencyOrd;
- 
-                 concurrencyOrd = reader.readByte("concurrency");
  
 -                state++;
 -
 -            case 9:
 -                dhtVersBytes = reader.readByteArray("dhtVersBytes");
 -
--                if (!reader.isLastRead())
--                    return false;
- 
-                 concurrency = IgniteTxConcurrency.fromOrdinal(concurrencyOrd);
--
-                 readState++;
 -                state++;
--
--            case 10:
-                 dhtVersBytes = reader.readByteArray("dhtVersBytes");
 -                grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes");
--
--                if (!reader.isLastRead())
--                    return false;
--
-                 readState++;
 -                state++;
--
--            case 11:
-                 grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes");
 -                invalidate = reader.readBoolean("invalidate");
--
--                if (!reader.isLastRead())
--                    return false;
--
-                 readState++;
 -                state++;
--
--            case 12:
-                 invalidate = reader.readBoolean("invalidate");
 -                isolation = reader.readEnum("isolation", IgniteTxIsolation.class);
--
--                if (!reader.isLastRead())
--                    return false;
--
-                 readState++;
 -                state++;
--
--            case 13:
-                 byte isolationOrd;
- 
-                 isolationOrd = reader.readByte("isolation");
 -                onePhaseCommit = reader.readBoolean("onePhaseCommit");
--
--                if (!reader.isLastRead())
--                    return false;
- 
-                 isolation = IgniteTxIsolation.fromOrdinal(isolationOrd);
--
-                 readState++;
 -                state++;
  
              case 14:
                  partLock = reader.readBoolean("partLock");
@@@ -623,16 -675,24 +543,8 @@@
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 -
 -            case 21:
 -                writeVer = reader.readMessage("writeVer");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 22:
 -                writesBytes = reader.readCollection("writesBytes", byte[].class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 +                readState++;
  
-             case 21:
-                 writesBytes = reader.readCollection("writesBytes", Type.BYTE_ARR);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
          }
  
          return true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 342d4b7,7856672..2c5174a
--- 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
@@@ -351,59 -377,59 +347,37 @@@ public class GridDhtLockRequest<K, V> e
              if (!writer.writeByte(null, directType()))
                  return false;
  
 -            typeWritten = true;
 +            writer.onTypeWritten();
          }
  
 -        switch (state) {
 -            case 22:
 -                if (!writer.writeLong("accessTtl", accessTtl))
 -                    return false;
 -
 -                state++;
 -
 -            case 23:
 -                if (!writer.writeBitSet("invalidateEntries", invalidateEntries))
 -                    return false;
 -
 -                state++;
 -
 -            case 24:
 -                if (!writer.writeIgniteUuid("miniId", miniId))
 -                    return false;
 -
 -                state++;
 -
 -            case 25:
 -                if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, byte[].class))
 -                    return false;
 +        switch (writer.state()) {
-             case 24:
-                 if (!writer.writeLong("accessTtl", accessTtl))
-                     return false;
- 
-                 writer.incrementState();
  
-             case 25:
-                 if (!writer.writeBitSet("invalidateEntries", invalidateEntries))
-                     return false;
- 
-                 writer.incrementState();
 -                state++;
  
              case 26:
-                 if (!writer.writeIgniteUuid("miniId", miniId))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 27:
-                 if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 28:
                  if (!writer.writeByteArray("ownedBytes", ownedBytes))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 29:
+             case 27:
                  if (!writer.writeBitSet("preloadKeys", preloadKeys))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 30:
+             case 28:
                  if (!writer.writeUuid("subjId", subjId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 31:
+             case 29:
                  if (!writer.writeInt("taskNameHash", taskNameHash))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 32:
+             case 30:
                  if (!writer.writeLong("topVer", topVer))
                      return false;
  
@@@ -421,72 -448,72 +395,42 @@@
          if (!super.readFrom(buf))
              return false;
  
 -        switch (state) {
 -            case 22:
 -                accessTtl = reader.readLong("accessTtl");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 23:
 -                invalidateEntries = reader.readBitSet("invalidateEntries");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 24:
 -                miniId = reader.readIgniteUuid("miniId");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 25:
 -                nearKeyBytes = reader.readCollection("nearKeyBytes", byte[].class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +        switch (readState) {
-             case 24:
-                 accessTtl = reader.readLong("accessTtl");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 25:
-                 invalidateEntries = reader.readBitSet("invalidateEntries");
  
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
 -                state++;
  
              case 26:
-                 miniId = reader.readIgniteUuid("miniId");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 27:
-                 nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 28:
                  ownedBytes = reader.readByteArray("ownedBytes");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 29:
+             case 27:
                  preloadKeys = reader.readBitSet("preloadKeys");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 30:
+             case 28:
                  subjId = reader.readUuid("subjId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 31:
+             case 29:
                  taskNameHash = reader.readInt("taskNameHash");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 32:
+             case 30:
                  topVer = reader.readLong("topVer");
  
                  if (!reader.isLastRead())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 28d60ac,ce5157b..81d94bf
--- 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
@@@ -358,83 -262,59 +234,53 @@@ public class GridDhtTxFinishRequest<K, 
              if (!writer.writeByte(null, directType()))
                  return false;
  
 -            typeWritten = true;
 +            writer.onTypeWritten();
          }
  
 -        switch (state) {
 -            case 19:
 -                if (!writer.writeEnum("isolation", isolation))
 -                    return false;
 -
 -                state++;
 -
 +        switch (writer.state()) {
-             case 21:
-                 if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 22:
+             case 20:
                  if (!writer.writeIgniteUuid("miniId", miniId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 23:
+             case 21:
                  if (!writer.writeUuid("nearNodeId", nearNodeId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 24:
-                 if (!writer.writeMessage("nearTtls", nearTtls))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 25:
-                 if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 26:
-                 if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
-                     return false;
- 
-                 writer.incrementState();
- 
 -            case 22:
 -                if (!writer.writeCollection("pendingVers", pendingVers, GridCacheVersion.class))
 +            case 27:
 +                if (!writer.writeCollection("pendingVers", pendingVers, Type.MSG))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 28:
+             case 23:
                  if (!writer.writeUuid("subjId", subjId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 29:
+             case 24:
                  if (!writer.writeBoolean("sysInvalidate", sysInvalidate))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 30:
+             case 25:
                  if (!writer.writeInt("taskNameHash", taskNameHash))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 31:
+             case 26:
                  if (!writer.writeLong("topVer", topVer))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 32:
-                 if (!writer.writeMessage("ttls", ttls))
-                     return false;
- 
-                 writer.incrementState();
- 
 -            case 27:
 +            case 33:
                  if (!writer.writeMessage("writeVer", writeVer))
                      return false;
  
@@@ -452,108 -333,72 +298,10 @@@
          if (!super.readFrom(buf))
              return false;
  
 -        switch (state) {
 -            case 19:
 -                isolation = reader.readEnum("isolation", IgniteTxIsolation.class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 20:
 -                miniId = reader.readIgniteUuid("miniId");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 21:
 -                nearNodeId = reader.readUuid("nearNodeId");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 +        switch (readState) {
-             case 21:
-                 byte isolationOrd;
- 
-                 isolationOrd = reader.readByte("isolation");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 isolation = IgniteTxIsolation.fromOrdinal(isolationOrd);
- 
-                 readState++;
- 
-             case 22:
-                 miniId = reader.readIgniteUuid("miniId");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 23:
-                 nearNodeId = reader.readUuid("nearNodeId");
- 
-                 if (!reader.isLastRead())
-                     return false;
  
-                 readState++;
- 
-             case 24:
-                 nearTtls = reader.readMessage("nearTtls");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 25:
-                 nearWritesBytes = reader.readCollection("nearWritesBytes", Type.BYTE_ARR);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 26:
-                 onePhaseCommit = reader.readBoolean("onePhaseCommit");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 27:
-                 pendingVers = reader.readCollection("pendingVers", Type.MSG);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 28:
-                 subjId = reader.readUuid("subjId");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 29:
-                 sysInvalidate = reader.readBoolean("sysInvalidate");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 30:
-                 taskNameHash = reader.readInt("taskNameHash");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 31:
-                 topVer = reader.readLong("topVer");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 32:
-                 ttls = reader.readMessage("ttls");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
 -            case 22:
 -                pendingVers = reader.readCollection("pendingVers", GridCacheVersion.class);
  
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 23:
 -                subjId = reader.readUuid("subjId");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 24:
 -                sysInvalidate = reader.readBoolean("sysInvalidate");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 25:
 -                taskNameHash = reader.readInt("taskNameHash");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 26:
 -                topVer = reader.readLong("topVer");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 27:
 +            case 33:
                  writeVer = reader.readMessage("writeVer");
  
                  if (!reader.isLastRead())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 0439a23,3d68505..9ab7a9f
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@@ -330,69 -365,69 +332,59 @@@ public class GridDhtTxPrepareRequest<K
                  if (!writer.writeIgniteUuid("futId", futId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 23:
+             case 24:
                  if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 24:
+             case 25:
                  if (!writer.writeBoolean("last", last))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 25:
+             case 26:
                  if (!writer.writeIgniteUuid("miniId", miniId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 26:
 -            case 27:
--                if (!writer.writeUuid("nearNodeId", nearNodeId))
--                    return false;
--
-                 writer.incrementState();
 -                state++;
 -
 -            case 28:
 -                if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, byte[].class))
 -                    return false;
  
-             case 27:
-                 if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR))
-                     return false;
 -                state++;
  
-                 writer.incrementState();
- 
-             case 28:
+             case 29:
                  if (!writer.writeMessage("nearXidVer", nearXidVer))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 29:
+             case 30:
                  if (!writer.writeByteArray("ownedBytes", ownedBytes))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 30:
+             case 31:
                  if (!writer.writeBitSet("preloadKeys", preloadKeys))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 31:
+             case 32:
                  if (!writer.writeUuid("subjId", subjId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 32:
+             case 33:
                  if (!writer.writeInt("taskNameHash", taskNameHash))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 33:
+             case 34:
                  if (!writer.writeLong("topVer", topVer))
                      return false;
  
@@@ -417,89 -453,89 +409,82 @@@
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 23:
+             case 24:
                  invalidateNearEntries = reader.readBitSet("invalidateNearEntries");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 24:
+             case 25:
                  last = reader.readBoolean("last");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 25:
+             case 26:
                  miniId = reader.readIgniteUuid("miniId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 26:
+             case 27:
                  nearNodeId = reader.readUuid("nearNodeId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 -
 -            case 28:
 -                nearWritesBytes = reader.readCollection("nearWritesBytes", byte[].class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +                readState++;
  
-             case 27:
-                 nearWritesBytes = reader.readCollection("nearWritesBytes", Type.BYTE_ARR);
- 
-                 if (!reader.isLastRead())
-                     return false;
 -                state++;
  
-                 readState++;
- 
-             case 28:
+             case 29:
                  nearXidVer = reader.readMessage("nearXidVer");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 29:
+             case 30:
                  ownedBytes = reader.readByteArray("ownedBytes");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 30:
+             case 31:
                  preloadKeys = reader.readBitSet("preloadKeys");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 31:
+             case 32:
                  subjId = reader.readUuid("subjId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 32:
+             case 33:
                  taskNameHash = reader.readInt("taskNameHash");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 33:
+             case 34:
                  topVer = reader.readLong("topVer");
  
                  if (!reader.isLastRead())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 98ebb4f,a87a9be..5d6b046
--- 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
@@@ -341,77 -364,77 +332,61 @@@ public class GridNearLockRequest<K, V> 
              if (!writer.writeByte(null, directType()))
                  return false;
  
 -            typeWritten = true;
 +            writer.onTypeWritten();
          }
  
 -        switch (state) {
 -            case 22:
 -                if (!writer.writeLong("accessTtl", accessTtl))
 -                    return false;
 +        switch (writer.state()) {
-             case 24:
-                 if (!writer.writeLong("accessTtl", accessTtl))
-                     return false;
  
-                 writer.incrementState();
 -                state++;
 -
 -            case 23:
 -                if (!writer.writeObjectArray("dhtVers", dhtVers, GridCacheVersion.class))
 -                    return false;
 -
 -                state++;
 -
 -            case 24:
 -                if (!writer.writeObjectArray("filterBytes", filterBytes, byte[].class))
 -                    return false;
 -
 -                state++;
  
              case 25:
-                 if (!writer.writeObjectArray("dhtVers", dhtVers, Type.MSG))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 26:
-                 if (!writer.writeObjectArray("filterBytes", filterBytes, Type.BYTE_ARR))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 27:
                  if (!writer.writeBoolean("hasTransforms", hasTransforms))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 28:
+             case 26:
                  if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 29:
+             case 27:
                  if (!writer.writeBoolean("implicitTx", implicitTx))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 30:
+             case 28:
                  if (!writer.writeIgniteUuid("miniId", miniId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 31:
+             case 29:
                  if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 32:
+             case 30:
                  if (!writer.writeUuid("subjId", subjId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 33:
+             case 31:
                  if (!writer.writeBoolean("syncCommit", syncCommit))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 34:
+             case 32:
                  if (!writer.writeInt("taskNameHash", taskNameHash))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 35:
+             case 33:
                  if (!writer.writeLong("topVer", topVer))
                      return false;
  
@@@ -429,96 -453,96 +404,66 @@@
          if (!super.readFrom(buf))
              return false;
  
 -        switch (state) {
 -            case 22:
 -                accessTtl = reader.readLong("accessTtl");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 23:
 -                dhtVers = reader.readObjectArray("dhtVers", GridCacheVersion.class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 24:
 -                filterBytes = reader.readObjectArray("filterBytes", byte[].class);
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 25:
 -                hasTransforms = reader.readBoolean("hasTransforms");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +        switch (readState) {
-             case 24:
-                 accessTtl = reader.readLong("accessTtl");
  
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 25:
-                 dhtVers = reader.readObjectArray("dhtVers", Type.MSG, GridCacheVersion.class);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
 -                state++;
  
              case 26:
-                 filterBytes = reader.readObjectArray("filterBytes", Type.BYTE_ARR, byte[].class);
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 27:
-                 hasTransforms = reader.readBoolean("hasTransforms");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 28:
                  implicitSingleTx = reader.readBoolean("implicitSingleTx");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 29:
+             case 27:
                  implicitTx = reader.readBoolean("implicitTx");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 30:
+             case 28:
                  miniId = reader.readIgniteUuid("miniId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 31:
+             case 29:
                  onePhaseCommit = reader.readBoolean("onePhaseCommit");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 32:
+             case 30:
                  subjId = reader.readUuid("subjId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 33:
+             case 31:
                  syncCommit = reader.readBoolean("syncCommit");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 34:
+             case 32:
                  taskNameHash = reader.readInt("taskNameHash");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 35:
+             case 33:
                  topVer = reader.readLong("topVer");
  
                  if (!reader.isLastRead())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index 6cb1fb9,e70f0cc2..80ac73e
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@@ -18,7 -18,7 +18,6 @@@
  package org.apache.ignite.internal.processors.cache.distributed.near;
  
  import org.apache.ignite.internal.processors.cache.distributed.*;
--import org.apache.ignite.internal.processors.cache.transactions.*;
  import org.apache.ignite.internal.processors.cache.version.*;
  import org.apache.ignite.internal.util.tostring.*;
  import org.apache.ignite.lang.*;
@@@ -168,41 -189,41 +163,24 @@@ public class GridNearTxFinishRequest<K
              if (!writer.writeByte(null, directType()))
                  return false;
  
 -            typeWritten = true;
 +            writer.onTypeWritten();
          }
  
 -        switch (state) {
 -            case 19:
 -                if (!writer.writeBoolean("explicitLock", explicitLock))
 -                    return false;
 -
 -                state++;
 -
 -            case 20:
 -                if (!writer.writeIgniteUuid("miniId", miniId))
 -                    return false;
 -
 -                state++;
 -
 -            case 21:
 -                if (!writer.writeBoolean("storeEnabled", storeEnabled))
 -                    return false;
 -
 -                state++;
 +        switch (writer.state()) {
-             case 21:
-                 if (!writer.writeBoolean("explicitLock", explicitLock))
-                     return false;
- 
-                 writer.incrementState();
  
              case 22:
-                 if (!writer.writeIgniteUuid("miniId", miniId))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 23:
-                 if (!writer.writeBoolean("storeEnabled", storeEnabled))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 24:
                  if (!writer.writeUuid("subjId", subjId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 25:
+             case 23:
                  if (!writer.writeInt("taskNameHash", taskNameHash))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 26:
+             case 24:
                  if (!writer.writeLong("topVer", topVer))
                      return false;
  
@@@ -220,48 -242,48 +198,26 @@@
          if (!super.readFrom(buf))
              return false;
  
 -        switch (state) {
 -            case 19:
 -                explicitLock = reader.readBoolean("explicitLock");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 20:
 -                miniId = reader.readIgniteUuid("miniId");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 21:
 -                storeEnabled = reader.readBoolean("storeEnabled");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +        switch (readState) {
-             case 21:
-                 explicitLock = reader.readBoolean("explicitLock");
  
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
 -                state++;
  
              case 22:
-                 miniId = reader.readIgniteUuid("miniId");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 23:
-                 storeEnabled = reader.readBoolean("storeEnabled");
- 
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 24:
                  subjId = reader.readUuid("subjId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 25:
+             case 23:
                  taskNameHash = reader.readInt("taskNameHash");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 26:
+             case 24:
                  topVer = reader.readLong("topVer");
  
                  if (!reader.isLastRead())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 3f5780e,7acbc4f..247cc70
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@@ -226,53 -283,65 +254,42 @@@ public class GridNearTxPrepareRequest<K
              if (!writer.writeByte(null, directType()))
                  return false;
  
 -            typeWritten = true;
 +            writer.onTypeWritten();
          }
  
 -        switch (state) {
 -            case 23:
 -                if (!writer.writeIgniteUuid("futId", futId))
 -                    return false;
 -
 -                state++;
 -
 -            case 24:
 -                if (!writer.writeBoolean("implicitSingle", implicitSingle))
 -                    return false;
 -
 -                state++;
 -
 -            case 25:
 -                if (!writer.writeBoolean("last", last))
 -                    return false;
 -
 -                state++;
 -
 -            case 26:
 -                if (!writer.writeCollection("lastBackups", lastBackups, UUID.class))
 -                    return false;
 -
 -                state++;
 +        switch (writer.state()) {
-             case 22:
-                 if (!writer.writeIgniteUuid("futId", futId))
-                     return false;
- 
-                 writer.incrementState();
  
-             case 23:
-                 if (!writer.writeBoolean("last", last))
-                     return false;
- 
-                 writer.incrementState();
- 
-             case 24:
-                 if (!writer.writeCollection("lastBackups", lastBackups, Type.UUID))
+             case 27:
+                 if (!writer.writeIgniteUuid("miniId", miniId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 25:
-                 if (!writer.writeIgniteUuid("miniId", miniId))
+             case 28:
+                 if (!writer.writeBoolean("near", near))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 26:
-                 if (!writer.writeBoolean("near", near))
+             case 29:
+                 if (!writer.writeBoolean("retVal", retVal))
                      return false;
  
-                 writer.incrementState();
+                 state++;
  
-             case 27:
+             case 30:
                  if (!writer.writeUuid("subjId", subjId))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 28:
+             case 31:
                  if (!writer.writeInt("taskNameHash", taskNameHash))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
-             case 29:
+             case 32:
                  if (!writer.writeLong("topVer", topVer))
                      return false;
  
@@@ -297,57 -367,73 +314,44 @@@
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 -
 -            case 24:
 -                implicitSingle = reader.readBoolean("implicitSingle");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 25:
 -                last = reader.readBoolean("last");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 -
 -                state++;
 -
 -            case 26:
 -                lastBackups = reader.readCollection("lastBackups", UUID.class);
 +                readState++;
  
-             case 23:
-                 last = reader.readBoolean("last");
- 
--                if (!reader.isLastRead())
--                    return false;
- 
-                 readState++;
  
-             case 24:
-                 lastBackups = reader.readCollection("lastBackups", Type.UUID);
 -                state++;
  
-                 if (!reader.isLastRead())
-                     return false;
- 
-                 readState++;
- 
-             case 25:
+             case 27:
                  miniId = reader.readIgniteUuid("miniId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 26:
+             case 28:
                  near = reader.readBoolean("near");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 -
 -            case 29:
 -                retVal = reader.readBoolean("retVal");
 -
 -                if (!reader.isLastRead())
 -                    return false;
 +                readState++;
  
-             case 27:
 -                state++;
+ 
+             case 30:
                  subjId = reader.readUuid("subjId");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 28:
+             case 31:
                  taskNameHash = reader.readInt("taskNameHash");
  
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
-             case 29:
+             case 32:
                  topVer = reader.readLong("topVer");
  
                  if (!reader.isLastRead())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac3769be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 9c4ef78,9ab29cc..a6bd4bc
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@@ -242,38 -331,50 +301,44 @@@ public class GridNearTxPrepareResponse<
                  if (!writer.writeMessage("dhtVer", dhtVer))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
              case 11:
-                 if (!writer.writeIgniteUuid("futId", futId))
+                 if (!writer.writeByteArray("filterFailedKeyBytes", filterFailedKeyBytes))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
              case 12:
 -                if (!writer.writeIgniteUuid("futId", futId))
 +                if (!writer.writeCollection("invalidParts", invalidParts, Type.INT))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
              case 13:
-                 if (!writer.writeIgniteUuid("miniId", miniId))
+                 if (!writer.writeCollection("invalidParts", invalidParts, int.class))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
              case 14:
 -                if (!writer.writeIgniteUuid("miniId", miniId))
 +                if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, Type.BYTE_ARR))
                      return false;
  
 -                state++;
 +                writer.incrementState();
  
              case 15:
 -                if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, byte[].class))
 +                if (!writer.writeCollection("pending", pending, Type.MSG))
                      return false;
  
 -                state++;
 -
 -            case 16:
 -                if (!writer.writeCollection("pending", pending, GridCacheVersion.class))
 -                    return false;
 -
 -                state++;
 +                writer.incrementState();
  
+             case 17:
+                 if (!writer.writeByteArray("retValBytes", retValBytes))
+                     return false;
+ 
+                 state++;
+ 
          }
  
          return true;
@@@ -293,10 -395,10 +358,10 @@@
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 11:
-                 futId = reader.readIgniteUuid("futId");
+                 filterFailedKeyBytes = reader.readByteArray("filterFailedKeyBytes");
  
                  if (!reader.isLastRead())
                      return false;
@@@ -309,10 -411,10 +374,10 @@@
                  if (!reader.isLastRead())
                      return false;
  
 -                state++;
 +                readState++;
  
              case 13:
-                 miniId = reader.readIgniteUuid("miniId");
+                 invalidParts = reader.readCollection("invalidParts", int.class);
  
                  if (!reader.isLastRead())
                      return false;


Mime
View raw message