Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-102
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/641a4c87 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/641a4c87 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/641a4c87 Branch: refs/heads/ignite-sql Commit: 641a4c87c91c2a260a7960e8ec942cd0bd97f2d0 Parents: c2c2e7f 673d11b Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jan 29 10:02:23 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jan 29 10:02:23 2015 +0700 ---------------------------------------------------------------------- .../hibernate/example-hibernate-L2-cache.xml | 14 +- .../ComputeFibonacciContinuationExample.java | 2 +- .../compute/ComputeRunnableExample.java | 2 +- .../datagrid/CacheDataLoaderExample.java | 15 +- .../HibernateL2CacheExampleNodeStartup.java | 6 +- .../examples/ScalarContinuationExample.scala | 2 +- .../apache/ignite/gridify/AbstractAopTest.java | 2 +- .../apache/ignite/gridify/TestGridifyTask.java | 2 +- .../singlesplit/SingleSplitsLoadTest.java | 2 +- .../ignite/client/ClientStartNodeTask.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 1 + .../java/org/apache/ignite/IgniteCache.java | 40 ++- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../java/org/apache/ignite/IgniteCompute.java | 2 +- .../java/org/apache/ignite/IgniteEvents.java | 2 +- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../java/org/apache/ignite/IgniteManaged.java | 2 +- .../java/org/apache/ignite/IgniteMessaging.java | 2 +- .../java/org/apache/ignite/cache/CacheLock.java | 57 ---- .../ignite/cache/GridCacheVersionedEntry.java | 82 ++++++ .../org/apache/ignite/internal/GridKernal.java | 32 +-- .../ignite/internal/IgniteClusterAsyncImpl.java | 9 +- .../ignite/internal/IgniteComputeImpl.java | 70 ++--- .../ignite/internal/IgniteEventsImpl.java | 9 +- .../ignite/internal/IgniteManagedImpl.java | 2 +- .../ignite/internal/IgniteMessagingImpl.java | 12 +- .../internal/executor/GridExecutorService.java | 2 +- .../managers/communication/GridIoManager.java | 3 +- .../processors/cache/CacheLockImpl.java | 132 ++++++--- .../processors/cache/GridCacheAdapter.java | 8 +- .../cache/GridCacheAtomicVersionComparator.java | 2 + .../cache/GridCacheBatchSwapEntry.java | 1 + .../cache/GridCacheClearAllRunnable.java | 1 + .../processors/cache/GridCacheContext.java | 44 +++ .../processors/cache/GridCacheEntryEx.java | 9 + .../processors/cache/GridCacheEntryInfo.java | 1 + .../cache/GridCacheEvictionManager.java | 1 + .../cache/GridCacheEvictionRequest.java | 1 + .../cache/GridCacheExplicitLockSpan.java | 1 + .../processors/cache/GridCacheFuture.java | 1 + .../cache/GridCacheLockTimeoutException.java | 2 + .../processors/cache/GridCacheMapEntry.java | 117 ++++++-- .../processors/cache/GridCacheMvcc.java | 1 + .../cache/GridCacheMvccCandidate.java | 1 + .../processors/cache/GridCacheMvccManager.java | 1 + .../cache/GridCacheOffheapSwapEntry.java | 1 + .../processors/cache/GridCacheProcessor.java | 1 + .../processors/cache/GridCacheProjectionEx.java | 1 + .../cache/GridCacheProjectionImpl.java | 1 + .../processors/cache/GridCacheProxyImpl.java | 1 + .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheStoreManager.java | 19 +- .../processors/cache/GridCacheSwapEntry.java | 1 + .../cache/GridCacheSwapEntryImpl.java | 1 + .../processors/cache/GridCacheSwapManager.java | 1 + .../processors/cache/GridCacheTtlManager.java | 1 + .../cache/GridCacheUpdateAtomicResult.java | 7 +- .../processors/cache/GridCacheUtils.java | 1 + .../processors/cache/GridCacheVersion.java | 256 ----------------- .../processors/cache/GridCacheVersionEx.java | 104 ------- .../cache/GridCacheVersionManager.java | 281 ------------------ .../processors/cache/GridCacheVersionable.java | 28 -- .../processors/cache/GridDrResolveResult.java | 63 ----- .../cache/IgniteCacheExpiryPolicy.java | 1 + .../processors/cache/IgniteCacheProxy.java | 33 +-- .../distributed/GridCacheCommittedTxInfo.java | 2 +- .../distributed/GridCacheMappedVersion.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 1 + ...idCacheOptimisticCheckPreparedTxRequest.java | 2 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 2 +- .../GridCachePerThreadTxCommitBuffer.java | 1 + ...dCachePessimisticCheckCommittedTxFuture.java | 1 + ...CachePessimisticCheckCommittedTxRequest.java | 2 +- ...achePessimisticCheckCommittedTxResponse.java | 1 + .../distributed/GridCacheTtlUpdateRequest.java | 1 + .../distributed/GridCacheTxCommitBuffer.java | 2 +- .../distributed/GridDistributedBaseMessage.java | 1 + .../GridDistributedCacheAdapter.java | 1 + .../distributed/GridDistributedCacheEntry.java | 1 + .../distributed/GridDistributedLockRequest.java | 1 + .../GridDistributedLockResponse.java | 1 + .../GridDistributedTxFinishRequest.java | 1 + .../GridDistributedTxFinishResponse.java | 1 + .../distributed/GridDistributedTxMapping.java | 1 + .../GridDistributedTxPrepareRequest.java | 1 + .../GridDistributedTxPrepareResponse.java | 1 + .../GridDistributedTxRemoteAdapter.java | 48 ++-- .../distributed/dht/GridDhtCacheAdapter.java | 1 + .../distributed/dht/GridDhtCacheEntry.java | 1 + .../cache/distributed/dht/GridDhtGetFuture.java | 1 + .../distributed/dht/GridDhtLocalPartition.java | 1 + .../distributed/dht/GridDhtLockFuture.java | 1 + .../distributed/dht/GridDhtLockRequest.java | 1 + .../distributed/dht/GridDhtLockResponse.java | 1 + .../dht/GridDhtTransactionalCacheAdapter.java | 1 + .../distributed/dht/GridDhtTxFinishFuture.java | 1 + .../distributed/dht/GridDhtTxFinishRequest.java | 1 + .../dht/GridDhtTxFinishResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../distributed/dht/GridDhtTxLocalAdapter.java | 1 + .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/GridDhtTxPrepareRequest.java | 1 + .../dht/GridDhtTxPrepareResponse.java | 1 + .../cache/distributed/dht/GridDhtTxRemote.java | 1 + .../dht/GridPartitionedGetFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 11 +- .../GridDhtAtomicDeferredUpdateResponse.java | 1 + .../dht/atomic/GridDhtAtomicUpdateFuture.java | 1 + .../dht/atomic/GridDhtAtomicUpdateRequest.java | 1 + .../dht/atomic/GridDhtAtomicUpdateResponse.java | 1 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 1 + .../dht/atomic/GridNearAtomicUpdateRequest.java | 1 + .../atomic/GridNearAtomicUpdateResponse.java | 1 + .../dht/colocated/GridDhtColocatedCache.java | 1 + .../colocated/GridDhtColocatedLockFuture.java | 1 + .../colocated/GridDhtDetachedCacheEntry.java | 1 + .../GridDhtPartitionsAbstractMessage.java | 1 + .../GridDhtPartitionsExchangeFuture.java | 1 + .../preloader/GridDhtPartitionsFullMessage.java | 1 + .../GridDhtPartitionsSingleMessage.java | 1 + .../distributed/near/GridNearAtomicCache.java | 1 + .../distributed/near/GridNearCacheAdapter.java | 1 + .../near/GridNearCacheClearAllRunnable.java | 1 + .../distributed/near/GridNearCacheEntry.java | 1 + .../distributed/near/GridNearGetFuture.java | 1 + .../distributed/near/GridNearGetRequest.java | 1 + .../distributed/near/GridNearGetResponse.java | 1 + .../distributed/near/GridNearLockFuture.java | 1 + .../distributed/near/GridNearLockRequest.java | 1 + .../distributed/near/GridNearLockResponse.java | 1 + .../near/GridNearTransactionalCache.java | 1 + .../near/GridNearTxFinishFuture.java | 1 + .../near/GridNearTxFinishRequest.java | 2 +- .../near/GridNearTxFinishResponse.java | 1 + .../cache/distributed/near/GridNearTxLocal.java | 1 + .../near/GridNearTxPrepareFuture.java | 1 + .../near/GridNearTxPrepareResponse.java | 1 + .../distributed/near/GridNearTxRemote.java | 1 + .../cache/dr/GridCacheDrExpirationInfo.java | 2 +- .../processors/cache/dr/GridCacheDrInfo.java | 2 +- .../processors/cache/dr/GridCacheDrManager.java | 58 +--- .../cache/dr/os/GridOsCacheDrManager.java | 36 +-- .../extras/GridCacheAttributesEntryExtras.java | 1 + .../GridCacheAttributesMvccEntryExtras.java | 1 + ...dCacheAttributesMvccObsoleteEntryExtras.java | 1 + ...cheAttributesMvccObsoleteTtlEntryExtras.java | 1 + .../GridCacheAttributesMvccTtlEntryExtras.java | 1 + .../GridCacheAttributesObsoleteEntryExtras.java | 1 + ...idCacheAttributesObsoleteTtlEntryExtras.java | 1 + .../GridCacheAttributesTtlEntryExtras.java | 1 + .../cache/extras/GridCacheEntryExtras.java | 1 + .../extras/GridCacheEntryExtrasAdapter.java | 1 + .../cache/extras/GridCacheMvccEntryExtras.java | 1 + .../GridCacheMvccObsoleteEntryExtras.java | 1 + .../GridCacheMvccObsoleteTtlEntryExtras.java | 1 + .../extras/GridCacheMvccTtlEntryExtras.java | 1 + .../extras/GridCacheObsoleteEntryExtras.java | 1 + .../extras/GridCacheObsoleteTtlEntryExtras.java | 1 + .../cache/extras/GridCacheTtlEntryExtras.java | 1 + .../processors/cache/local/GridLocalCache.java | 1 + .../cache/local/GridLocalCacheEntry.java | 1 + .../cache/local/GridLocalLockFuture.java | 1 + .../cache/local/GridLocalTxFuture.java | 1 + .../local/atomic/GridLocalAtomicCache.java | 1 + .../cache/query/GridCacheQueryManager.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 52 +++- .../cache/transactions/IgniteTxEntry.java | 1 + .../cache/transactions/IgniteTxEx.java | 1 + .../cache/transactions/IgniteTxHandler.java | 1 + .../transactions/IgniteTxLocalAdapter.java | 53 ++-- .../cache/transactions/IgniteTxLocalEx.java | 1 + .../cache/transactions/IgniteTxManager.java | 1 + .../cache/transactions/IgniteTxProxyImpl.java | 2 +- .../cache/transactions/IgniteTxRemoteEx.java | 2 +- .../version/GridCachePlainVersionedEntry.java | 131 +++++++++ .../version/GridCacheRawVersionedEntry.java | 238 ++++++++++++++++ .../cache/version/GridCacheVersion.java | 256 +++++++++++++++++ ...ridCacheVersionAbstractConflictResolver.java | 56 ++++ .../GridCacheVersionConflictContext.java | 73 +++++ .../GridCacheVersionConflictContextImpl.java | 188 ++++++++++++ .../GridCacheVersionConflictResolver.java | 59 ++++ .../cache/version/GridCacheVersionEx.java | 104 +++++++ .../cache/version/GridCacheVersionManager.java | 282 ++++++++++++++++++ .../cache/version/GridCacheVersionable.java | 28 ++ .../version/GridCacheVersionedEntryEx.java | 31 ++ .../dataload/IgniteDataLoaderImpl.java | 29 +- .../dr/GridDrDataLoadCacheUpdater.java | 3 +- .../processors/dr/GridRawVersionedEntry.java | 210 -------------- .../processors/dr/GridVersionedEntry.java | 80 ------ .../processors/fs/GridGgfsAsyncImpl.java | 7 +- .../internal/processors/fs/GridGgfsImpl.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../cache/GridCacheQueryCommandHandler.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../apache/ignite/internal/util/GridUtils.java | 15 +- .../GridTcpCommunicationMessageAdapter.java | 1 + .../GridTcpCommunicationMessageState.java | 3 +- .../apache/ignite/lang/IgniteAsyncSupport.java | 2 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 35 ++- .../ignite/lang/IgniteAsyncSupported.java | 2 +- .../ignite/IgniteCacheAffinitySelfTest.java | 283 +++++++++++++++++++ .../apache/ignite/IgniteCacheAffinityTest.java | 283 ------------------- .../internal/GridCancelOnGridStopSelfTest.java | 2 +- .../GridCancelledJobsMetricsSelfTest.java | 2 +- .../internal/GridContinuousTaskSelfTest.java | 4 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../GridFailoverCustomTopologySelfTest.java | 2 +- .../GridJobMasterLeaveAwareSelfTest.java | 34 +-- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../internal/GridProjectionAbstractTest.java | 20 +- .../ignite/internal/GridReduceSelfTest.java | 2 +- .../GridTaskCancelSingleNodeSelfTest.java | 2 +- .../internal/GridTaskExecutionSelfTest.java | 2 +- .../GridTaskInstanceExecutionSelfTest.java | 2 +- .../internal/GridTaskJobRejectSelfTest.java | 2 +- .../GridDeploymentMessageCountSelfTest.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 92 +++--- .../cache/GridCacheBasicApiAbstractTest.java | 229 ++++++++------- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- .../cache/GridCacheEntryVersionSelfTest.java | 3 +- .../GridCacheFinishPartitionsSelfTest.java | 25 +- .../GridCacheGroupLockAbstractSelfTest.java | 13 +- .../GridCacheGroupLockFailoverSelfTest.java | 2 +- .../cache/GridCacheMvccFlagsTest.java | 1 + .../cache/GridCacheMvccPartitionedSelfTest.java | 1 + .../processors/cache/GridCacheMvccSelfTest.java | 1 + .../cache/GridCacheNestedTxAbstractTest.java | 13 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 11 +- .../cache/GridCachePutAllFailoverSelfTest.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 6 + .../cache/GridCacheVersionSelfTest.java | 1 + .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- .../GridCacheCountDownLatchSelfTest.java | 2 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 4 +- .../GridCacheAbstractJobExecutionTest.java | 2 +- .../distributed/GridCacheLockAbstractTest.java | 62 ++-- .../GridCacheMultiNodeLockAbstractTest.java | 139 +++++---- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheColocatedDebugTest.java | 43 +-- .../dht/GridCacheGlobalLoadTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 1 + .../near/GridCacheNearMultiNodeSelfTest.java | 25 +- .../near/GridCacheNearOneNodeSelfTest.java | 42 +-- .../near/GridCacheNearReadersSelfTest.java | 13 +- .../near/GridCachePartitionedBasicApiTest.java | 4 +- .../GridCachePartitionedEntryLockSelfTest.java | 2 +- .../GridCachePartitionedLoadCacheSelfTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- .../GridCacheReplicatedBasicApiTest.java | 4 +- .../GridCacheEvictionLockUnlockSelfTest.java | 7 +- .../local/GridCacheLocalBasicApiSelfTest.java | 4 +- .../cache/local/GridCacheLocalLockSelfTest.java | 81 +++--- .../GridCacheLocalMultithreadedSelfTest.java | 85 +++--- .../closure/GridClosureProcessorSelfTest.java | 16 +- .../continuous/GridEventConsumeSelfTest.java | 8 +- .../continuous/GridMessageListenSelfTest.java | 4 +- .../processors/fs/GridGgfsTaskSelfTest.java | 2 +- .../GridServiceProcessorAbstractSelfTest.java | 18 +- .../GridServiceProcessorMultiNodeSelfTest.java | 6 +- .../streamer/GridStreamerSelfTest.java | 2 +- .../loadtest/GridSingleExecutionTest.java | 2 +- .../loadtests/colocation/GridTestMain.java | 2 +- .../multisplit/GridMultiSplitsLoadTest.java | 2 +- ...ridSingleSplitsNewNodesAbstractLoadTest.java | 2 +- .../ignite/loadtests/dsi/GridDsiClient.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../loadtests/hashmap/GridHashMapLoadTest.java | 1 + ...GridJobExecutionLoadTestClientSemaphore.java | 2 +- ...JobExecutionSingleNodeSemaphoreLoadTest.java | 2 +- .../loadtests/job/GridJobLoadTestSubmitter.java | 2 +- .../mergesort/GridMergeSortLoadTask.java | 2 +- .../ignite/messaging/GridMessagingSelfTest.java | 4 +- .../GridP2PContinuousDeploymentSelfTest.java | 4 +- .../p2p/GridP2PLocalDeploymentSelfTest.java | 10 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 8 +- .../ignite/p2p/GridP2PTimeoutSelfTest.java | 8 +- .../ignite/p2p/GridP2PUndeploySelfTest.java | 2 +- ...idSessionFutureWaitJobAttributeSelfTest.java | 2 +- ...GridSessionSetJobAttributeOrderSelfTest.java | 2 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 2 +- .../GridSessionSetTaskAttributeSelfTest.java | 2 +- ...GridSessionTaskWaitJobAttributeSelfTest.java | 2 +- .../GridSessionWaitAttributeSelfTest.java | 2 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 21 +- ...ClusterMetricsSnapshotSerializeSelfTest.java | 52 +++- .../cache/GridAbstractCacheStoreSelfTest.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 8 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- .../hadoop/GridHadoopClassLoader.java | 2 +- .../hadoop/GridHadoopPopularWordsTest.java | 4 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 4 +- .../hibernate/GridHibernateRegionFactory.java | 10 +- .../scalar/pimps/ScalarProjectionPimp.scala | 8 +- .../GridProjectionStartStopRestartSelfTest.java | 2 +- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- pom.xml | 4 +- 296 files changed, 3269 insertions(+), 2290 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/641a4c87/pom.xml ----------------------------------------------------------------------
