Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-67
Conflicts:
docs/gridgain_readme.md
docs/mapred-site.ignite.xml
modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
modules/hadoop/src/test/java/org/apache/ignite/hadoop/GridHadoopPopularWordsTest.java
Merge remote-tracking branch 'remotes/origin/ignite-sprint-1' into ignite-67gg
Conflicts:
build/settings.xml
modules/visor-tester/src/main/scala/org/gridgain/visor/tester/VisorCmptbTesterLauncherDaemon.scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ed8d4d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed8d4d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed8d4d80
Branch: refs/heads/sprint-1
Commit: ed8d4d80ceab4e4cf34aa9038ecbfb2e88941d43
Parents: f81a315 9ea9607
Author: avinogradov <[email protected]>
Authored: Thu Jan 29 15:22:16 2015 +0300
Committer: avinogradov <[email protected]>
Committed: Thu Jan 29 15:22:16 2015 +0300
----------------------------------------------------------------------
NOTICE.txt | 14 +-
assembly/libs/readme.txt | 111 +-
assembly/release-base-fabric.xml | 2 +-
docs/core-site.gridgain.xml | 89 -
docs/core-site.ignite.xml | 89 +
docs/gridgain_readme.md | 149 -
docs/gridgain_readme.pdf | Bin 407698 -> 0 bytes
docs/hadoop_readme.md | 80 +-
docs/hadoop_readme.pdf | Bin 411788 -> 82297 bytes
docs/hive-site.gridgain.xml | 36 -
docs/hive-site.ignite.xml | 36 +
docs/ignite_readme.md | 100 +
docs/ignite_readme.pdf | Bin 0 -> 76810 bytes
docs/mapred-site.gridgain.xml | 79 -
docs/mapred-site.ignite.xml | 79 +
examples/config/filesystem/readme.txt | 4 +-
.../hibernate/example-hibernate-L2-cache.xml | 14 +-
examples/config/hibernate/readme.txt | 4 +-
examples/config/servlet/readme.txt | 2 +-
.../ComputeFibonacciContinuationExample.java | 13 +-
.../compute/ComputeRunnableExample.java | 7 +-
.../datagrid/CacheDataLoaderExample.java | 15 +-
.../HibernateL2CacheExampleNodeStartup.java | 6 +-
.../examples/ScalarContinuationExample.scala | 11 +-
ipc/readme.txt | 4 +-
ipc/shmem/readme.txt | 10 +-
modules/aop/readme.txt | 12 +-
.../apache/ignite/gridify/AbstractAopTest.java | 2 +-
.../apache/ignite/gridify/TestGridifyTask.java | 2 +-
.../singlesplit/SingleSplitsLoadTest.java | 2 +-
modules/aws/readme.txt | 12 +-
.../spi/checkpoint/s3/S3CheckpointSpiMBean.java | 12 +-
.../ClientAbstractMultiThreadedSelfTest.java | 8 +-
.../ignite/client/ClientStartNodeTask.java | 2 +-
.../ClientAbstractMultiNodeSelfTest.java | 5 +-
.../integration/ClientAbstractSelfTest.java | 28 +-
.../rest/AbstractRestProcessorSelfTest.java | 2 +
.../rest/ClientMemcachedProtocolSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 11 +-
.../rest/RestMemcacheProtocolSelfTest.java | 9 +-
.../rest/RestProcessorStartSelfTest.java | 3 +-
.../rest/TaskCommandHandlerSelfTest.java | 2 +-
.../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 +-
.../org/apache/ignite/IgniteDataLoader.java | 14 +-
.../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/IgniteScheduler.java | 6 +-
.../apache/ignite/IgniteSystemProperties.java | 6 +-
.../main/java/org/apache/ignite/Ignition.java | 38 +-
.../org/apache/ignite/cache/CacheEntry.java | 27 +-
.../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 ++-
.../apache/ignite/cache/CacheProjection.java | 43 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../java/org/apache/ignite/cache/GridCache.java | 20 +-
.../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 +-
.../apache/ignite/cache/query/CacheQueries.java | 7 +-
.../ignite/cache/query/CacheQueryFuture.java | 4 +-
.../client/router/GridTcpRouterMBean.java | 16 +-
.../apache/ignite/cluster/ClusterMetrics.java | 697 ++--
.../org/apache/ignite/cluster/ClusterNode.java | 40 +-
.../ignite/cluster/ClusterNodeMetrics.java | 695 ----
.../ignite/compute/ComputeTaskFuture.java | 4 +-
.../ignite/compute/ComputeTaskSession.java | 3 +-
.../ignite/fs/mapreduce/IgniteFsTask.java | 2 +-
.../org/apache/ignite/hadoop/GridHadoop.java | 6 +-
.../ignite/internal/ClusterGroupAdapter.java | 4 +-
.../internal/ClusterLocalNodeMetrics.java | 311 --
.../ClusterLocalNodeMetricsMXBeanImpl.java | 309 ++
.../ignite/internal/ClusterMetricsImpl.java | 813 -----
.../ignite/internal/ClusterMetricsSnapshot.java | 1397 ++++++++
.../internal/ClusterNodeLocalMapImpl.java | 2 +-
.../internal/ClusterNodeMetricsMBean.java | 29 -
.../java/org/apache/ignite/internal/GridEx.java | 143 -
.../org/apache/ignite/internal/GridGainEx.java | 2399 -------------
.../ignite/internal/GridJobSessionImpl.java | 2 +-
.../org/apache/ignite/internal/GridKernal.java | 3308 -----------------
.../ignite/internal/GridKernalContext.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 8 +-
.../apache/ignite/internal/GridLoggerProxy.java | 2 +-
.../ignite/internal/GridTaskSessionImpl.java | 2 +-
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../ignite/internal/IgniteClusterAsyncImpl.java | 14 +-
.../ignite/internal/IgniteComputeImpl.java | 70 +-
.../ignite/internal/IgniteEventsImpl.java | 9 +-
.../org/apache/ignite/internal/IgniteEx.java | 143 +
.../ignite/internal/IgniteInternalFuture.java | 190 +
.../apache/ignite/internal/IgniteKernal.java | 3322 ++++++++++++++++++
.../ignite/internal/IgniteManagedImpl.java | 2 +-
.../ignite/internal/IgniteMessagingImpl.java | 12 +-
.../ignite/internal/IgniteSchedulerImpl.java | 6 +-
.../internal/IgniteThreadPoolMBeanAdapter.java | 149 -
.../internal/IgniteThreadPoolMXBeanAdapter.java | 129 +
.../org/apache/ignite/internal/IgnitionEx.java | 2396 +++++++++++++
.../ignite/internal/IgnitionMBeanAdapter.java | 59 -
.../ignite/internal/IgnitionMXBeanAdapter.java | 59 +
.../internal/executor/GridExecutorService.java | 46 +-
.../managers/communication/GridIoManager.java | 3 +-
.../discovery/GridDiscoveryManager.java | 6 +-
.../eventstorage/GridEventStorageManager.java | 4 +-
.../internal/mxbean/IgniteStandardMXBean.java | 277 ++
.../apache/ignite/internal/mxbean/package.html | 24 +
.../affinity/GridAffinityAssignment.java | 10 +-
.../affinity/GridAffinityAssignmentCache.java | 5 +-
.../affinity/GridAffinityProcessor.java | 338 +-
.../processors/affinity/GridAffinityUtils.java | 2 +-
.../processors/cache/CacheLockImpl.java | 134 +-
.../processors/cache/CacheMetricsImpl.java | 586 +++
.../cache/CacheMetricsMXBeanImpl.java | 310 ++
.../processors/cache/CacheMetricsSnapshot.java | 518 +++
.../processors/cache/GridCacheAdapter.java | 703 +++-
.../cache/GridCacheAffinityManager.java | 8 +-
.../cache/GridCacheAtomicVersionComparator.java | 2 +
.../cache/GridCacheBatchSwapEntry.java | 1 +
.../cache/GridCacheClearAllRunnable.java | 1 +
.../processors/cache/GridCacheContext.java | 60 +-
.../processors/cache/GridCacheEntryEx.java | 9 +
.../processors/cache/GridCacheEntryImpl.java | 27 +-
.../processors/cache/GridCacheEntryInfo.java | 1 +
.../cache/GridCacheEvictionEntry.java | 27 +-
.../cache/GridCacheEvictionManager.java | 8 +-
.../cache/GridCacheEvictionRequest.java | 1 +
.../cache/GridCacheExplicitLockSpan.java | 5 +-
.../cache/GridCacheFilterEvaluationEntry.java | 27 +-
.../processors/cache/GridCacheFuture.java | 4 +-
.../processors/cache/GridCacheIoManager.java | 15 +-
.../cache/GridCacheLockTimeoutException.java | 2 +
.../processors/cache/GridCacheMBeanAdapter.java | 217 --
.../processors/cache/GridCacheMapEntry.java | 172 +-
.../cache/GridCacheMetricsAdapter.java | 260 --
.../cache/GridCacheMultiTxFuture.java | 6 +-
.../processors/cache/GridCacheMvcc.java | 1 +
.../cache/GridCacheMvccCandidate.java | 1 +
.../processors/cache/GridCacheMvccManager.java | 30 +-
.../cache/GridCacheOffheapSwapEntry.java | 1 +
.../GridCachePartitionExchangeManager.java | 9 +-
.../processors/cache/GridCachePreloader.java | 7 +-
.../cache/GridCachePreloaderAdapter.java | 9 +-
.../processors/cache/GridCacheProcessor.java | 47 +-
.../processors/cache/GridCacheProjectionEx.java | 28 +-
.../cache/GridCacheProjectionImpl.java | 70 +-
.../processors/cache/GridCacheProxyImpl.java | 99 +-
.../cache/GridCacheSharedContext.java | 14 +-
.../processors/cache/GridCacheStoreManager.java | 19 +-
.../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 | 8 +-
.../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 | 74 +-
.../GridCacheAtomicSequenceImpl.java | 3 +-
.../GridCacheDataStructuresManager.java | 4 +-
.../distributed/GridCacheCommittedTxInfo.java | 2 +-
.../distributed/GridCacheMappedVersion.java | 2 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 8 +-
...idCacheOptimisticCheckPreparedTxRequest.java | 2 +-
...dCacheOptimisticCheckPreparedTxResponse.java | 2 +-
.../GridCachePerThreadTxCommitBuffer.java | 1 +
...dCachePessimisticCheckCommittedTxFuture.java | 8 +-
...CachePessimisticCheckCommittedTxRequest.java | 2 +-
...achePessimisticCheckCommittedTxResponse.java | 1 +
.../distributed/GridCacheTtlUpdateRequest.java | 1 +
.../distributed/GridCacheTxCommitBuffer.java | 2 +-
.../distributed/GridCacheTxFinishSync.java | 8 +-
.../distributed/GridDistributedBaseMessage.java | 1 +
.../GridDistributedCacheAdapter.java | 8 +-
.../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 | 55 +-
.../cache/distributed/dht/GridDhtCache.java | 12 +-
.../distributed/dht/GridDhtCacheAdapter.java | 13 +-
.../distributed/dht/GridDhtCacheEntry.java | 8 +-
.../distributed/dht/GridDhtEmbeddedFuture.java | 8 +-
.../cache/distributed/dht/GridDhtFuture.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 12 +-
.../distributed/dht/GridDhtLocalPartition.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 12 +-
.../distributed/dht/GridDhtLockRequest.java | 1 +
.../distributed/dht/GridDhtLockResponse.java | 1 +
.../distributed/dht/GridDhtTopologyFuture.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 30 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 12 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 1 +
.../dht/GridDhtTxFinishResponse.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 20 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 12 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 12 +-
.../dht/GridDhtTxPrepareRequest.java | 1 +
.../dht/GridDhtTxPrepareResponse.java | 1 +
.../cache/distributed/dht/GridDhtTxRemote.java | 1 +
.../dht/GridPartitionedGetFuture.java | 35 +-
.../dht/atomic/GridDhtAtomicCache.java | 159 +-
.../GridDhtAtomicDeferredUpdateResponse.java | 1 +
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 1 +
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 1 +
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 1 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 35 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 1 +
.../atomic/GridNearAtomicUpdateResponse.java | 1 +
.../dht/colocated/GridDhtColocatedCache.java | 29 +-
.../colocated/GridDhtColocatedLockFuture.java | 24 +-
.../colocated/GridDhtDetachedCacheEntry.java | 1 +
.../dht/preloader/GridDhtForceKeysFuture.java | 7 +-
.../preloader/GridDhtPartitionDemandPool.java | 13 +-
.../GridDhtPartitionsAbstractMessage.java | 1 +
.../GridDhtPartitionsExchangeFuture.java | 21 +-
.../preloader/GridDhtPartitionsFullMessage.java | 1 +
.../GridDhtPartitionsSingleMessage.java | 1 +
.../dht/preloader/GridDhtPreloader.java | 29 +-
.../distributed/near/GridNearAtomicCache.java | 46 +-
.../distributed/near/GridNearCacheAdapter.java | 23 +-
.../near/GridNearCacheClearAllRunnable.java | 1 +
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../distributed/near/GridNearGetFuture.java | 45 +-
.../distributed/near/GridNearGetRequest.java | 1 +
.../distributed/near/GridNearGetResponse.java | 1 +
.../distributed/near/GridNearLockFuture.java | 30 +-
.../distributed/near/GridNearLockRequest.java | 1 +
.../distributed/near/GridNearLockResponse.java | 1 +
.../near/GridNearTransactionalCache.java | 10 +-
.../near/GridNearTxFinishFuture.java | 18 +-
.../near/GridNearTxFinishRequest.java | 2 +-
.../near/GridNearTxFinishResponse.java | 1 +
.../cache/distributed/near/GridNearTxLocal.java | 59 +-
.../near/GridNearTxPrepareFuture.java | 18 +-
.../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 | 8 +-
.../cache/local/GridLocalCacheEntry.java | 1 +
.../cache/local/GridLocalLockFuture.java | 1 +
.../processors/cache/local/GridLocalTx.java | 12 +-
.../cache/local/GridLocalTxFuture.java | 1 +
.../local/atomic/GridLocalAtomicCache.java | 162 +-
.../GridCacheDistributedFieldsQueryFuture.java | 4 +-
.../query/GridCacheDistributedQueryManager.java | 9 +-
.../query/GridCacheFieldsQueryErrorFuture.java | 3 +-
.../query/GridCacheLocalFieldsQueryFuture.java | 4 +-
.../cache/query/GridCacheLocalQueryFuture.java | 3 +-
.../cache/query/GridCacheQueriesEx.java | 6 +-
.../cache/query/GridCacheQueriesImpl.java | 11 +-
.../cache/query/GridCacheQueriesProxy.java | 11 +-
.../cache/query/GridCacheQueryManager.java | 54 +-
.../query/GridCacheQueryMetadataAware.java | 4 +-
.../GridCacheContinuousQueryEntry.java | 27 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +-
.../query/jdbc/GridCacheQueryJdbcTask.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 3 +-
.../cache/transactions/IgniteTxAdapter.java | 59 +-
.../cache/transactions/IgniteTxEntry.java | 1 +
.../cache/transactions/IgniteTxEx.java | 10 +-
.../cache/transactions/IgniteTxHandler.java | 49 +-
.../transactions/IgniteTxLocalAdapter.java | 159 +-
.../cache/transactions/IgniteTxLocalEx.java | 18 +-
.../cache/transactions/IgniteTxManager.java | 21 +-
.../cache/transactions/IgniteTxProxyImpl.java | 11 +-
.../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 +
.../closure/GridClosureProcessor.java | 56 +-
.../continuous/GridContinuousProcessor.java | 4 +-
.../dataload/GridDataLoaderProcessor.java | 5 +-
.../dataload/IgniteDataLoaderImpl.java | 87 +-
.../dr/GridDrDataLoadCacheUpdater.java | 8 +-
.../processors/dr/GridRawVersionedEntry.java | 210 --
.../processors/dr/GridVersionedEntry.java | 80 -
.../email/IgniteEmailProcessorAdapter.java | 5 +-
.../email/IgniteNoopEmailProcessor.java | 5 +-
.../processors/fs/GridGgfsAsyncImpl.java | 10 +-
.../processors/fs/GridGgfsDataManager.java | 30 +-
.../internal/processors/fs/GridGgfsEx.java | 3 +-
.../internal/processors/fs/GridGgfsImpl.java | 20 +-
.../processors/fs/GridGgfsInputStreamImpl.java | 19 +-
.../processors/fs/GridGgfsIpcHandler.java | 4 +-
.../processors/fs/GridGgfsMetaManager.java | 9 +-
.../internal/processors/fs/GridGgfsServer.java | 8 +-
.../processors/fs/GridGgfsServerHandler.java | 4 +-
.../processors/fs/IgniteFsOutputStreamImpl.java | 3 +-
.../hadoop/IgniteHadoopNoopProcessor.java | 5 +-
.../hadoop/IgniteHadoopProcessorAdapter.java | 5 +-
.../processors/query/GridQueryIndexing.java | 4 +-
.../processors/query/GridQueryProcessor.java | 12 +-
.../resource/GridResourceProcessor.java | 2 +-
.../resource/GridSpringResourceContext.java | 2 +-
.../processors/rest/GridRestProcessor.java | 18 +-
.../rest/GridRestProtocolHandler.java | 4 +-
.../rest/handlers/GridRestCommandHandler.java | 4 +-
.../handlers/cache/GridCacheCommandHandler.java | 71 +-
.../cache/GridCacheQueryCommandHandler.java | 16 +-
.../handlers/cache/GridCacheRestMetrics.java | 77 +-
.../handlers/log/GridLogCommandHandler.java | 3 +-
.../metadata/GridPortableMetadataHandler.java | 3 +-
.../handlers/task/GridTaskCommandHandler.java | 14 +-
.../top/GridTopologyCommandHandler.java | 5 +-
.../version/GridVersionCommandHandler.java | 3 +-
.../tcp/GridTcpMemcachedNioListener.java | 17 +-
.../protocols/tcp/GridTcpRestNioListener.java | 5 +-
.../service/GridServiceProcessor.java | 20 +-
.../processors/service/GridServiceProxy.java | 2 +-
.../processors/streamer/IgniteStreamerImpl.java | 4 +-
.../apache/ignite/internal/util/GridUtils.java | 40 +-
.../GridTcpCommunicationMessageAdapter.java | 1 +
.../GridTcpCommunicationMessageState.java | 3 +-
.../util/future/GridCompoundFuture.java | 28 +-
.../util/future/GridCompoundIdentityFuture.java | 2 +-
.../util/future/GridEmbeddedFuture.java | 38 +-
.../util/future/GridFinishedFuture.java | 8 +-
.../util/future/GridFinishedFutureEx.java | 9 +-
.../internal/util/future/GridFutureAdapter.java | 30 +-
.../util/future/GridFutureAdapterEx.java | 31 +-
.../util/future/GridFutureChainListener.java | 8 +-
.../ignite/internal/util/lang/GridFunc.java | 53 +-
.../ignite/internal/util/nio/GridNioFuture.java | 2 +-
.../apache/ignite/internal/util/typedef/X.java | 6 +-
.../apache/ignite/internal/visor/VisorJob.java | 2 +-
.../internal/visor/VisorMultiNodeTask.java | 2 +-
.../ignite/internal/visor/cache/VisorCache.java | 2 +-
.../internal/visor/cache/VisorCacheMetrics.java | 37 +-
.../visor/cache/VisorCachePreloadTask.java | 6 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 2 +-
.../compute/VisorComputeMonitoringHolder.java | 10 +-
.../visor/node/VisorBasicConfiguration.java | 2 +-
.../visor/node/VisorGridConfiguration.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 2 +-
.../internal/visor/node/VisorNodeGcTask.java | 2 +-
.../internal/visor/query/VisorQueryTask.java | 2 +-
.../apache/ignite/lang/IgniteAsyncSupport.java | 6 +-
.../ignite/lang/IgniteAsyncSupportAdapter.java | 46 +-
.../ignite/lang/IgniteAsyncSupported.java | 2 +-
.../org/apache/ignite/lang/IgniteFuture.java | 189 -
.../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/scheduler/SchedulerFuture.java | 4 +-
.../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 | 16 +-
.../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 +-
.../StreamerCacheAffinityEventRouter.java | 2 +-
.../ignite/GridExceptionHelpLinksSelfTest.java | 106 -
.../ignite/GridExternalizableAbstractTest.java | 41 -
.../org/apache/ignite/GridTestTaskSession.java | 4 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 283 ++
.../IgniteExceptionHelpLinksSelfTest.java | 106 +
.../IgniteExternalizableAbstractTest.java | 41 +
...CachePartitionFairAffinityNodesSelfTest.java | 6 +-
.../store/GridCacheBalancingStoreSelfTest.java | 3 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 7 +-
.../fs/GridGgfsEventsAbstractSelfTest.java | 2 +-
.../ignite/fs/GridGgfsFragmentizerSelfTest.java | 2 +-
.../ignite/internal/ClusterMetricsSelfTest.java | 124 +-
.../internal/ClusterNodeMetricsSelfTest.java | 6 +-
.../internal/GridCancelOnGridStopSelfTest.java | 2 +-
.../GridCancelledJobsMetricsSelfTest.java | 2 +-
.../internal/GridContinuousTaskSelfTest.java | 4 +-
.../internal/GridDiscoveryEventSelfTest.java | 3 +-
.../ignite/internal/GridDiscoverySelfTest.java | 6 +-
.../GridEventStorageCheckAllEventsSelfTest.java | 2 +-
.../internal/GridExecutorServiceTest.java | 315 --
.../GridExplicitImplicitDeploymentSelfTest.java | 476 ---
.../GridFailoverCustomTopologySelfTest.java | 2 +-
.../GridJobMasterLeaveAwareSelfTest.java | 90 +-
.../ignite/internal/GridKernalTestUtils.java | 3 +-
.../internal/GridListenActorSelfTest.java | 3 +-
.../internal/GridMultipleJobsSelfTest.java | 8 +-
.../internal/GridNonHistoryMetricsSelfTest.java | 4 +-
.../internal/GridProjectionAbstractTest.java | 40 +-
.../ignite/internal/GridReduceSelfTest.java | 4 +-
.../GridTaskCancelSingleNodeSelfTest.java | 2 +-
.../internal/GridTaskExecutionSelfTest.java | 2 +-
.../GridTaskFutureImplStopGridSelfTest.java | 5 +-
.../GridTaskInstanceExecutionSelfTest.java | 2 +-
.../internal/GridTaskJobRejectSelfTest.java | 2 +-
.../internal/GridTaskListenerSelfTest.java | 4 +-
.../GridTopicExternalizableSelfTest.java | 3 +-
.../GridTopologyBuildVersionSelfTest.java | 2 +-
.../internal/GridUpdateNotifierSelfTest.java | 3 +-
.../internal/IgniteExecutorServiceTest.java | 315 ++
...gniteExplicitImplicitDeploymentSelfTest.java | 476 +++
.../GridCheckpointManagerAbstractSelfTest.java | 6 +-
.../GridCommunicationSendMessageSelfTest.java | 4 +-
.../GridDeploymentMessageCountSelfTest.java | 4 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 6 +-
.../events/GridEventStorageManagerSelfTest.java | 3 +-
.../swapspace/GridSwapSpaceManagerSelfTest.java | 2 +-
.../GridAffinityProcessorAbstractSelfTest.java | 6 +-
.../GridCacheAbstractFailoverSelfTest.java | 3 +-
.../cache/GridCacheAbstractFlagsTest.java | 4 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 5 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 473 ++-
.../GridCacheAbstractIteratorsSelfTest.java | 10 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 752 +++-
.../GridCacheAbstractRemoveFailureTest.java | 6 +-
.../cache/GridCacheAbstractSelfTest.java | 2 +-
.../cache/GridCacheAffinityApiSelfTest.java | 4 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 8 +-
.../cache/GridCacheBasicApiAbstractTest.java | 229 +-
.../cache/GridCacheConcurrentMapTest.java | 6 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 6 +-
.../cache/GridCacheEntryVersionSelfTest.java | 7 +-
.../GridCacheFinishPartitionsSelfTest.java | 52 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 6 +-
...idCacheGetAndTransformStoreAbstractTest.java | 4 +-
.../GridCacheGroupLockAbstractSelfTest.java | 19 +-
.../GridCacheGroupLockFailoverSelfTest.java | 7 +-
.../cache/GridCacheIncrementTransformTest.java | 4 +-
.../processors/cache/GridCacheLeakTest.java | 2 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 18 +-
.../GridCacheMissingCommitVersionSelfTest.java | 3 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 6 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 5 +-
.../cache/GridCacheMvccFlagsTest.java | 5 +-
.../cache/GridCacheMvccManagerSelfTest.java | 4 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 5 +-
.../processors/cache/GridCacheMvccSelfTest.java | 5 +-
.../cache/GridCacheNestedTxAbstractTest.java | 15 +-
.../cache/GridCacheObjectToStringSelfTest.java | 2 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 5 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 11 +-
.../GridCacheOrderedPreloadingSelfTest.java | 2 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 6 +-
.../cache/GridCachePartitionedGetSelfTest.java | 2 +-
.../GridCachePreloadingEvictionsSelfTest.java | 8 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 17 +-
.../GridCacheQueryInternalKeysSelfTest.java | 2 +-
.../GridCacheReferenceCleanupSelfTest.java | 6 +-
...ridCacheReplicatedSynchronousCommitTest.java | 4 +-
.../cache/GridCacheSlowTxWarnTest.java | 4 +-
.../processors/cache/GridCacheStopSelfTest.java | 6 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 4 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 4 +-
.../cache/GridCacheSwapReloadSelfTest.java | 2 +-
.../processors/cache/GridCacheTestEntryEx.java | 6 +
...cheTransactionalAbstractMetricsSelfTest.java | 20 +-
.../cache/GridCacheTtlManagerLoadTest.java | 5 +-
.../cache/GridCacheTtlManagerSelfTest.java | 2 +-
.../GridCacheVariableTopologySelfTest.java | 4 +-
.../cache/GridCacheVersionSelfTest.java | 1 +
...idCacheWriteBehindStoreAbstractSelfTest.java | 4 +-
.../GridCacheWriteBehindStoreAbstractTest.java | 4 +-
.../GridCacheWriteBehindStoreSelfTest.java | 6 +-
.../IgniteCacheEntryListenerAbstractTest.java | 7 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 10 +-
.../processors/cache/IgniteTxAbstractTest.java | 2 +-
.../IgniteTxConcurrentGetAbstractTest.java | 3 +-
.../IgniteTxExceptionAbstractSelfTest.java | 2 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 6 +-
.../IgniteTxMultiThreadedAbstractTest.java | 6 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +-
...eAbstractDataStructuresFailoverSelfTest.java | 27 +-
...actQueueFailoverDataConsistencySelfTest.java | 9 +-
.../GridCacheCountDownLatchSelfTest.java | 10 +-
.../GridCacheQueueCleanupSelfTest.java | 5 +-
...ridCacheQueueJoinedNodeSelfAbstractTest.java | 11 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 17 +-
.../GridCacheSetAbstractSelfTest.java | 15 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 6 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 6 +-
.../GridCacheAbstractJobExecutionTest.java | 8 +-
.../GridCacheAtomicTimeoutSelfTest.java | 11 +-
.../GridCacheBasicOpAbstractTest.java | 7 +-
.../distributed/GridCacheEventAbstractTest.java | 2 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +-
.../distributed/GridCacheLockAbstractTest.java | 68 +-
.../GridCacheMultiNodeAbstractTest.java | 15 +-
.../GridCacheMultiNodeLockAbstractTest.java | 141 +-
...dCacheMultithreadedFailoverAbstractTest.java | 4 +-
.../GridCacheNodeFailureAbstractTest.java | 6 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 4 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 10 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 24 +-
.../IgniteTxPreloadAbstractTest.java | 4 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 11 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 2 +-
.../dht/GridCacheColocatedDebugTest.java | 54 +-
.../dht/GridCacheDhtEntrySelfTest.java | 2 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 10 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 12 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 6 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 5 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 5 +-
.../dht/GridCacheGlobalLoadTest.java | 2 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 14 +-
...dCachePartitionedTopologyChangeSelfTest.java | 60 +-
...itionedTxOriginatingNodeFailureSelfTest.java | 8 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 6 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +-
...AtomicPartitionedTckMetricsSelfTestImpl.java | 183 +
.../near/GridCacheNearMetricsSelfTest.java | 163 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 67 +-
.../near/GridCacheNearOneNodeSelfTest.java | 42 +-
.../near/GridCacheNearReadersSelfTest.java | 17 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 2 +-
.../near/GridCachePartitionedBasicApiTest.java | 4 +-
.../GridCachePartitionedEntryLockSelfTest.java | 7 +-
...titionedExplicitLockNodeFailureSelfTest.java | 6 +-
.../GridCachePartitionedFullApiSelfTest.java | 4 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 2 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 7 +-
.../GridCachePartitionedProjectionSelfTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 6 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 5 +-
.../GridCacheReplicatedBasicApiTest.java | 4 +-
.../GridCacheReplicatedEvictionSelfTest.java | 5 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 5 +-
...heConcurrentEvictionConsistencySelfTest.java | 4 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 4 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 7 +-
.../cache/eviction/GridCacheMockEntry.java | 27 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 4 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 2 +-
...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 161 +
.../local/GridCacheLocalBasicApiSelfTest.java | 4 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 81 +-
.../GridCacheLocalMultithreadedSelfTest.java | 85 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 4 +-
.../clock/GridTimeSyncProcessorSelfTest.java | 6 +-
.../closure/GridClosureProcessorSelfTest.java | 43 +-
.../continuous/GridEventConsumeSelfTest.java | 18 +-
.../continuous/GridMessageListenSelfTest.java | 4 +-
.../GridDataLoaderProcessorSelfTest.java | 23 +-
.../processors/fs/GridGgfsAbstractSelfTest.java | 6 +-
.../fs/GridGgfsDataManagerSelfTest.java | 9 +-
.../processors/fs/GridGgfsModesSelfTest.java | 4 +-
.../fs/GridGgfsProcessorSelfTest.java | 2 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 2 +-
.../processors/fs/GridGgfsSizeSelfTest.java | 8 +-
.../processors/fs/GridGgfsTaskSelfTest.java | 7 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 9 +-
.../GridServiceProcessorAbstractSelfTest.java | 38 +-
.../GridServiceProcessorMultiNodeSelfTest.java | 14 +-
.../GridServiceReassignmentSelfTest.java | 2 +-
.../streamer/GridStreamerFailoverSelfTest.java | 4 +-
.../streamer/GridStreamerSelfTest.java | 2 +-
.../timeout/GridTimeoutProcessorSelfTest.java | 5 +-
.../util/future/GridCompoundFutureSelfTest.java | 8 +-
.../util/future/GridEmbeddedFutureSelfTest.java | 7 +-
.../util/future/GridFinishedFutureSelfTest.java | 9 +-
.../util/future/GridFutureAdapterSelfTest.java | 23 +-
.../future/GridFutureListenPerformanceTest.java | 5 +-
.../shmem/GridIpcSharedMemorySpaceSelfTest.java | 20 +-
.../internal/util/nio/GridNioSelfTest.java | 8 +-
.../offheap/GridOffHeapMapAbstractSelfTest.java | 7 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 3 +-
...apPartitionedMapPerformanceAbstractTest.java | 10 +-
.../unsafe/GridUnsafeMemorySelfTest.java | 6 +-
.../ignite/jvmtest/ConcurrentMapTest.java | 4 +-
.../ignite/jvmtest/NetworkFailureTest.java | 16 +-
.../QueueSizeCounterMultiThreadedTest.java | 4 +-
.../jvmtest/ReadWriteLockMultiThreadedTest.java | 10 +-
.../ignite/lang/GridBasicPerformanceTest.java | 5 +-
.../apache/ignite/lang/GridFuncSelfTest.java | 13 +-
.../lang/GridFutureListenPerformanceTest.java | 5 +-
.../loadtest/GridSingleExecutionTest.java | 2 +-
...idFileSwapSpaceSpiMultithreadedLoadTest.java | 6 +-
.../cache/GridCacheAbstractLoadTest.java | 6 +-
.../cache/GridCachePutRemoveLoadTest.java | 2 +-
.../loadtests/cache/GridCacheSwapLoadTest.java | 13 +-
.../GridCacheWriteBehindStoreLoadTest.java | 4 +-
.../loadtests/colocation/GridTestMain.java | 12 +-
.../communication/GridIoManagerBenchmark.java | 10 +-
.../communication/GridIoManagerBenchmark0.java | 22 +-
.../GridContinuousOperationsLoadTest.java | 4 +-
.../multisplit/GridMultiSplitsLoadTest.java | 2 +-
...ridSingleSplitsNewNodesAbstractLoadTest.java | 2 +-
.../ignite/loadtests/dsi/GridDsiClient.java | 2 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 2 +-
.../loadtests/hashmap/GridCacheTestContext.java | 1 +
.../loadtests/hashmap/GridHashMapLoadTest.java | 1 +
...GridJobExecutionLoadTestClientSemaphore.java | 7 +-
...JobExecutionSingleNodeSemaphoreLoadTest.java | 9 +-
.../loadtests/job/GridJobLoadTestSubmitter.java | 2 +-
.../mergesort/GridMergeSortLoadTask.java | 8 +-
...apPartitionedMapPerformanceAbstractTest.java | 10 +-
.../streamer/GridStreamerIndexLoadTest.java | 8 +-
.../marshaller/GridMarshallerAbstractTest.java | 20 +-
.../ignite/messaging/GridMessagingSelfTest.java | 10 +-
.../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 +-
...redFsCheckpointSpiMultiThreadedSelfTest.java | 8 +-
.../collision/GridTestCollisionTaskSession.java | 3 +-
...bStealingCollisionSpiAttributesSelfTest.java | 4 +-
...alingCollisionSpiCustomTopologySelfTest.java | 4 +-
.../GridJobStealingCollisionSpiSelfTest.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 21 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 3 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 3 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 9 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 7 +-
...ClusterMetricsSnapshotSerializeSelfTest.java | 170 +
.../GridDiscoveryMetricsHelperSelfTest.java | 149 -
.../tcp/GridTcpDiscoveryMultiThreadedTest.java | 7 +-
.../discovery/tcp/GridTcpDiscoverySelfTest.java | 14 +-
.../file/GridFileSwapSpaceSpiSelfTest.java | 7 +-
.../GridCacheStoreValueBytesTest.java | 7 +-
.../index/GridStreamerIndexSelfTest.java | 8 +-
.../window/GridStreamerWindowSelfTest.java | 4 +-
.../testframework/GridSpiTestContext.java | 6 +-
.../ignite/testframework/GridTestNode.java | 8 +-
.../ignite/testframework/GridTestUtils.java | 12 +-
.../testframework/junits/GridAbstractTest.java | 22 +-
.../testframework/junits/GridTestIgnite.java | 6 +
.../junits/GridTestKernalContext.java | 2 +-
.../cache/GridAbstractCacheStoreSelfTest.java | 5 +-
.../junits/common/GridCommonAbstractTest.java | 34 +-
.../junits/spi/GridSpiAbstractTest.java | 2 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +-
.../IgniteCacheMetricsSelfTestSuite.java | 4 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../testsuites/IgniteComputeGridTestSuite.java | 6 +-
.../testsuites/IgniteUtilSelfTestSuite.java | 2 +-
...dConcurrentLinkedDequeMultiThreadedTest.java | 6 +-
...rrentLinkedHashMapMultiThreadedSelfTest.java | 10 +-
.../apache/ignite/util/GridIndexFillTest.java | 4 +-
.../ignite/util/GridSnapshotLockSelfTest.java | 6 +-
.../util/GridSpinReadWriteLockSelfTest.java | 4 +-
.../util/GridTopologyHeapSizeSelfTest.java | 4 +-
.../ignite/util/mbeans/GridMBeanSelfTest.java | 49 +-
modules/core/src/test/resources/readme.txt | 2 +-
modules/email/readme.txt | 12 +-
.../processors/email/IgniteEmailProcessor.java | 5 +-
modules/hadoop/readme.txt | 12 +-
.../GridHadoopClientProtocolProvider.java | 8 +-
.../hadoop/GridHadoopClassLoader.java | 2 +-
.../processors/hadoop/GridHadoopImpl.java | 6 +-
.../hadoop/IgniteHadoopProcessor.java | 5 +-
.../hadoop/jobtracker/GridHadoopJobTracker.java | 19 +-
.../GridHadoopDefaultMapReducePlanner.java | 2 +-
.../proto/GridHadoopProtocolJobStatusTask.java | 7 +-
.../hadoop/shuffle/GridHadoopShuffle.java | 2 +-
.../hadoop/shuffle/GridHadoopShuffleJob.java | 7 +-
.../GridHadoopExternalTaskExecutor.java | 16 +-
.../child/GridHadoopChildProcessRunner.java | 18 +-
.../GridGgfsHadoopFileSystemClientSelfTest.java | 2 +-
...idHadoopDefaultMapReducePlannerSelfTest.java | 16 +-
.../hadoop/GridHadoopJobTrackerSelfTest.java | 5 +-
.../GridHadoopMapReduceEmbeddedSelfTest.java | 4 +-
.../hadoop/GridHadoopMapReduceTest.java | 4 +-
.../hadoop/GridHadoopTaskExecutionSelfTest.java | 12 +-
.../GridHadoopExecutorServiceTest.java | 4 +-
...GridHadoopExternalTaskExecutionSelfTest.java | 6 +-
.../ggfs/GridGgfsPerformanceBenchmark.java | 4 +-
modules/hibernate/readme.txt | 14 +-
.../hibernate/GridHibernateRegionFactory.java | 10 +-
modules/indexing/readme.txt | 12 +-
.../processors/query/h2/IgniteH2Indexing.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../cache/GridCacheAbstractQuerySelfTest.java | 6 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 8 +-
.../cache/GridCacheQueryLoadSelfTest.java | 2 +-
.../GridCacheQueryMultiThreadedSelfTest.java | 24 +-
...idCacheReduceQueryMultithreadedSelfTest.java | 6 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 5 +-
.../near/GridCacheQueryNodeRestartSelfTest.java | 5 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +-
.../GridCacheReplicatedQuerySelfTest.java | 6 +-
.../query/h2/GridH2IndexRebuildTest.java | 7 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 6 +-
.../query/h2/sql/GridQueryParsingTest.java | 2 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 4 +-
modules/jcl/readme.txt | 12 +-
modules/jta/readme.txt | 12 +-
.../GridTmLookupLifecycleAwareSelfTest.java | 2 +-
modules/log4j/readme.txt | 12 +-
modules/rest-http/readme.txt | 12 +-
modules/scalar/readme.txt | 8 +-
.../scalar/pimps/ScalarProjectionPimp.scala | 33 +-
modules/schedule/readme.txt | 12 +-
.../processors/schedule/ScheduleFutureImpl.java | 22 +-
.../schedule/GridScheduleSelfTest.java | 13 +-
modules/slf4j/readme.txt | 12 +-
modules/spring/readme.txt | 12 +-
.../java/org/apache/ignite/IgniteSpring.java | 8 +-
.../org/apache/ignite/IgniteSpringBean.java | 6 +
.../cache/spring/SpringDynamicCacheManager.java | 2 +-
modules/ssh/readme.txt | 12 +-
.../GridProjectionStartStopRestartSelfTest.java | 2 +-
modules/urideploy/readme.txt | 12 +-
.../uri/GridUriDeploymentSpiMBean.java | 8 +-
.../GridTaskUriDeploymentDeadlockSelfTest.java | 2 +-
.../commands/alert/VisorAlertCommand.scala | 7 +-
.../commands/top/VisorTopologyCommand.scala | 11 +-
.../scala/org/apache/ignite/visor/visor.scala | 12 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 2 +-
modules/web/readme.txt | 16 +-
.../GridServletContextListenerStartup.java | 4 +-
.../startup/servlet/GridServletStartup.java | 4 +-
.../internal/websession/WebSessionSelfTest.java | 4 +-
pom.xml | 4 +-
802 files changed, 21968 insertions(+), 18825 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/docs/mapred-site.ignite.xml
----------------------------------------------------------------------
diff --cc docs/mapred-site.ignite.xml
index 0000000,832a828..7129d8b
mode 000000,100644..100644
--- a/docs/mapred-site.ignite.xml
+++ b/docs/mapred-site.ignite.xml
@@@ -1,0 -1,79 +1,79 @@@
+ <?xml version="1.0"?>
+ <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. See accompanying LICENSE file.
+ -->
+
+ <!--
+ This template file contains settings needed to run Apache Hadoop jobs
+ with Apache Ignite In-Memory Accelerator.
+
+ You can replace '$HADOOP_HOME/etc/hadoop/mapred-site.xml' file with this
one
+ to run jobs on localhost (local node can be a part of distributed cluster
though).
+ To run jobs on remote host you have to change jobtracker address to the
REST address
+ of any running Ignite node.
+
+ Note that Ignite jars must be in Apache Hadoop client classpath to work
+ with this configuration.
+
+ Run script '$IGNITE_HOME/bin/setup-hadoop.{sh|bat}' for Apache Hadoop
client setup.
+ -->
+
+ <configuration>
- <!--
++ <!--
+ Framework name must be set to 'ignite'.
+ -->
+ <property>
+ <name>mapreduce.framework.name</name>
+ <value>ignite</value>
+ </property>
+
+ <!--
+ Job tracker address must be set to the REST address of any running
Ignite node.
+ -->
+ <property>
+ <name>mapreduce.jobtracker.address</name>
+ <value>localhost:11211</value>
+ </property>
+
+ <!-- Parameters for job tuning. -->
+ <!--
+ <property>
+ <name>mapreduce.job.reduces</name>
+ <value>1</value>
+ </property>
+
+ <property>
+ <name>mapreduce.job.maps</name>
+ <value>4</value>
+ </property>
+ -->
+
+ </configuration>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index a59691f,30db44c..0af1487
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@@ -271,13 -271,13 +271,13 @@@ public final class IgniteSystemProperti
/**
* Name of the system property or environment variable to activate
synchronous
- * listener notification for future objects implemented in GridGain. I.e.
+ * listener notification for future objects implemented in Ignite. I.e.
- * closure passed into method {@link
org.apache.ignite.lang.IgniteFuture#listenAsync(org.apache.ignite.lang.IgniteInClosure)}
will
+ * closure passed into method {@link
org.apache.ignite.internal.IgniteInternalFuture#listenAsync(org.apache.ignite.lang.IgniteInClosure)}
will
* be evaluated in the same thread that will end the future.
*
- * @see org.apache.ignite.lang.IgniteFuture#syncNotify()
+ * @see org.apache.ignite.internal.IgniteInternalFuture#syncNotify()
*/
- public static final String GG_FUT_SYNC_NOTIFICATION =
"GRIDGAIN_FUTURE_SYNC_NOTIFICATION";
+ public static final String IGNITE_FUT_SYNC_NOTIFICATION =
"IGNITE_FUTURE_SYNC_NOTIFICATION";
/**
* Name of the system property or environment variable to activate
concurrent
@@@ -285,9 -285,9 +285,9 @@@
* upon future completion every listener will be notified concurrently in
a
* separate thread.
*
- * @see org.apache.ignite.lang.IgniteFuture#concurrentNotify()
+ * @see org.apache.ignite.internal.IgniteInternalFuture#concurrentNotify()
*/
- public static final String GG_FUT_CONCURRENT_NOTIFICATION =
"GRIDGAIN_FUTURE_CONCURRENT_NOTIFICATION";
+ public static final String IGNITE_FUT_CONCURRENT_NOTIFICATION =
"IGNITE_FUTURE_CONCURRENT_NOTIFICATION";
/**
* System property to override deployment mode configuration parameter.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed8d4d80/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
index 0000000,cc376fb..8798262
mode 000000,100644..100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteInternalFuture.java
@@@ -1,0 -1,190 +1,190 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ package org.apache.ignite.internal;
+
+ import org.apache.ignite.*;
+ import org.apache.ignite.lang.*;
+ import org.jetbrains.annotations.*;
+
+ import java.util.concurrent.*;
+
+ /**
+ * Extension for standard {@link Future} interface. It adds simplified
exception handling,
+ * functional programming support and ability to listen for future completion
via functional
+ * callback.
+ * @param <R> Type of the result for the future.
+ */
+ public interface IgniteInternalFuture<R> {
+ /**
+ * Synchronously waits for completion of the computation and
+ * returns computation result.
+ *
+ * @return Computation result.
+ * @throws IgniteInterruptedException Subclass of {@link
IgniteCheckedException} thrown if the wait was interrupted.
+ * @throws IgniteFutureCancelledException Subclass of {@link
IgniteCheckedException} throws if computation was cancelled.
+ * @throws IgniteCheckedException If computation failed.
+ */
+ public R get() throws IgniteCheckedException;
+
+ /**
+ * Synchronously waits for completion of the computation for
+ * up to the timeout specified and returns computation result.
+ * This method is equivalent to calling {@link #get(long, TimeUnit)
get(long, TimeUnit.MILLISECONDS)}.
+ *
+ * @param timeout The maximum time to wait in milliseconds.
+ * @return Computation result.
+ * @throws IgniteInterruptedException Subclass of {@link
IgniteCheckedException} thrown if the wait was interrupted.
+ * @throws org.apache.ignite.lang.IgniteFutureTimeoutException Subclass
of {@link IgniteCheckedException} thrown if the wait was timed out.
+ * @throws IgniteFutureCancelledException Subclass of {@link
IgniteCheckedException} throws if computation was cancelled.
+ * @throws IgniteCheckedException If computation failed.
+ */
+ public R get(long timeout) throws IgniteCheckedException;
+
+ /**
+ * Synchronously waits for completion of the computation for
+ * up to the timeout specified and returns computation result.
+ *
+ * @param timeout The maximum time to wait.
+ * @param unit The time unit of the {@code timeout} argument.
+ * @return Computation result.
+ * @throws IgniteInterruptedException Subclass of {@link
IgniteCheckedException} thrown if the wait was interrupted.
+ * @throws org.apache.ignite.lang.IgniteFutureTimeoutException Subclass
of {@link IgniteCheckedException} thrown if the wait was timed out.
+ * @throws IgniteFutureCancelledException Subclass of {@link
IgniteCheckedException} throws if computation was cancelled.
+ * @throws IgniteCheckedException If computation failed.
+ */
+ public R get(long timeout, TimeUnit unit) throws IgniteCheckedException;
+
+ /**
+ * Cancels this future.
+ *
+ * @return {@code True} if future was canceled (i.e. was not finished
prior to this call).
+ * @throws IgniteCheckedException If cancellation failed.
+ */
+ public boolean cancel() throws IgniteCheckedException;
+
+ /**
+ * Checks if computation is done.
+ *
+ * @return {@code True} if computation is done, {@code false} otherwise.
+ */
+ public boolean isDone();
+
+ /**
+ * Returns {@code true} if this computation was cancelled before it
completed normally.
+ *
+ * @return {@code True} if this computation was cancelled before it
completed normally.
+ */
+ public boolean isCancelled();
+
+ /**
+ * Gets start time for this future.
+ *
+ * @return Start time for this future.
+ */
+ public long startTime();
+
+ /**
+ * Gets duration in milliseconds between start of the future and current
time if future
+ * is not finished, or between start and finish of this future.
+ *
+ * @return Time in milliseconds this future has taken to execute.
+ */
+ public long duration();
+
+ /**
+ * Flag to turn on or off synchronous listener notification. If this flag
is {@code true}, then
+ * upon future completion the notification may happen in the same thread
that created
+ * the future. This becomes especially important when adding listener to
a future that
+ * is already {@code done} - if this flag is {@code true}, then listener
will be
+ * immediately notified within the same thread.
+ * <p>
+ * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#GG_FUT_SYNC_NOTIFICATION} system
property to {@code true}.
++ * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system
property to {@code true}.
+ *
+ * @param syncNotify Flag to turn on or off synchronous listener
notification.
+ */
+ public void syncNotify(boolean syncNotify);
+
+ /**
+ * Gets value of synchronous listener notification flag. If this flag is
{@code true}, then
+ * upon future completion the notification may happen in the same thread
that created
+ * the future. This becomes especially important when adding listener to
a future that
+ * is already {@code done} - if this flag is {@code true}, then listener
will be
+ * immediately notified within the same thread.
+ * <p>
+ * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#GG_FUT_SYNC_NOTIFICATION} system
property to {@code true}.
++ * {@link IgniteSystemProperties#IGNITE_FUT_SYNC_NOTIFICATION} system
property to {@code true}.
+ *
+ * @return Synchronous listener notification flag.
+ */
+ public boolean syncNotify();
+
+ /**
+ * Flag to turn on or off concurrent listener notification. This flag
comes into play only
+ * when a future has more than one listener subscribed to it. If this
flag is {@code true},
+ * then all listeners will be notified concurrently by different threads;
otherwise,
+ * listeners will be notified one after another within one thread
(depending on
+ * {@link #syncNotify()} flag, these notifications may happen either in
the same thread which
+ * started the future, or in a different thread).
+ * <p>
+ * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system
property to {@code true}.
++ * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION}
system property to {@code true}.
+ *
+ * @param concurNotify Flag to turn on or off concurrent listener
notification.
+ */
+ public void concurrentNotify(boolean concurNotify);
+
+ /**
+ * Gets value concurrent listener notification flag. This flag comes into
play only
+ * when a future has more than one listener subscribed to it. If this
flag is {@code true},
+ * then all listeners will be notified concurrently by different threads;
otherwise,
+ * listeners will be notified one after another within one thread
(depending on
+ * {@link #syncNotify()} flag, these notifications may happen either in
the same thread which
+ * started the future, or in a different thread).
+ * <p>
+ * Default value is {@code false}. To change the default, set
- * {@link IgniteSystemProperties#GG_FUT_CONCURRENT_NOTIFICATION} system
property to {@code true}.
++ * {@link IgniteSystemProperties#IGNITE_FUT_CONCURRENT_NOTIFICATION}
system property to {@code true}.
+ *
+ * @return Concurrent listener notification flag
+ */
+ public boolean concurrentNotify();
+
+ /**
+ * Registers listener closure to be asynchronously notified whenever
future completes.
+ *
+ * @param lsnr Listener closure to register. If not provided - this
method is no-op.
+ */
+ public void listenAsync(@Nullable IgniteInClosure<? super
IgniteInternalFuture<R>> lsnr);
+
+ /**
+ * Removes given listeners from the future. If no listener is passed in,
then all listeners
+ * will be removed.
+ *
+ * @param lsnr Listeners to remove.
+ */
+ public void stopListenAsync(@Nullable IgniteInClosure<? super
IgniteInternalFuture<R>>... lsnr);
+
+ /**
+ * Make a chained future to convert result of this future (when complete)
into a new format.
+ * It is guaranteed that done callback will be called only ONCE.
+ *
+ * @param doneCb Done callback that is applied to this future when it
finishes to produce chained future result.
+ * @return Chained future that finishes after this future completes and
done callback is called.
+ */
+ public <T> IgniteInternalFuture<T> chain(IgniteClosure<? super
IgniteInternalFuture<R>, T> doneCb);
+ }
