Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-54-55
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88c298c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88c298c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88c298c6 Branch: refs/heads/ignite-54-55 Commit: 88c298c629b8178b79afa04325e144ea069c6a8b Parents: 8bfe43b 6ce0449 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 18:26:24 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 18:26:24 2015 +0300 ---------------------------------------------------------------------- NOTICE.txt | 14 +- .../ComputeFibonacciContinuationExample.java | 2 +- .../compute/ComputeRunnableExample.java | 2 +- .../HibernateL2CacheExampleNodeStartup.java | 6 +- .../examples/ScalarContinuationExample.scala | 2 +- .../apache/ignite/gridify/AbstractAopTest.java | 2 +- .../apache/ignite/gridify/TestGridifyTask.java | 2 +- .../singlesplit/SingleSplitsLoadTest.java | 2 +- .../spi/checkpoint/s3/S3CheckpointSpiMBean.java | 12 +- .../ignite/client/ClientStartNodeTask.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 1 + .../integration/ClientAbstractSelfTest.java | 20 +- .../rest/AbstractRestProcessorSelfTest.java | 2 + .../rest/ClientMemcachedProtocolSelfTest.java | 4 +- .../rest/RestBinaryProtocolSelfTest.java | 9 +- .../rest/RestMemcacheProtocolSelfTest.java | 9 +- .../src/main/java/org/apache/ignite/Ignite.java | 10 + .../java/org/apache/ignite/IgniteCache.java | 55 +- .../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 +- .../apache/ignite/cache/CacheEntryEvent.java | 2 +- .../java/org/apache/ignite/cache/CacheLock.java | 57 - .../org/apache/ignite/cache/CacheMBean.java | 295 ---- .../org/apache/ignite/cache/CacheManager.java | 172 ++- .../org/apache/ignite/cache/CacheMetrics.java | 416 +++++- .../java/org/apache/ignite/cache/GridCache.java | 15 +- .../ignite/cache/GridCacheVersionedEntry.java | 82 + .../ignite/cache/affinity/CacheAffinity.java | 9 +- .../fifo/CacheFifoEvictionPolicyMBean.java | 10 +- ...CacheGgfsPerBlockLruEvictionPolicyMBean.java | 18 +- .../lru/CacheLruEvictionPolicyMBean.java | 10 +- .../random/CacheRandomEvictionPolicyMBean.java | 6 +- .../ignite/cache/store/CacheStoreSession.java | 2 +- .../client/router/GridTcpRouterMBean.java | 16 +- .../apache/ignite/cluster/ClusterMetrics.java | 697 +++++---- .../org/apache/ignite/cluster/ClusterNode.java | 40 +- .../ignite/cluster/ClusterNodeMetrics.java | 695 --------- .../configuration/IgniteConfiguration.java | 27 +- .../ignite/dotnet/GridDotNetConfiguration.java | 113 -- .../dotnet/GridDotNetPortableConfiguration.java | 207 --- .../GridDotNetPortableTypeConfiguration.java | 219 --- .../java/org/apache/ignite/dotnet/package.html | 23 - .../ignite/internal/ClusterGroupAdapter.java | 2 +- .../internal/ClusterLocalNodeMetrics.java | 311 ---- .../ClusterLocalNodeMetricsMXBeanImpl.java | 309 ++++ .../ignite/internal/ClusterMetricsImpl.java | 813 ---------- .../ignite/internal/ClusterMetricsSnapshot.java | 1397 ++++++++++++++++++ .../internal/ClusterNodeMetricsMBean.java | 29 - .../org/apache/ignite/internal/GridGainEx.java | 8 +- .../org/apache/ignite/internal/GridKernal.java | 34 +- .../org/apache/ignite/internal/GridTopic.java | 5 +- .../ignite/internal/IgniteClusterAsyncImpl.java | 10 +- .../ignite/internal/IgniteComputeImpl.java | 70 +- .../ignite/internal/IgniteEventsImpl.java | 9 +- .../ignite/internal/IgniteManagedImpl.java | 2 +- .../ignite/internal/IgniteMessagingImpl.java | 12 +- .../internal/IgniteThreadPoolMBeanAdapter.java | 149 -- .../internal/IgniteThreadPoolMXBeanAdapter.java | 129 ++ .../ignite/internal/IgnitionMBeanAdapter.java | 59 - .../ignite/internal/IgnitionMXBeanAdapter.java | 59 + .../internal/executor/GridExecutorService.java | 2 +- .../managers/communication/GridIoManager.java | 3 +- .../discovery/GridDiscoveryManager.java | 4 +- .../internal/mxbean/IgniteStandardMXBean.java | 277 ++++ .../apache/ignite/internal/mxbean/package.html | 24 + .../affinity/GridAffinityAssignment.java | 10 +- .../affinity/GridAffinityProcessor.java | 330 ++++- .../processors/cache/CacheLockImpl.java | 132 +- .../processors/cache/CacheMetricsImpl.java | 586 ++++++++ .../cache/CacheMetricsMXBeanImpl.java | 310 ++++ .../processors/cache/CacheMetricsSnapshot.java | 518 +++++++ .../processors/cache/GridCacheAdapter.java | 385 ++++- .../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 | 4 + .../cache/GridCacheEvictionRequest.java | 1 + .../cache/GridCacheExplicitLockSpan.java | 1 + .../processors/cache/GridCacheFuture.java | 1 + .../cache/GridCacheLockTimeoutException.java | 2 + .../processors/cache/GridCacheMBeanAdapter.java | 217 --- .../processors/cache/GridCacheMapEntry.java | 172 ++- .../cache/GridCacheMetricsAdapter.java | 260 ---- .../processors/cache/GridCacheMvcc.java | 1 + .../cache/GridCacheMvccCandidate.java | 1 + .../processors/cache/GridCacheMvccManager.java | 1 + .../cache/GridCacheOffheapSwapEntry.java | 1 + .../processors/cache/GridCacheProcessor.java | 38 +- .../processors/cache/GridCacheProjectionEx.java | 1 + .../cache/GridCacheProjectionImpl.java | 1 + .../processors/cache/GridCacheProxyImpl.java | 26 +- .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheStoreManager.java | 1 + .../processors/cache/GridCacheSwapEntry.java | 1 + .../cache/GridCacheSwapEntryImpl.java | 1 + .../processors/cache/GridCacheSwapManager.java | 1 + .../processors/cache/GridCacheTtlManager.java | 4 + .../cache/GridCacheUpdateAtomicResult.java | 7 +- .../processors/cache/GridCacheUtils.java | 1 + .../processors/cache/GridCacheVersion.java | 256 ---- .../processors/cache/GridCacheVersionEx.java | 95 -- .../cache/GridCacheVersionManager.java | 281 ---- .../processors/cache/GridCacheVersionable.java | 28 - .../processors/cache/GridDrResolveResult.java | 63 - .../cache/IgniteCacheExpiryPolicy.java | 1 + .../processors/cache/IgniteCacheProxy.java | 61 +- .../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 +- .../cache/distributed/dht/GridDhtCache.java | 12 +- .../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 | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 41 +- .../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 | 5 +- .../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 | 8 +- .../near/GridNearCacheClearAllRunnable.java | 1 + .../distributed/near/GridNearCacheEntry.java | 4 +- .../distributed/near/GridNearGetFuture.java | 9 +- .../distributed/near/GridNearGetRequest.java | 1 + .../distributed/near/GridNearGetResponse.java | 1 + .../distributed/near/GridNearLockFuture.java | 7 +- .../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 | 25 +- .../cache/query/GridCacheQueriesEx.java | 16 + .../cache/query/GridCacheQueriesImpl.java | 15 + .../cache/query/GridCacheQueriesProxy.java | 24 + .../cache/query/GridCacheQueryManager.java | 62 +- .../cache/query/GridCacheSqlQuery.java | 99 ++ .../cache/query/GridCacheSqlResult.java | 21 + .../cache/query/GridCacheTwoStepQuery.java | 74 + .../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 | 6 +- .../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 + .../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 +- .../processors/query/GridQueryIndexing.java | 19 + .../processors/query/GridQueryProcessor.java | 36 + .../handlers/cache/GridCacheCommandHandler.java | 11 +- .../cache/GridCacheQueryCommandHandler.java | 4 +- .../handlers/cache/GridCacheRestMetrics.java | 77 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../top/GridTopologyCommandHandler.java | 2 +- .../apache/ignite/internal/util/GridUtils.java | 34 +- .../GridTcpCommunicationMessageAdapter.java | 1 + .../GridTcpCommunicationMessageState.java | 3 +- .../internal/visor/cache/VisorCacheMetrics.java | 37 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../internal/visor/node/VisorNodeGcTask.java | 2 +- .../ignite/interop/InteropConfiguration.java | 30 + .../java/org/apache/ignite/interop/package.html | 15 + .../apache/ignite/lang/IgniteAsyncSupport.java | 2 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 35 +- .../ignite/lang/IgniteAsyncSupported.java | 2 +- .../ignite/mxbean/CacheMetricsMXBean.java | 245 +++ .../mxbean/ClusterLocalNodeMetricsMXBean.java | 240 +++ .../apache/ignite/mxbean/IgniteCacheMXBean.java | 72 - .../org/apache/ignite/mxbean/IgniteMBean.java | 386 ----- .../ignite/mxbean/IgniteMBeanDescription.java | 34 - .../IgniteMBeanParametersDescriptions.java | 34 - .../mxbean/IgniteMBeanParametersNames.java | 34 - .../org/apache/ignite/mxbean/IgniteMXBean.java | 386 +++++ .../ignite/mxbean/IgniteMXBeanDescription.java | 34 + .../IgniteMXBeanParametersDescriptions.java | 34 + .../mxbean/IgniteMXBeanParametersNames.java | 34 + .../ignite/mxbean/IgniteStandardMBean.java | 275 ---- .../ignite/mxbean/IgniteThreadPoolMBean.java | 152 -- .../ignite/mxbean/IgniteThreadPoolMXBean.java | 152 ++ .../org/apache/ignite/mxbean/IgnitionMBean.java | 151 -- .../apache/ignite/mxbean/IgnitionMXBean.java | 151 ++ .../ignite/spi/IgniteSpiManagementMBean.java | 14 +- .../noop/NoopAuthenticationSpiMBean.java | 2 +- .../cache/CacheCheckpointSpiMBean.java | 4 +- .../checkpoint/jdbc/JdbcCheckpointSpiMBean.java | 24 +- .../sharedfs/SharedFsCheckpointSpiMBean.java | 6 +- .../fifoqueue/FifoQueueCollisionSpiMBean.java | 18 +- .../JobStealingCollisionSpiMBean.java | 36 +- .../PriorityQueueCollisionSpiMBean.java | 34 +- .../tcp/TcpCommunicationSpiMBean.java | 58 +- .../local/LocalDeploymentSpiMBean.java | 2 +- .../spi/discovery/DiscoveryMetricsHelper.java | 368 ----- .../spi/discovery/DiscoveryMetricsProvider.java | 2 +- .../discovery/DiscoveryNodeMetricsAdapter.java | 1068 ------------- .../discovery/tcp/TcpClientDiscoverySpi.java | 6 +- .../tcp/TcpClientDiscoverySpiMBean.java | 34 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 62 +- .../tcp/internal/TcpDiscoveryNode.java | 16 +- .../messages/TcpDiscoveryHeartbeatMessage.java | 36 +- .../memory/MemoryEventStorageSpiMBean.java | 10 +- .../failover/always/AlwaysFailoverSpiMBean.java | 6 +- .../JobStealingFailoverSpiMBean.java | 8 +- .../failover/never/NeverFailoverSpiMBean.java | 2 +- .../adaptive/AdaptiveCpuLoadProbe.java | 2 +- .../adaptive/AdaptiveJobCountLoadProbe.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpiMBean.java | 4 +- .../AdaptiveProcessingTimeLoadProbe.java | 2 +- .../RoundRobinLoadBalancingSpiMBean.java | 4 +- .../WeightedRandomLoadBalancingSpiMBean.java | 6 +- .../noop/NoopSecureSessionSpiMBean.java | 2 +- .../swapspace/file/FileSwapSpaceSpiMBean.java | 12 +- .../apache/ignite/streamer/StreamerMBean.java | 34 +- .../ignite/streamer/StreamerStageMBean.java | 24 +- .../ignite/streamer/StreamerWindowMBean.java | 10 +- .../index/StreamerIndexProviderMBean.java | 12 +- .../transactions/IgniteTxConcurrency.java | 2 +- .../ignite/IgniteCacheAffinitySelfTest.java | 283 ++++ .../ignite/internal/ClusterMetricsSelfTest.java | 124 +- .../internal/ClusterNodeMetricsSelfTest.java | 6 +- .../internal/GridCancelOnGridStopSelfTest.java | 2 +- .../GridCancelledJobsMetricsSelfTest.java | 2 +- .../internal/GridContinuousTaskSelfTest.java | 4 +- .../ignite/internal/GridDiscoverySelfTest.java | 2 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../GridFailoverCustomTopologySelfTest.java | 2 +- .../GridJobMasterLeaveAwareSelfTest.java | 34 +- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../internal/GridNonHistoryMetricsSelfTest.java | 4 +- .../internal/GridProjectionAbstractTest.java | 20 +- .../ignite/internal/GridReduceSelfTest.java | 2 +- .../GridTaskCancelSingleNodeSelfTest.java | 2 +- .../internal/GridTaskExecutionSelfTest.java | 2 +- .../GridTaskInstanceExecutionSelfTest.java | 2 +- .../internal/GridTaskJobRejectSelfTest.java | 2 +- .../GridCheckpointManagerAbstractSelfTest.java | 2 +- .../GridDeploymentMessageCountSelfTest.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 92 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 752 +++++++++- .../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 + ...cheTransactionalAbstractMetricsSelfTest.java | 20 +- .../cache/GridCacheVersionSelfTest.java | 24 +- .../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 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 14 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 1 + ...AtomicPartitionedTckMetricsSelfTestImpl.java | 183 +++ .../near/GridCacheNearMetricsSelfTest.java | 163 +- .../near/GridCacheNearMultiNodeSelfTest.java | 63 +- .../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 +- ...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 161 ++ .../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 +- .../ignite/p2p/GridP2PClassLoadingSelfTest.java | 2 +- .../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 +- ...bStealingCollisionSpiAttributesSelfTest.java | 4 +- ...alingCollisionSpiCustomTopologySelfTest.java | 4 +- .../GridJobStealingCollisionSpiSelfTest.java | 4 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 21 +- ...ClusterMetricsSnapshotSerializeSelfTest.java | 126 ++ .../GridDiscoveryMetricsHelperSelfTest.java | 149 -- .../testframework/GridSpiTestContext.java | 6 +- .../ignite/testframework/GridTestNode.java | 8 +- .../testframework/junits/GridTestIgnite.java | 6 + .../cache/GridAbstractCacheStoreSelfTest.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 8 +- .../junits/spi/GridSpiAbstractTest.java | 2 +- .../IgniteCacheMetricsSelfTestSuite.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteComputeGridTestSuite.java | 2 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../util/GridTopologyHeapSizeSelfTest.java | 4 +- .../ignite/util/mbeans/GridMBeanSelfTest.java | 49 +- .../hadoop/GridHadoopClassLoader.java | 2 +- .../hadoop/GridHadoopPopularWordsTest.java | 4 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 4 +- .../query/h2/GridH2ResultSetIterator.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 173 ++- .../query/h2/opt/GridH2IndexBase.java | 5 +- .../query/h2/sql/GridSqlAggregateFunction.java | 76 + .../processors/query/h2/sql/GridSqlAlias.java | 55 + .../processors/query/h2/sql/GridSqlColumn.java | 57 + .../processors/query/h2/sql/GridSqlConst.java | 39 + .../processors/query/h2/sql/GridSqlElement.java | 73 + .../query/h2/sql/GridSqlFunction.java | 142 ++ .../query/h2/sql/GridSqlFunctionType.java | 78 + .../processors/query/h2/sql/GridSqlJoin.java | 68 + .../query/h2/sql/GridSqlOperation.java | 73 + .../query/h2/sql/GridSqlOperationType.java | 202 +++ .../query/h2/sql/GridSqlParameter.java | 44 + .../query/h2/sql/GridSqlQueryParser.java | 495 +++++++ .../query/h2/sql/GridSqlQuerySplitter.java | 252 ++++ .../processors/query/h2/sql/GridSqlSelect.java | 287 ++++ .../query/h2/sql/GridSqlSubquery.java | 44 + .../processors/query/h2/sql/GridSqlTable.java | 55 + .../processors/query/h2/sql/GridSqlValue.java | 17 + .../query/h2/twostep/GridMapQueryExecutor.java | 270 ++++ .../query/h2/twostep/GridMergeIndex.java | 290 ++++ .../h2/twostep/GridMergeIndexUnsorted.java | 85 ++ .../query/h2/twostep/GridMergeTable.java | 178 +++ .../h2/twostep/GridReduceQueryExecutor.java | 242 +++ .../query/h2/twostep/GridResultPage.java | 59 + .../twostep/messages/GridNextPageRequest.java | 59 + .../twostep/messages/GridNextPageResponse.java | 180 +++ .../query/h2/twostep/messages/GridQueryAck.java | 34 + .../twostep/messages/GridQueryFailResponse.java | 46 + .../h2/twostep/messages/GridQueryRequest.java | 61 + .../cache/GridCacheCrossCacheQuerySelfTest.java | 111 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 5 +- .../query/h2/sql/GridQueryParsingTest.java | 289 ++++ .../IgniteCacheQuerySelfTestSuite.java | 4 + .../scalar/pimps/ScalarProjectionPimp.scala | 8 +- .../org/apache/ignite/IgniteSpringBean.java | 6 + .../GridProjectionStartStopRestartSelfTest.java | 2 +- .../uri/GridUriDeploymentSpiMBean.java | 8 +- .../commands/alert/VisorAlertCommand.scala | 7 +- .../commands/top/VisorTopologyCommand.scala | 11 +- .../scala/org/apache/ignite/visor/visor.scala | 6 +- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- pom.xml | 136 +- 474 files changed, 16131 insertions(+), 9617 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheClearAllRunnable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java index ff9080d,c6686cf..56d6272 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java @@@ -28,9 -28,9 +28,10 @@@ import org.apache.ignite.testframework. import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; +import javax.cache.Cache; import java.util.*; import java.util.concurrent.*; + import java.util.concurrent.locks.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88c298c6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ----------------------------------------------------------------------
