Merge branch sprint-2 into ignite-264
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/870cc58e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/870cc58e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/870cc58e Branch: refs/heads/ignite-264 Commit: 870cc58e08673e768319bffaf5c77a83d32e5a4c Parents: 99d8d59 7bbfeb1 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Feb 24 14:40:36 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Feb 24 14:40:36 2015 -0800 ---------------------------------------------------------------------- README.md | 2 - bin/setup-hadoop.sh | 2 +- examples/pom-standalone.xml | 2 +- .../examples/datagrid/CacheApiExample.java | 4 +- .../examples/datagrid/CacheQueryExample.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 8 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 133 +-- .../java/org/apache/ignite/cache/GridCache.java | 48 - .../ignite/internal/ClusterGroupAdapter.java | 889 ------------------- .../apache/ignite/internal/ClusterGroupEx.java | 44 - .../internal/ClusterNodeLocalMapImpl.java | 103 --- .../ignite/internal/GridJobCancelRequest.java | 26 +- .../ignite/internal/GridJobExecuteRequest.java | 70 +- .../ignite/internal/GridJobExecuteResponse.java | 34 +- .../ignite/internal/GridJobSiblingsRequest.java | 24 +- .../internal/GridJobSiblingsResponse.java | 22 +- .../ignite/internal/GridKernalContext.java | 8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../apache/ignite/internal/GridKillTask.java | 103 --- .../ignite/internal/GridTaskCancelRequest.java | 22 +- .../ignite/internal/GridTaskSessionRequest.java | 26 +- .../ignite/internal/IgniteClusterAsyncImpl.java | 261 ------ .../ignite/internal/IgniteComputeImpl.java | 1 + .../ignite/internal/IgniteEventsImpl.java | 1 + .../org/apache/ignite/internal/IgniteEx.java | 14 +- .../apache/ignite/internal/IgniteKernal.java | 618 +++---------- .../ignite/internal/IgniteMessagingImpl.java | 1 + .../ignite/internal/IgniteServicesImpl.java | 1 + .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../internal/cluster/ClusterGroupAdapter.java | 866 ++++++++++++++++++ .../ignite/internal/cluster/ClusterGroupEx.java | 44 + .../cluster/ClusterNodeLocalMapImpl.java | 104 +++ .../cluster/IgniteClusterAsyncImpl.java | 292 ++++++ .../internal/cluster/IgniteClusterEx.java | 27 + .../internal/cluster/IgniteClusterImpl.java | 527 +++++++++++ .../ignite/internal/cluster/IgniteKillTask.java | 103 +++ .../internal/direct/DirectByteBufferStream.java | 44 +- .../internal/direct/DirectMessageReader.java | 33 +- .../internal/direct/DirectMessageWriter.java | 23 +- .../direct/DirectMessageWriterState.java | 13 +- .../internal/executor/GridExecutorService.java | 1 + .../internal/managers/GridManagerAdapter.java | 4 +- .../checkpoint/GridCheckpointRequest.java | 26 +- .../managers/communication/GridIoManager.java | 30 +- .../managers/communication/GridIoMessage.java | 38 +- .../communication/GridIoMessageFactory.java | 33 +- .../communication/GridIoUserMessage.java | 38 +- .../deployment/GridDeploymentCommunication.java | 4 +- .../deployment/GridDeploymentInfoBean.java | 35 +- .../deployment/GridDeploymentRequest.java | 34 +- .../deployment/GridDeploymentResponse.java | 26 +- .../discovery/GridDiscoveryManager.java | 26 +- .../eventstorage/GridEventStorageMessage.java | 42 +- .../processors/cache/CacheProjection.java | 5 + .../processors/cache/GridCacheAdapter.java | 74 +- .../processors/cache/GridCacheContext.java | 5 + .../cache/GridCacheEvictionRequest.java | 26 +- .../cache/GridCacheEvictionResponse.java | 30 +- .../processors/cache/GridCacheMapEntry.java | 620 +++++++------ .../processors/cache/GridCacheMessage.java | 21 +- .../processors/cache/GridCacheProcessor.java | 4 + .../processors/cache/GridCacheProjectionEx.java | 47 + .../cache/GridCacheProjectionImpl.java | 16 + .../processors/cache/GridCacheProxyImpl.java | 20 +- .../processors/cache/GridCacheUtils.java | 46 +- .../processors/cache/GridCacheValueBytes.java | 24 +- .../processors/cache/IgniteCacheProxy.java | 14 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 32 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 28 +- .../distributed/GridCacheTtlUpdateRequest.java | 58 +- .../distributed/GridDistributedBaseMessage.java | 49 +- .../GridDistributedCacheAdapter.java | 4 +- .../distributed/GridDistributedLockRequest.java | 74 +- .../GridDistributedLockResponse.java | 36 +- .../GridDistributedTxFinishRequest.java | 58 +- .../GridDistributedTxFinishResponse.java | 24 +- .../GridDistributedTxPrepareRequest.java | 88 +- .../GridDistributedTxPrepareResponse.java | 26 +- .../GridDistributedTxRemoteAdapter.java | 67 +- .../GridDistributedUnlockRequest.java | 30 +- .../dht/GridDhtAffinityAssignmentRequest.java | 22 +- .../dht/GridDhtAffinityAssignmentResponse.java | 24 +- .../distributed/dht/GridDhtCacheAdapter.java | 16 +- .../distributed/dht/GridDhtLockRequest.java | 56 +- .../distributed/dht/GridDhtLockResponse.java | 52 +- .../distributed/dht/GridDhtTxFinishRequest.java | 58 +- .../dht/GridDhtTxFinishResponse.java | 22 +- .../dht/GridDhtTxPrepareRequest.java | 54 +- .../dht/GridDhtTxPrepareResponse.java | 56 +- .../distributed/dht/GridDhtUnlockRequest.java | 30 +- .../dht/atomic/GridDhtAtomicCache.java | 54 +- .../GridDhtAtomicDeferredUpdateResponse.java | 26 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 92 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 32 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 122 +-- .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +- .../atomic/GridNearAtomicUpdateResponse.java | 54 +- .../dht/preloader/GridDhtForceKeysRequest.java | 32 +- .../dht/preloader/GridDhtForceKeysResponse.java | 32 +- .../GridDhtPartitionDemandMessage.java | 36 +- .../preloader/GridDhtPartitionExchangeId.java | 27 +- .../GridDhtPartitionSupplyMessage.java | 40 +- .../GridDhtPartitionsAbstractMessage.java | 19 +- .../preloader/GridDhtPartitionsFullMessage.java | 24 +- .../GridDhtPartitionsSingleMessage.java | 22 +- .../GridDhtPartitionsSingleRequest.java | 18 +- .../distributed/near/GridNearAtomicCache.java | 15 +- .../distributed/near/GridNearCacheAdapter.java | 8 +- .../distributed/near/GridNearGetRequest.java | 47 +- .../distributed/near/GridNearGetResponse.java | 38 +- .../distributed/near/GridNearLockRequest.java | 70 +- .../distributed/near/GridNearLockResponse.java | 58 +- .../near/GridNearTxFinishRequest.java | 34 +- .../near/GridNearTxFinishResponse.java | 26 +- .../near/GridNearTxPrepareRequest.java | 50 +- .../near/GridNearTxPrepareResponse.java | 70 +- .../distributed/near/GridNearUnlockRequest.java | 18 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../cache/query/GridCacheQueryRequest.java | 58 +- .../cache/query/GridCacheQueryResponse.java | 40 +- .../continuous/CacheContinuousQueryManager.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 58 +- .../cache/transactions/IgniteTxEntry.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 48 +- .../cache/version/GridCacheVersion.java | 32 +- .../GridCacheVersionConflictContext.java | 35 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../clock/GridClockDeltaSnapshotMessage.java | 28 +- .../processors/clock/GridClockDeltaVersion.java | 24 +- .../closure/GridClosureProcessor.java | 82 +- .../continuous/GridContinuousMessage.java | 28 +- .../dataload/GridDataLoadRequest.java | 50 +- .../dataload/GridDataLoadResponse.java | 26 +- .../dataload/IgniteDataLoaderImpl.java | 4 +- .../datastructures/GridCacheSetImpl.java | 4 +- .../dr/GridDrDataLoadCacheUpdater.java | 6 +- .../processors/igfs/IgfsAckMessage.java | 26 +- .../internal/processors/igfs/IgfsBlockKey.java | 28 +- .../processors/igfs/IgfsBlocksMessage.java | 30 +- .../igfs/IgfsCommunicationMessage.java | 18 +- .../processors/igfs/IgfsDeleteMessage.java | 24 +- .../processors/igfs/IgfsFileAffinityRange.java | 30 +- .../igfs/IgfsFragmentizerRequest.java | 28 +- .../igfs/IgfsFragmentizerResponse.java | 22 +- .../processors/igfs/IgfsSyncMessage.java | 24 +- .../plugin/IgnitePluginProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 4 +- .../processors/rest/GridRestProcessor.java | 85 +- .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../cache/GridCacheQueryCommandHandler.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../handlers/task/GridTaskResultRequest.java | 24 +- .../handlers/task/GridTaskResultResponse.java | 28 +- .../top/GridTopologyCommandHandler.java | 2 +- .../securesession/GridSecureSession.java | 60 -- .../GridSecureSessionProcessor.java | 59 -- .../os/GridOsSecureSessionProcessor.java | 61 -- .../security/GridSecurityContext.java | 251 ------ .../security/GridSecurityProcessor.java | 6 +- .../processors/security/SecurityContext.java | 56 ++ .../security/os/GridOsSecurityProcessor.java | 146 +-- .../streamer/GridStreamerCancelRequest.java | 22 +- .../streamer/GridStreamerContextImpl.java | 2 +- .../streamer/GridStreamerExecutionRequest.java | 38 +- .../streamer/GridStreamerResponse.java | 24 +- .../processors/streamer/IgniteStreamerImpl.java | 4 +- .../ignite/internal/util/GridByteArrayList.java | 24 +- .../ignite/internal/util/GridLongList.java | 24 +- .../ignite/internal/util/IgniteUtils.java | 32 +- .../internal/util/future/GridFutureAdapter.java | 8 +- .../util/future/GridFutureAdapterEx.java | 3 +- .../internal/util/ipc/IpcToNioAdapter.java | 4 +- .../util/nio/GridCommunicationClient.java | 2 +- .../internal/util/nio/GridDirectParser.java | 33 +- .../internal/util/nio/GridNioMessageReader.java | 2 +- .../internal/util/nio/GridNioMessageWriter.java | 4 +- .../ignite/internal/util/nio/GridNioServer.java | 59 +- .../util/nio/GridShmemCommunicationClient.java | 2 +- .../util/nio/GridTcpCommunicationClient.java | 2 +- .../util/nio/GridTcpNioCommunicationClient.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../visor/cache/VisorCacheClearTask.java | 3 +- .../visor/cache/VisorCacheCompactTask.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 40 +- .../visor/cache/VisorCacheLoadTask.java | 18 +- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../internal/visor/cache/VisorCacheMetrics.java | 3 +- .../visor/cache/VisorCachePreloadTask.java | 4 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../cache/VisorCacheTypeFieldMetadata.java | 1 - .../visor/cache/VisorCacheTypeMetadata.java | 12 +- .../compute/VisorComputeCancelSessionsTask.java | 2 +- .../compute/VisorComputeMonitoringHolder.java | 6 +- .../compute/VisorComputeResetMetricsTask.java | 2 +- .../VisorComputeToggleMonitoringTask.java | 4 +- .../internal/visor/debug/VisorThreadInfo.java | 14 +- .../event/VisorGridAuthenticationEvent.java | 106 --- .../event/VisorGridAuthorizationEvent.java | 89 -- .../visor/event/VisorGridEventsLost.java | 2 +- .../event/VisorGridSecuritySessionEvent.java | 2 +- .../internal/visor/igfs/VisorIgfsEndpoint.java | 5 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 6 +- .../visor/igfs/VisorIgfsProfilerTask.java | 34 +- .../VisorIgfsProfilerUniformityCounters.java | 15 +- .../visor/igfs/VisorIgfsResetMetricsTask.java | 2 +- .../visor/igfs/VisorIgfsSamplingStateTask.java | 2 +- .../internal/visor/log/VisorLogSearchTask.java | 18 +- .../visor/misc/VisorResolveHostNameTask.java | 6 +- .../node/VisorCacheQueryConfiguration.java | 141 +++ .../node/VisorExecutorServiceConfiguration.java | 1 - .../visor/node/VisorGridConfiguration.java | 18 + .../visor/node/VisorNodeDataCollectorJob.java | 6 +- .../node/VisorNodeEventsCollectorTask.java | 6 +- .../internal/visor/node/VisorNodeGcTask.java | 2 +- .../internal/visor/node/VisorNodePingTask.java | 2 +- .../visor/node/VisorQueryConfiguration.java | 183 ++++ .../visor/node/VisorSpisConfiguration.java | 2 +- .../visor/query/VisorQueryCleanupTask.java | 3 +- .../visor/query/VisorQueryNextPageTask.java | 8 +- .../visor/query/VisorQueryResultEx.java | 2 +- .../internal/visor/query/VisorQueryTask.java | 10 +- .../internal/visor/query/VisorQueryUtils.java | 18 +- .../internal/visor/util/VisorEventMapper.java | 3 + .../internal/visor/util/VisorTaskUtils.java | 23 +- .../optimized/optimized-classnames.properties | 71 +- .../extensions/communication/Message.java | 58 ++ .../communication/MessageAdapter.java | 143 --- .../MessageCollectionItemType.java | 101 +++ .../communication/MessageFactory.java | 4 +- .../communication/MessageFormatter.java | 3 +- .../extensions/communication/MessageReader.java | 24 +- .../extensions/communication/MessageWriter.java | 26 +- .../jobstealing/JobStealingRequest.java | 22 +- .../communication/tcp/TcpCommunicationSpi.java | 80 +- .../DiscoverySpiNodeAuthenticator.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 139 +-- .../core/src/main/resources/ignite.properties | 3 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 81 +- .../ignite/internal/ClusterMetricsSelfTest.java | 2 +- .../GridJobMasterLeaveAwareSelfTest.java | 12 +- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../internal/GridProjectionAbstractTest.java | 2 +- .../ignite/internal/GridProjectionSelfTest.java | 2 +- .../apache/ignite/internal/GridSelfTest.java | 15 +- .../GridCommunicationSendMessageSelfTest.java | 13 +- .../communication/GridIoManagerSelfTest.java | 18 +- .../GridDeploymentMessageCountSelfTest.java | 2 +- .../GridAffinityProcessorAbstractSelfTest.java | 7 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 28 +- .../cache/GridCacheAffinityApiSelfTest.java | 18 +- .../GridCacheAtomicMessageCountSelfTest.java | 2 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 2 +- ...ridCacheReplicatedSynchronousCommitTest.java | 2 +- .../cache/GridCacheVersionMultinodeTest.java | 65 +- .../IgniteCacheAbstractStopBusySelfTest.java | 5 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 2 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 4 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 4 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 13 +- .../GridCacheAtomicTimeoutSelfTest.java | 3 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtEntrySelfTest.java | 2 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 2 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 2 +- .../GridCacheDhtPreloadMessageCountTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 4 +- .../near/GridCacheNearReadersSelfTest.java | 18 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 12 +- ...titionedExplicitLockNodeFailureSelfTest.java | 4 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../near/IgniteCacheNearReadCommittedTest.java | 3 + .../GridCacheReplicatedInvalidateSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 14 +- .../closure/GridClosureProcessorRemoteTest.java | 2 +- .../closure/GridClosureProcessorSelfTest.java | 14 +- .../continuous/GridEventConsumeSelfTest.java | 18 +- .../continuous/GridMessageListenSelfTest.java | 14 +- .../processors/igfs/IgfsSizeSelfTest.java | 7 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../communication/GridIoManagerBenchmark0.java | 6 +- .../communication/GridTestMessage.java | 9 +- .../marshaller/GridMarshallerAbstractTest.java | 14 +- .../ignite/messaging/GridMessagingSelfTest.java | 3 +- .../spi/GridTcpSpiForwardingSelfTest.java | 4 +- .../GridAbstractCommunicationSelfTest.java | 22 +- .../spi/communication/GridTestMessage.java | 25 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +- .../GridTcpCommunicationSpiAbstractTest.java | 2 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 16 +- .../tcp/GridTcpCommunicationSpiLanTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 22 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 10 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 10 +- .../discovery/AbstractDiscoverySelfTest.java | 15 - .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 23 - .../tcp/TcpDiscoverySpiWildcardSelfTest.java | 2 +- .../testframework/GridSpiTestContext.java | 6 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../ignite/testframework/junits/IgniteMock.java | 1 - .../junits/spi/GridSpiAbstractTest.java | 12 - .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +- modules/hadoop/pom.xml | 6 - .../client/hadoop/GridHadoopClientProtocol.java | 3 +- .../hadoop/GridHadoopDefaultJobInfo.java | 5 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 227 +---- .../GridCacheAbstractFieldsQuerySelfTest.java | 7 +- .../cache/GridCacheQueryMetricsSelfTest.java | 4 +- .../near/GridCachePartitionedQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 6 +- .../apache/ignite/cache/spring/SpringCache.java | 2 +- .../resource/GridServiceInjectionSelfTest.java | 4 +- .../visor/commands/ack/VisorAckCommand.scala | 4 +- .../commands/alert/VisorAlertCommand.scala | 11 +- .../commands/cache/VisorCacheClearCommand.scala | 4 +- .../commands/cache/VisorCacheCommand.scala | 6 +- .../cache/VisorCacheCompactCommand.scala | 4 +- .../commands/cache/VisorCacheScanCommand.scala | 4 +- .../commands/cache/VisorCacheSwapCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 4 +- .../commands/disco/VisorDiscoveryCommand.scala | 6 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 4 +- .../visor/commands/kill/VisorKillCommand.scala | 12 +- .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../visor/commands/ping/VisorPingCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 12 +- .../commands/top/VisorTopologyCommand.scala | 4 +- .../visor/commands/vvm/VisorVvmCommand.scala | 6 +- .../scala/org/apache/ignite/visor/visor.scala | 32 +- pom.xml | 4 +- readme.md | 2 - 346 files changed, 6670 insertions(+), 5746 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java index 7584c3b,c8fb590..2074aca --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java @@@ -173,33 -176,33 +176,33 @@@ public class GridCacheOptimisticCheckPr if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 9: + case 7: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 10: + case 8: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 11: + case 9: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 12: + case 10: txNum = reader.readInt("txNum"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java index bc22a5d,a575be5..1696953 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java @@@ -136,17 -139,17 +139,17 @@@ public class GridCacheOptimisticCheckPr if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 9: + case 7: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 10: + case 8: success = reader.readBoolean("success"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 97269fe,de92e2c..69f65c0 --- 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 @@@ -413,25 -482,25 +424,25 @@@ public class GridDistributedLockRequest if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 11: + case 8: isInvalidate = reader.readBoolean("isInvalidate"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 12: + case 9: isRead = reader.readBoolean("isRead"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 13: + case 10: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@@ -449,17 -518,17 +460,17 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 15: + case 12: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 16: + case 13: nodeId = reader.readUuid("nodeId"); if (!reader.isLastRead()) @@@ -473,25 -550,25 +492,25 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 19: + case 15: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 20: + case 16: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 21: + case 17: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index 6029c8f,bd52d4b..5a35bc4 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@@ -323,9 -331,9 +326,9 @@@ public class GridDistributedLockRespons if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 9: + case 7: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 9662251,8f954e8..506d64f --- 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 @@@ -263,17 -356,17 +274,17 @@@ public class GridDistributedTxFinishReq if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 10: + case 7: commitVer = reader.readMessage("commitVer"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 11: + case 8: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@@ -287,41 -388,41 +306,41 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 14: + case 10: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 15: + case 11: syncRollback = reader.readBoolean("syncRollback"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 16: + case 12: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 17: + case 13: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 18: + case 14: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 bdfd3e7,8f3742b..90ecdef --- 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 @@@ -492,9 -545,9 +501,9 @@@ public class GridDistributedTxPrepareRe concurrency = TransactionConcurrency.fromOrdinal(concurrencyOrd); - readState++; + reader.incrementState(); - case 9: + case 7: dhtVersBytes = reader.readByteArray("dhtVersBytes"); if (!reader.isLastRead()) @@@ -508,9 -569,9 +525,9 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 12: + case 9: byte isolationOrd; isolationOrd = reader.readByte("isolation"); @@@ -520,9 -581,9 +537,9 @@@ isolation = TransactionIsolation.fromOrdinal(isolationOrd); - readState++; + reader.incrementState(); - case 13: + case 10: onePhaseCommit = reader.readBoolean("onePhaseCommit"); if (!reader.isLastRead()) @@@ -536,49 -597,57 +553,57 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); + + case 15: + readsBytes = reader.readCollection("readsBytes", MessageCollectionItemType.BYTE_ARR); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); - case 16: + case 12: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 17: + case 13: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 18: + case 14: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 19: + case 15: txNodesBytes = reader.readByteArray("txNodesBytes"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 20: + case 16: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 21: + case 17: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index c8be6f7,e7b88cc..3d53f94 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@@ -194,9 -197,9 +197,9 @@@ public class GridDistributedTxPrepareRe if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 9: + case 7: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index ef4f302,dbf82dd..e6c5893 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@@ -585,26 -606,32 +584,28 @@@ public class GridDistributedTxRemoteAda } // No-op. else { - if (txEntry.ttl() != -1L) - cached.updateTtl(null, txEntry.ttl()); - assert !groupLock() || txEntry.groupLockEntry() || ownsLock(txEntry.cached()): - "Transaction does not own lock for group lock entry during commit [tx=" + - this + ", txEntry=" + txEntry + ']'; - + if (conflictCtx == null || !conflictCtx.isUseOld()) { + if (txEntry.ttl() != CU.TTL_NOT_CHANGED) + cached.updateTtl(null, txEntry.ttl()); - if (nearCached != null) { - V val0 = null; - byte[] valBytes0 = null; + if (nearCached != null) { + V val0 = null; + byte[] valBytes0 = null; - GridCacheValueBytes valBytesTuple = cached.valueBytes(); + GridCacheValueBytes valBytesTuple = cached.valueBytes(); - if (!valBytesTuple.isNull()) { - if (valBytesTuple.isPlain()) - val0 = (V)valBytesTuple.get(); + if (!valBytesTuple.isNull()) { + if (valBytesTuple.isPlain()) + val0 = (V) valBytesTuple.get(); + else + valBytes0 = valBytesTuple.get(); + } else - valBytes0 = valBytesTuple.get(); - } - else - val0 = cached.rawGet(); + val0 = cached.rawGet(); - nearCached.updateOrEvict(xidVer, val0, valBytes0, cached.expireTime(), - cached.ttl(), nodeId); + nearCached.updateOrEvict(xidVer, val0, valBytes0, cached.expireTime(), + cached.ttl(), nodeId); + } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 9de2816,b4337f8..5c289ae --- 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 @@@ -374,17 -427,17 +377,17 @@@ public class GridDhtLockRequest<K, V> e if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 23: + case 19: invalidateEntries = reader.readBitSet("invalidateEntries"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 24: + case 20: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@@ -406,25 -467,25 +417,25 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 28: + case 23: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 29: + case 24: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 30: + case 25: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index 75cbf04,6c72860..e812b67 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@@ -256,9 -259,9 +259,9 @@@ public class GridDhtLockResponse<K, V> if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 12: + case 10: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 6845d27,2835844..0d1739f --- 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 @@@ -303,17 -318,17 +298,17 @@@ public class GridDhtTxFinishRequest<K, isolation = TransactionIsolation.fromOrdinal(isolationOrd); - readState++; + reader.incrementState(); - case 20: + case 17: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 21: + case 18: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@@ -327,33 -350,33 +330,33 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 24: + case 20: sysInvalidate = reader.readBoolean("sysInvalidate"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 25: + case 21: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 26: + case 22: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 27: + case 23: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index 408933e,1dcd51f..2ba03da --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@@ -135,22 -95,17 +135,25 @@@ public class GridDhtTxFinishResponse<K } /** {@inheritDoc} */ - @Override public boolean readFrom(ByteBuffer buf) { + @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) { reader.setBuffer(buf); - if (!super.readFrom(buf)) + if (!reader.beforeMessageRead()) return false; - switch (readState) { + if (!super.readFrom(buf, reader)) + return false; + + switch (reader.state()) { case 5: + errBytes = reader.readByteArray("errBytes"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 6: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 3905523,0216774..447d3fe --- 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 @@@ -415,33 -422,33 +418,33 @@@ public class GridDhtTxPrepareRequest<K if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 24: + case 20: invalidateNearEntries = reader.readBitSet("invalidateNearEntries"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 25: + case 21: last = reader.readBoolean("last"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 26: + case 22: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 27: + case 23: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@@ -455,49 -462,49 +458,49 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 29: + case 25: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 30: + case 26: ownedBytes = reader.readByteArray("ownedBytes"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 31: + case 27: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 32: + case 28: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 33: + case 29: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 34: + case 30: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index ccca063,99e1b00..b8e4ec5 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@@ -278,9 -281,9 +281,9 @@@ public class GridDhtTxPrepareResponse<K if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 12: + case 10: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 7ae59b5,d1ae174..a6cc18e --- 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 @@@ -413,33 -446,33 +416,33 @@@ public class GridNearLockRequest<K, V> if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 25: + case 21: hasTransforms = reader.readBoolean("hasTransforms"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 26: + case 22: implicitSingleTx = reader.readBoolean("implicitSingleTx"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 27: + case 23: implicitTx = reader.readBoolean("implicitTx"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 28: + case 24: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@@ -453,25 -494,25 +464,25 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 31: + case 26: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 32: + case 27: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 33: + case 28: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java index 3b67a00,b60c539..19519dd --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java @@@ -213,9 -247,9 +222,9 @@@ public class GridNearLockResponse<K, V if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 12: + case 10: filterRes = reader.readBooleanArray("filterRes"); if (!reader.isLastRead()) @@@ -229,9 -263,9 +238,9 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 14: + case 12: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 3bc87d2,f29cfea..9080d44 --- 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 @@@ -215,41 -225,41 +218,41 @@@ public class GridNearTxFinishRequest<K if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 20: + case 16: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 21: + case 17: storeEnabled = reader.readBoolean("storeEnabled"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 22: + case 18: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 23: + case 19: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 24: + case 20: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 797bb15,ca82996..eaf02db --- 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 @@@ -332,17 -339,17 +335,17 @@@ public class GridNearTxPrepareRequest<K if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 24: + case 20: implicitSingle = reader.readBoolean("implicitSingle"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 25: + case 21: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@@ -356,49 -363,49 +359,49 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 27: + case 23: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 28: + case 24: near = reader.readBoolean("near"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 29: + case 25: retVal = reader.readBoolean("retVal"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 30: + case 26: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 31: + case 27: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 32: + case 28: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/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 ea2f689,3776fac..dc77bd3 --- 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 @@@ -335,17 -367,17 +344,17 @@@ public class GridNearTxPrepareResponse< if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 11: + case 9: filterFailedKeyBytes = reader.readByteArray("filterFailedKeyBytes"); if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 12: + case 10: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@@ -359,9 -391,9 +368,9 @@@ if (!reader.isLastRead()) return false; - readState++; + reader.incrementState(); - case 14: + case 12: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index a1e7e86,0f1366b..6bb768c --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@@ -832,9 -852,17 +832,16 @@@ public class IgniteTxEntry<K, V> implem val.writeTo(out); out.writeLong(ttl); - out.writeLong(conflictExpireTime); CU.writeVersion(out, explicitVer); - out.writeBoolean(grpLock); + + if (conflictExpireTime != CU.EXPIRE_TIME_CALCULATE) { + out.writeBoolean(true); + out.writeLong(conflictExpireTime); + } + else + out.writeBoolean(false); + CU.writeVersion(out, conflictVer); out.writeObject(transferExpiryPlc ? new IgniteExternalizableExpiryPolicy(expiryPlc) : null); @@@ -861,9 -889,11 +868,10 @@@ val.readFrom(in); ttl = in.readLong(); - conflictExpireTime = in.readLong(); explicitVer = CU.readVersion(in); - grpLock = in.readBoolean(); + + conflictExpireTime = in.readBoolean() ? in.readLong() : CU.EXPIRE_TIME_CALCULATE; conflictVer = CU.readVersion(in); expiryPlc = (ExpiryPolicy)in.readObject(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/870cc58e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ----------------------------------------------------------------------
