Merge branch 'ignite-1.5' into ignite-426-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8925ccef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8925ccef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8925ccef Branch: refs/heads/ignite-426-2 Commit: 8925ccef7cbc4ee327492157bb2274c4f5a303df Parents: 803a414 175b7f2 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Nov 18 20:44:52 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Nov 18 20:44:52 2015 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 11 +- .../apache/ignite/internal/IgniteKernal.java | 9 +- .../communication/GridIoMessageFactory.java | 6 + .../discovery/GridDiscoveryManager.java | 2 +- .../processors/cache/GridCacheAdapter.java | 48 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheGateway.java | 1 - .../processors/cache/GridCacheMapEntry.java | 11 +- .../processors/cache/GridCacheMvcc.java | 7 - .../processors/cache/GridCacheMvccManager.java | 42 - .../GridCachePartitionExchangeManager.java | 55 +- .../cache/GridCacheSharedContext.java | 38 +- .../distributed/GridCacheTxRecoveryFuture.java | 41 +- .../distributed/GridDistributedBaseMessage.java | 56 - .../distributed/GridDistributedLockRequest.java | 6 - .../GridDistributedLockResponse.java | 32 +- .../distributed/GridDistributedTxMapping.java | 78 - .../GridDistributedTxPrepareRequest.java | 67 +- .../GridDistributedTxRemoteAdapter.java | 136 +- .../distributed/dht/GridDhtLockFuture.java | 63 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 6 +- .../cache/distributed/dht/GridDhtTxLocal.java | 24 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 89 +- .../cache/distributed/dht/GridDhtTxMapping.java | 134 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 119 +- .../dht/GridDhtTxPrepareRequest.java | 54 +- .../cache/distributed/dht/GridDhtTxRemote.java | 29 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 55 +- .../distributed/near/GridNearLockFuture.java | 56 +- .../distributed/near/GridNearLockRequest.java | 4 +- ...arOptimisticSerializableTxPrepareFuture.java | 107 +- .../near/GridNearOptimisticTxPrepareFuture.java | 151 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 72 +- .../GridNearPessimisticTxPrepareFuture.java | 40 +- .../near/GridNearTransactionalCache.java | 8 +- .../near/GridNearTxFinishFuture.java | 79 +- .../cache/distributed/near/GridNearTxLocal.java | 124 +- .../near/GridNearTxPrepareFutureAdapter.java | 14 +- .../near/GridNearTxPrepareRequest.java | 61 +- .../distributed/near/GridNearTxRemote.java | 26 +- .../distributed/near/IgniteTxMappings.java | 75 + .../distributed/near/IgniteTxMappingsImpl.java | 92 ++ .../near/IgniteTxMappingsSingleImpl.java | 101 ++ .../cache/transactions/IgniteInternalTx.java | 13 +- .../cache/transactions/IgniteTxAdapter.java | 68 +- .../cache/transactions/IgniteTxEntry.java | 9 +- .../cache/transactions/IgniteTxHandler.java | 16 +- .../IgniteTxImplicitSingleStateImpl.java | 266 ++++ .../transactions/IgniteTxLocalAdapter.java | 1406 ++++++++++-------- .../cache/transactions/IgniteTxLocalEx.java | 30 +- .../cache/transactions/IgniteTxLocalState.java | 44 + .../transactions/IgniteTxLocalStateAdapter.java | 41 + .../cache/transactions/IgniteTxManager.java | 19 +- .../cache/transactions/IgniteTxMap.java | 3 +- .../cache/transactions/IgniteTxRemoteEx.java | 17 +- .../IgniteTxRemoteSingleStateImpl.java | 108 ++ .../cache/transactions/IgniteTxRemoteState.java | 34 + .../IgniteTxRemoteStateAdapter.java | 115 ++ .../transactions/IgniteTxRemoteStateImpl.java | 124 ++ .../cache/transactions/IgniteTxState.java | 177 +++ .../cache/transactions/IgniteTxStateImpl.java | 414 ++++++ .../clock/GridClockSyncProcessor.java | 28 +- .../internal/util/UUIDCollectionMessage.java | 114 ++ .../util/future/GridCompoundFuture.java | 15 +- .../ignite/internal/util/lang/GridFunc.java | 8 +- .../ignite/internal/util/nio/GridNioServer.java | 13 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 145 +- .../IgniteCacheTxStoreSessionTest.java | 2 +- .../ignite/util/mbeans/GridMBeanSelfTest.java | 33 +- modules/flume/README.md | 40 + modules/flume/pom.xml | 77 + .../ignite/stream/flume/EventTransformer.java | 36 + .../apache/ignite/stream/flume/IgniteSink.java | 186 +++ .../stream/flume/IgniteSinkConstants.java | 35 + .../ignite/stream/flume/IgniteSinkTest.java | 142 ++ .../stream/flume/IgniteSinkTestSuite.java | 37 + .../stream/flume/TestEventTransformer.java | 66 + .../flume/src/test/resources/example-ignite.xml | 71 + .../GridSpringResourceInjectionSelfTest.java | 143 ++ .../processors/resource/spring-resource.xml | 27 + .../testsuites/IgniteResourceSelfTestSuite.java | 2 + parent/pom.xml | 1 + pom.xml | 1 + 86 files changed, 4535 insertions(+), 1834 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 5405abc,2503eda..ff3efb7 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@@ -692,11 -692,11 +693,16 @@@ public class GridIoMessageFactory imple break; case 115: + msg = new UUIDCollectionMessage(); + + break; + - // [-3..114] - this ++ case 115: + msg = new CacheContinuousQueryBatchAck(); + + break; + + // [-3..115] - this // [120..123] - DR // [-4..-22] - SQL default: http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8925ccef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java index 63ed7f4,b80909f..8ceca3f --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteEx.java @@@ -35,17 -30,8 +30,13 @@@ public interface IgniteTxRemoteEx exten * @param rolledbackVers Rolled back version. * @param pendingVers Pending versions. */ - public void doneRemote(GridCacheVersion baseVer, Collection<GridCacheVersion> committedVers, - Collection<GridCacheVersion> rolledbackVers, Collection<GridCacheVersion> pendingVers); - - /** - * @param e Sets write value for pessimistic transactions. - * @return {@code True} if entry was found. - */ - public boolean setWriteValue(IgniteTxEntry e); + public void doneRemote(GridCacheVersion baseVer, + Collection<GridCacheVersion> committedVers, + Collection<GridCacheVersion> rolledbackVers, + Collection<GridCacheVersion> pendingVers); -} + + /** + * @param cntrs Partition update indexes. + */ + public void setPartitionUpdateCounters(long[] cntrs); +}