Merge branches 'ignite-gg-9621' and 'ignite-sprint-5' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9621
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1f516a25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1f516a25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1f516a25
Branch: refs/heads/ignite-sprint-5
Commit: 1f516a2531bec313bb6102f79d43d75e04c36a48
Parents: 1497cbe bf3203a
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Thu Jun 4 16:34:33 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Thu Jun 4 16:34:33 2015 +0700
----------------------------------------------------------------------
.gitignore | 3 +-
DEVNOTES.txt | 47 +-
LICENSE | 238 +
LICENSE.txt | 238 -
NOTICE | 12 +
NOTICE.txt | 12 -
RELEASE_NOTES.txt | 13 +-
assembly/dependencies-fabric.xml | 50 +
assembly/dependencies-hadoop.xml | 1 -
assembly/dependencies-optional-fabric.xml | 82 -
assembly/dependencies-optional-hadoop.xml | 83 -
assembly/dependencies-visor-console.xml | 3 +
assembly/release-base.xml | 15 +-
assembly/release-fabric.xml | 5 +
assembly/release-schema-import.xml | 50 +
bin/ignite-schema-import.bat | 2 +-
bin/ignite-schema-import.sh | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 2 +-
bin/ignitevisorcmd.bat | 2 +-
bin/ignitevisorcmd.sh | 2 +-
bin/include/build-classpath.bat | 46 +
bin/include/build-classpath.sh | 71 +
bin/include/functions.sh | 2 +-
bin/include/target-classpath.bat | 46 -
bin/include/target-classpath.sh | 71 -
dev-tools/.gitignore | 2 +
dev-tools/build.gradle | 54 +
.../gradle/wrapper/gradle-wrapper.properties | 20 +
dev-tools/gradlew | 233 +
dev-tools/slurp.sh | 76 +
dev-tools/src/main/groovy/jiraslurp.groovy | 544 ++
examples/README.txt | 2 +-
examples/pom.xml | 2 +-
.../hibernate/CacheHibernatePersonStore.java | 202 +-
.../hibernate/CacheHibernateStoreExample.java | 20 +-
.../store/jdbc/CacheJdbcPersonStore.java | 180 +-
.../store/jdbc/CacheJdbcStoreExample.java | 16 +-
.../store/spring/CacheSpringPersonStore.java | 128 +
.../store/spring/CacheSpringStoreExample.java | 143 +
.../datagrid/store/spring/package-info.java | 22 +
.../streaming/StreamTransformerExample.java | 4 +-
.../streaming/StreamVisitorExample.java | 4 +-
.../ignite/examples/streaming/package-info.java | 1 -
.../streaming/wordcount/CacheConfig.java | 7 +-
.../streaming/wordcount/QueryWords.java | 12 +-
.../streaming/wordcount/StreamWords.java | 12 +-
.../streaming/wordcount/package-info.java | 1 -
.../socket/WordsSocketStreamerClient.java | 82 +
.../socket/WordsSocketStreamerServer.java | 124 +
.../wordcount/socket/package-info.java | 21 +
.../examples/ScalarContinuationExample.scala | 10 +-
modules/aop/pom.xml | 2 +-
.../aop/aspectj/GridifyAspectJAspect.java | 2 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 2 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 2 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 2 +-
.../spring/GridifySetToValueSpringAspect.java | 2 +-
.../gridify/aop/spring/GridifySpringAspect.java | 2 +-
modules/aws/pom.xml | 2 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
.../s3/S3CheckpointManagerSelfTest.java | 2 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +-
.../s3/S3SessionCheckpointSelfTest.java | 2 +-
.../config/grid-client-config.properties | 50 +-
modules/clients/pom.xml | 2 +-
.../ClientPropertiesConfigurationSelfTest.java | 12 +-
.../ClientAbstractConnectivitySelfTest.java | 14 +
.../clients/src/test/resources/spring-cache.xml | 4 +-
.../src/test/resources/spring-server-node.xml | 4 +-
.../test/resources/spring-server-ssl-node.xml | 4 +-
modules/cloud/README.txt | 32 +
modules/cloud/licenses/apache-2.0.txt | 202 +
modules/cloud/pom.xml | 106 +
.../cloud/TcpDiscoveryCloudIpFinder.java | 433 ++
.../tcp/ipfinder/cloud/package-info.java | 21 +
.../TcpDiscoveryCloudIpFinderSelfTest.java | 122 +
.../tcp/ipfinder/cloud/package-info.java | 22 +
.../ignite/testsuites/IgniteCloudTestSuite.java | 112 +
modules/codegen/pom.xml | 14 +-
.../ignite/codegen/MessageCodeGenerator.java | 30 +-
modules/core/pom.xml | 2 +-
modules/core/src/main/java/META-INF/LICENSE | 238 +
modules/core/src/main/java/META-INF/NOTICE | 12 +
.../src/main/java/org/apache/ignite/Ignite.java | 8 +-
.../java/org/apache/ignite/IgniteCache.java | 5 +
.../org/apache/ignite/IgniteJdbcDriver.java | 81 +-
.../java/org/apache/ignite/IgniteLogger.java | 8 +-
.../java/org/apache/ignite/IgniteServices.java | 7 +-
.../apache/ignite/IgniteSystemProperties.java | 6 -
.../main/java/org/apache/ignite/Ignition.java | 64 +-
.../apache/ignite/cache/CacheInterceptor.java | 9 +-
.../org/apache/ignite/cache/CacheMetrics.java | 187 +-
.../cache/CacheServerNotFoundException.java | 12 +-
.../apache/ignite/cache/CachingProvider.java | 3 +
.../ignite/cache/eviction/EvictableEntry.java | 7 +
.../ignite/cache/eviction/EvictionPolicy.java | 2 +
.../cache/eviction/fifo/FifoEvictionPolicy.java | 120 +-
.../eviction/fifo/FifoEvictionPolicyMBean.java | 22 +
.../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +-
.../cache/eviction/lru/LruEvictionPolicy.java | 136 +-
.../eviction/lru/LruEvictionPolicyMBean.java | 38 +
.../eviction/random/RandomEvictionPolicy.java | 10 +-
.../eviction/sorted/SortedEvictionPolicy.java | 520 ++
.../sorted/SortedEvictionPolicyMBean.java | 88 +
.../cache/eviction/sorted/package-info.java | 21 +
.../apache/ignite/cache/query/QueryMetrics.java | 6 +-
.../apache/ignite/cache/store/CacheStore.java | 2 +
.../ignite/cache/store/CacheStoreSession.java | 22 +
.../cache/store/CacheStoreSessionListener.java | 133 +
.../jdbc/CacheJdbcStoreSessionListener.java | 141 +
.../org/apache/ignite/cluster/ClusterNode.java | 24 +-
.../ignite/compute/ComputeJobContinuation.java | 2 +
.../configuration/CacheConfiguration.java | 350 +-
.../configuration/ConnectorConfiguration.java | 2 +-
.../configuration/IgniteConfiguration.java | 493 +-
.../ignite/configuration/TopologyValidator.java | 35 +
.../ignite/events/CacheQueryExecutedEvent.java | 3 +-
.../ignite/events/CacheQueryReadEvent.java | 3 +-
.../org/apache/ignite/igfs/IgfsUserContext.java | 119 +
.../igfs/secondary/IgfsSecondaryFileSystem.java | 7 +
.../ignite/internal/ClusterMetricsSnapshot.java | 14 +
.../ignite/internal/GridDirectCollection.java | 3 +
.../internal/GridEventConsumeHandler.java | 126 +-
.../ignite/internal/GridJobContextImpl.java | 99 +-
.../ignite/internal/GridKernalContext.java | 5 +
.../ignite/internal/GridKernalContextImpl.java | 5 +
.../ignite/internal/GridUpdateNotifier.java | 66 +-
.../ignite/internal/IgniteComponentType.java | 36 +-
.../org/apache/ignite/internal/IgniteEx.java | 10 +-
.../apache/ignite/internal/IgniteKernal.java | 164 +-
.../org/apache/ignite/internal/IgnitionEx.java | 234 +-
.../ignite/internal/MarshallerContextImpl.java | 4 +-
.../client/GridClientConfiguration.java | 2 +-
.../connection/GridClientNioTcpConnection.java | 9 +-
.../internal/cluster/ClusterGroupAdapter.java | 16 +
.../ClusterTopologyServerNotFoundException.java | 12 +-
.../internal/direct/DirectByteBufferStream.java | 4 +-
.../internal/events/DiscoveryCustomEvent.java | 18 +-
.../internal/igfs/common/IgfsMarshaller.java | 35 +-
.../igfs/common/IgfsPathControlRequest.java | 22 +
.../interop/InteropAwareEventFilter.java | 37 +
.../internal/interop/InteropBootstrap.java | 34 +
.../interop/InteropBootstrapFactory.java | 39 +
.../internal/interop/InteropException.java | 71 +
.../internal/interop/InteropIgnition.java | 166 +
.../interop/InteropLocalEventListener.java | 28 +
.../interop/InteropNoCallbackException.java | 50 +
.../internal/interop/InteropProcessor.java | 36 +
.../internal/managers/GridManagerAdapter.java | 63 +-
.../managers/communication/GridIoManager.java | 71 +-
.../communication/GridIoMessageFactory.java | 12 +-
.../GridLifecycleAwareMessageFilter.java | 38 +
.../deployment/GridDeploymentClassLoader.java | 2 +-
.../deployment/GridDeploymentManager.java | 2 +-
.../GridDeploymentPerVersionStore.java | 3 +-
.../managers/discovery/CustomEventListener.java | 31 +
.../discovery/CustomMessageWrapper.java | 63 +
.../discovery/DiscoveryCustomMessage.java | 48 +
.../discovery/GridDiscoveryManager.java | 289 +-
.../eventstorage/GridEventStorageManager.java | 35 +-
.../managers/indexing/GridIndexingManager.java | 14 +-
.../affinity/GridAffinityAssignmentCache.java | 43 +-
.../processors/cache/CacheEntryImpl.java | 29 +-
.../cache/CacheEvictableEntryImpl.java | 31 +
.../processors/cache/CacheInvokeResult.java | 24 +-
.../processors/cache/CacheLockImpl.java | 20 +-
.../processors/cache/CacheMetricsImpl.java | 367 +-
.../cache/CacheMetricsMXBeanImpl.java | 100 +
.../processors/cache/CacheMetricsSnapshot.java | 380 +-
.../processors/cache/CacheObjectImpl.java | 2 +-
.../processors/cache/CacheOperationContext.java | 170 +
.../processors/cache/CacheProjection.java | 1386 ----
.../cache/CacheStoreBalancingWrapper.java | 6 +
.../cache/CacheVersionedEntryImpl.java | 29 +-
.../cache/DynamicCacheChangeBatch.java | 20 +-
.../cache/DynamicCacheDescriptor.java | 18 +-
.../internal/processors/cache/GridCache.java | 223 -
.../processors/cache/GridCacheAdapter.java | 821 +-
.../cache/GridCacheAffinityManager.java | 26 +-
.../processors/cache/GridCacheAtomicFuture.java | 7 -
.../cache/GridCacheConcurrentMap.java | 45 +-
.../processors/cache/GridCacheContext.java | 82 +-
.../processors/cache/GridCacheEntryEx.java | 10 +
.../cache/GridCacheEvictionManager.java | 13 +-
.../processors/cache/GridCacheGateway.java | 121 +-
.../processors/cache/GridCacheIoManager.java | 330 +-
.../processors/cache/GridCacheMapEntry.java | 223 +-
.../processors/cache/GridCacheMessage.java | 8 +-
.../processors/cache/GridCacheMvccManager.java | 38 +-
.../GridCachePartitionExchangeManager.java | 83 +-
.../processors/cache/GridCachePreloader.java | 6 +-
.../cache/GridCachePreloaderAdapter.java | 11 +-
.../processors/cache/GridCacheProcessor.java | 289 +-
.../processors/cache/GridCacheProjectionEx.java | 351 -
.../cache/GridCacheProjectionImpl.java | 766 --
.../processors/cache/GridCacheProxy.java | 27 -
.../processors/cache/GridCacheProxyImpl.java | 424 +-
.../processors/cache/GridCacheReturn.java | 5 +-
.../cache/GridCacheSharedContext.java | 50 +-
.../processors/cache/GridCacheSwapManager.java | 364 +-
.../processors/cache/GridCacheTtlManager.java | 156 +-
.../processors/cache/GridCacheUtils.java | 353 +-
.../processors/cache/IgniteCacheProxy.java | 465 +-
.../processors/cache/IgniteInternalCache.java | 1794 +++++
.../cache/affinity/GridCacheAffinityImpl.java | 12 +-
.../cache/affinity/GridCacheAffinityProxy.java | 30 +-
.../CacheDataStructuresManager.java | 10 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 383 -
...idCacheOptimisticCheckPreparedTxRequest.java | 232 -
...dCacheOptimisticCheckPreparedTxResponse.java | 179 -
.../distributed/GridCacheTxRecoveryFuture.java | 506 ++
.../distributed/GridCacheTxRecoveryRequest.java | 261 +
.../GridCacheTxRecoveryResponse.java | 182 +
.../GridDistributedCacheAdapter.java | 210 +-
.../distributed/GridDistributedCacheEntry.java | 7 -
.../distributed/GridDistributedLockRequest.java | 104 +-
.../GridDistributedTxFinishRequest.java | 70 +-
.../distributed/GridDistributedTxMapping.java | 22 +-
.../GridDistributedTxPrepareRequest.java | 112 +-
.../GridDistributedTxRemoteAdapter.java | 35 +-
.../dht/GridClientPartitionTopology.java | 8 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 21 +-
.../dht/GridDhtAssignmentFetchFuture.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java | 57 +-
.../distributed/dht/GridDhtCacheEntry.java | 6 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 20 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 50 +-
.../distributed/dht/GridDhtLockRequest.java | 50 +-
.../dht/GridDhtOffHeapCacheEntry.java | 63 +
.../dht/GridDhtPartitionTopologyImpl.java | 30 +-
.../distributed/dht/GridDhtTopologyFuture.java | 8 +
.../dht/GridDhtTransactionalCacheAdapter.java | 256 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 105 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 43 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 45 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 152 +-
.../cache/distributed/dht/GridDhtTxMapping.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 115 +-
.../dht/GridDhtTxPrepareRequest.java | 60 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 22 +-
.../distributed/dht/GridNoStorageCacheMap.java | 4 +-
.../dht/GridPartitionedGetFuture.java | 29 +-
.../dht/atomic/GridDhtAtomicCache.java | 151 +-
.../atomic/GridDhtAtomicOffHeapCacheEntry.java | 63 +
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 27 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 8 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 165 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 157 +-
.../atomic/GridNearAtomicUpdateResponse.java | 18 +-
.../dht/colocated/GridDhtColocatedCache.java | 78 +-
.../colocated/GridDhtColocatedLockFuture.java | 250 +-
.../GridDhtColocatedOffHeapCacheEntry.java | 63 +
.../colocated/GridDhtDetachedCacheEntry.java | 4 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 10 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 54 +-
.../preloader/GridDhtPartitionDemandPool.java | 26 +-
.../dht/preloader/GridDhtPartitionMap.java | 2 +-
.../preloader/GridDhtPartitionSupplyPool.java | 31 +-
.../GridDhtPartitionsExchangeFuture.java | 390 +-
.../preloader/GridDhtPartitionsFullMessage.java | 4 +-
.../GridDhtPartitionsSingleMessage.java | 33 +-
.../dht/preloader/GridDhtPreloader.java | 39 +-
.../preloader/GridDhtPreloaderAssignments.java | 3 +-
.../distributed/near/GridNearAtomicCache.java | 18 +-
.../distributed/near/GridNearCacheAdapter.java | 25 +-
.../distributed/near/GridNearCacheEntry.java | 22 +-
.../distributed/near/GridNearGetFuture.java | 39 +-
.../distributed/near/GridNearGetResponse.java | 8 +-
.../distributed/near/GridNearLockFuture.java | 319 +-
.../distributed/near/GridNearLockRequest.java | 52 +-
.../distributed/near/GridNearLockResponse.java | 48 +-
.../near/GridNearOffHeapCacheEntry.java | 60 +
.../near/GridNearOptimisticTxPrepareFuture.java | 815 ++
.../GridNearPessimisticTxPrepareFuture.java | 350 +
.../near/GridNearTransactionalCache.java | 57 +-
.../near/GridNearTxFinishFuture.java | 3 +
.../near/GridNearTxFinishRequest.java | 28 +-
.../cache/distributed/near/GridNearTxLocal.java | 163 +-
.../near/GridNearTxPrepareFuture.java | 1030 ---
.../near/GridNearTxPrepareFutureAdapter.java | 231 +
.../near/GridNearTxPrepareRequest.java | 86 +-
.../near/GridNearTxPrepareResponse.java | 92 +-
.../distributed/near/GridNearTxRemote.java | 31 +-
.../processors/cache/local/GridLocalCache.java | 14 +-
.../cache/local/GridLocalCacheEntry.java | 18 +
.../local/atomic/GridLocalAtomicCache.java | 133 +-
.../processors/cache/query/CacheQueries.java | 143 -
.../processors/cache/query/CacheQuery.java | 12 +-
.../query/GridCacheDistributedQueryManager.java | 3 +
.../cache/query/GridCacheLocalQueryFuture.java | 3 +
.../cache/query/GridCacheQueriesEx.java | 68 -
.../cache/query/GridCacheQueriesImpl.java | 217 -
.../cache/query/GridCacheQueriesProxy.java | 285 -
.../cache/query/GridCacheQueryAdapter.java | 24 +-
.../cache/query/GridCacheQueryErrorFuture.java | 2 +
.../query/GridCacheQueryFutureAdapter.java | 3 +
.../cache/query/GridCacheQueryManager.java | 173 +-
.../cache/query/GridCacheSqlQuery.java | 137 +-
.../cache/query/GridCacheTwoStepQuery.java | 25 +-
.../continuous/CacheContinuousQueryManager.java | 28 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 7 +-
.../cache/store/CacheOsStoreManager.java | 1 -
.../cache/store/CacheStoreManager.java | 7 +-
.../store/GridCacheStoreManagerAdapter.java | 202 +-
.../cache/transactions/IgniteInternalTx.java | 27 +-
.../transactions/IgniteTransactionsImpl.java | 4 +-
.../cache/transactions/IgniteTxAdapter.java | 135 +-
.../cache/transactions/IgniteTxEntry.java | 66 +-
.../cache/transactions/IgniteTxHandler.java | 330 +-
.../transactions/IgniteTxLocalAdapter.java | 439 +-
.../cache/transactions/IgniteTxLocalEx.java | 25 +-
.../cache/transactions/IgniteTxManager.java | 416 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 5 +-
.../IgniteCacheObjectProcessorImpl.java | 4 +-
.../closure/GridClosureProcessor.java | 16 +-
.../continuous/AbstractContinuousMessage.java | 54 +
.../continuous/GridContinuousMessageType.java | 12 -
.../continuous/GridContinuousProcessor.java | 836 +-
.../processors/continuous/StartRequestData.java | 267 +
.../StartRoutineAckDiscoveryMessage.java | 63 +
.../StartRoutineDiscoveryMessage.java | 85 +
.../StopRoutineAckDiscoveryMessage.java | 49 +
.../continuous/StopRoutineDiscoveryMessage.java | 49 +
.../datastreamer/DataStreamProcessor.java | 28 +-
.../datastreamer/DataStreamerCacheUpdaters.java | 15 +-
.../datastreamer/DataStreamerImpl.java | 86 +-
.../datastreamer/DataStreamerRequest.java | 38 +-
.../datastreamer/DataStreamerUpdateJob.java | 16 +-
.../datastructures/DataStructuresProcessor.java | 24 +-
.../datastructures/GridCacheAtomicLongImpl.java | 4 +-
.../GridCacheAtomicReferenceImpl.java | 4 +-
.../GridCacheAtomicSequenceImpl.java | 4 +-
.../GridCacheAtomicStampedImpl.java | 4 +-
.../GridCacheCountDownLatchImpl.java | 4 +-
.../datastructures/GridCacheSetImpl.java | 2 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java | 2 -
.../internal/processors/hadoop/HadoopJob.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 9 +-
.../processors/igfs/IgfsDeleteWorker.java | 4 +
.../ignite/internal/processors/igfs/IgfsEx.java | 8 +-
.../processors/igfs/IgfsFileWorkerBatch.java | 3 +
.../internal/processors/igfs/IgfsImpl.java | 8 +-
.../processors/igfs/IgfsIpcHandler.java | 184 +-
.../processors/igfs/IgfsMetaManager.java | 10 +-
.../igfs/IgfsSecondaryFileSystemImpl.java | 9 +-
.../internal/processors/igfs/IgfsServer.java | 4 +-
.../internal/processors/igfs/IgfsThread.java | 8 +-
.../internal/processors/igfs/IgfsUtils.java | 27 +-
.../processors/job/GridJobHoldListener.java | 6 +-
.../processors/job/GridJobProcessor.java | 28 +-
.../internal/processors/job/GridJobWorker.java | 32 +-
.../offheap/GridOffHeapProcessor.java | 17 +
.../portable/GridPortableInputStream.java | 26 -
.../processors/query/GridQueryIndexing.java | 39 +-
.../processors/query/GridQueryProcessor.java | 418 +-
.../messages/GridQueryNextPageResponse.java | 68 +-
.../h2/twostep/messages/GridQueryRequest.java | 21 +-
.../processors/resource/GridResourceField.java | 16 +-
.../processors/resource/GridResourceIoc.java | 389 +-
.../processors/resource/GridResourceMethod.java | 13 +
.../resource/GridResourceProcessor.java | 20 +-
.../processors/rest/GridRestCommand.java | 11 +-
.../processors/rest/GridRestProcessor.java | 12 +-
.../message/GridClientCacheQueryRequest.java | 366 -
.../cache/GridCacheClientQueryResult.java | 97 -
.../handlers/cache/GridCacheCommandHandler.java | 64 +-
.../cache/GridCacheQueryCommandHandler.java | 480 --
.../top/GridTopologyCommandHandler.java | 3 +-
.../protocols/tcp/GridTcpRestNioListener.java | 24 -
.../rest/request/GridRestCacheQueryRequest.java | 143 -
.../service/GridServiceProcessor.java | 132 +-
.../processors/task/GridTaskProcessor.java | 6 +-
.../processors/task/GridTaskWorker.java | 12 +
.../timeout/GridTimeoutProcessor.java | 3 +
.../ignite/internal/util/GridJavaProcess.java | 26 +-
.../ignite/internal/util/IgniteUtils.java | 50 +-
.../internal/util/future/GridFutureAdapter.java | 4 +-
.../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 4 +-
.../util/lang/GridComputeJobWrapper.java | 96 -
.../util/lang/GridFilteredIterator.java | 2 +-
.../ignite/internal/util/lang/GridFunc.java | 7218 +++++-------------
.../internal/util/nio/GridBufferedParser.java | 4 -
.../internal/util/nio/GridDelimitedParser.java | 91 +
.../util/nio/GridNioDelimitedBuffer.java | 106 +
.../ignite/internal/util/nio/GridNioServer.java | 6 +
.../util/offheap/GridOffHeapPartitionedMap.java | 9 +
.../unsafe/GridUnsafePartitionedMap.java | 155 +-
.../util/spring/IgniteSpringHelper.java | 56 +-
.../util/tostring/GridToStringBuilder.java | 2 +-
.../apache/ignite/internal/util/typedef/X.java | 2 +-
.../ignite/internal/util/worker/GridWorker.java | 3 +
.../ignite/internal/visor/cache/VisorCache.java | 92 +-
.../visor/cache/VisorCacheConfiguration.java | 7 -
.../visor/cache/VisorCacheMetadataTask.java | 9 +-
.../internal/visor/cache/VisorCacheMetrics.java | 53 +-
.../cache/VisorCacheNearConfiguration.java | 4 +-
.../visor/cache/VisorCacheNodesTask.java | 74 +
.../visor/cache/VisorCacheRebalanceTask.java | 4 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 2 +-
.../visor/cache/VisorCacheStartTask.java | 155 +
.../cache/VisorCacheStoreConfiguration.java | 35 -
.../visor/cache/VisorCacheSwapBackupsTask.java | 2 +-
.../cache/VisorCacheTypeFieldMetadata.java | 36 +-
.../visor/cache/VisorCacheTypeMetadata.java | 99 +-
.../internal/visor/igfs/VisorIgfsMetrics.java | 128 +-
.../visor/misc/VisorResolveHostNameTask.java | 2 +-
.../visor/node/VisorBasicConfiguration.java | 11 +
.../visor/node/VisorNodeDataCollectorJob.java | 8 +-
.../node/VisorNodeEventsCollectorTask.java | 58 +-
.../internal/visor/query/VisorQueryArg.java | 31 +-
.../internal/visor/query/VisorQueryCursor.java | 1 -
.../internal/visor/query/VisorQueryJob.java | 13 +-
.../internal/visor/query/VisorQueryTask.java | 41 -
.../internal/visor/util/VisorEventMapper.java | 13 +
.../internal/visor/util/VisorTaskUtils.java | 12 +-
.../apache/ignite/lang/IgniteAsyncSupport.java | 4 +-
.../apache/ignite/logger/java/JavaLogger.java | 12 +-
.../apache/ignite/marshaller/Marshaller.java | 14 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 10 +-
.../optimized/OptimizedMarshaller.java | 8 +-
.../ignite/messaging/MessagingListenActor.java | 3 +
.../ignite/mxbean/CacheMetricsMXBean.java | 80 +
.../apache/ignite/plugin/PluginProvider.java | 26 +-
.../apache/ignite/resources/LoggerResource.java | 2 +-
.../apache/ignite/resources/SpringResource.java | 2 +-
.../org/apache/ignite/services/Service.java | 7 +-
.../ignite/services/ServiceConfiguration.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 61 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 53 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 3 +
.../checkpoint/cache/CacheCheckpointSpi.java | 2 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 4 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 10 +-
.../jobstealing/JobStealingCollisionSpi.java | 14 +-
.../PriorityQueueCollisionSpi.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 86 +-
.../tcp/TcpCommunicationSpiMBean.java | 9 -
.../ignite/spi/discovery/DiscoverySpi.java | 27 +-
.../discovery/DiscoverySpiCustomMessage.java | 40 +
.../spi/discovery/DiscoverySpiListener.java | 5 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 1481 ++++
.../ignite/spi/discovery/tcp/ServerImpl.java | 4735 ++++++++++++
.../discovery/tcp/TcpClientDiscoverySpi.java | 1256 ---
.../tcp/TcpClientDiscoverySpiMBean.java | 164 -
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 212 +
.../spi/discovery/tcp/TcpDiscoverySpi.java | 5792 +++-----------
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 1156 ---
.../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 9 +
.../tcp/internal/TcpDiscoveryNode.java | 7 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 2 +-
.../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +-
.../TcpDiscoveryMulticastIpFinder.java | 57 +-
.../messages/TcpDiscoveryAbstractMessage.java | 24 +-
.../TcpDiscoveryClientHeartbeatMessage.java | 67 +
.../messages/TcpDiscoveryClientPingRequest.java | 56 +
.../TcpDiscoveryClientPingResponse.java | 67 +
.../TcpDiscoveryCustomEventMessage.java | 41 +-
.../messages/TcpDiscoveryHeartbeatMessage.java | 28 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 43 +
.../messages/TcpDiscoveryNodeAddedMessage.java | 2 +-
.../tcp/messages/TcpDiscoveryPingRequest.java | 6 +
.../tcp/messages/TcpDiscoveryPingResponse.java | 15 +-
.../memory/MemoryEventStorageSpi.java | 10 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 10 +-
.../jobstealing/JobStealingFailoverSpi.java | 6 +-
.../spi/failover/never/NeverFailoverSpi.java | 8 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 4 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 12 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +-
.../WeightedRandomLoadBalancingSpi.java | 10 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 18 +-
.../ignite/startup/BasicWarmupClosure.java | 20 +-
.../startup/cmdline/CommandLineStartup.java | 5 +-
.../startup/cmdline/CommandLineTransformer.java | 3 +
.../org/apache/ignite/stream/StreamAdapter.java | 111 +
.../ignite/stream/StreamTupleExtractor.java | 33 +
.../stream/socket/SocketMessageConverter.java | 31 +
.../ignite/stream/socket/SocketStreamer.java | 218 +
.../ignite/stream/socket/package-info.java | 21 +
.../TransactionSynchronization.java | 45 -
.../resources/META-INF/classnames.properties | 65 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../src/test/config/load/merge-sort-base.xml | 2 +-
.../affinity/IgniteClientNodeAffinityTest.java | 182 +
...cheStoreSessionListenerAbstractSelfTest.java | 315 +
...heStoreSessionListenerLifecycleSelfTest.java | 395 +
.../CacheJdbcStoreSessionListenerSelfTest.java | 175 +
.../ignite/internal/GridAffinitySelfTest.java | 1 +
.../internal/GridCacheProjectionRemoveTest.java | 41 -
.../internal/GridContinuousTaskSelfTest.java | 114 +
.../internal/GridDiscoveryEventSelfTest.java | 35 +-
...ridFailFastNodeFailureDetectionSelfTest.java | 120 +
.../internal/GridLifecycleBeanSelfTest.java | 36 +
.../internal/GridProjectionAbstractTest.java | 16 +
.../GridProjectionForCachesSelfTest.java | 11 +-
.../internal/GridReleaseTypeSelfTest.java | 77 +-
.../apache/ignite/internal/GridSelfTest.java | 4 +-
.../internal/GridUpdateNotifierSelfTest.java | 30 +-
.../internal/IgniteInternalCacheRemoveTest.java | 41 +
.../GridDiscoveryManagerAliveCacheSelfTest.java | 66 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 122 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 46 +-
.../GridAffinityProcessorAbstractSelfTest.java | 1 +
.../processors/cache/CacheGetFromJobTest.java | 110 +
.../cache/CacheOffheapMapEntrySelfTest.java | 168 +
.../cache/CacheRemoveAllSelfTest.java | 81 +
.../GridCacheAbstractFailoverSelfTest.java | 56 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 761 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 48 +-
.../GridCacheAbstractRemoveFailureTest.java | 23 +
.../cache/GridCacheAbstractSelfTest.java | 6 +-
.../GridCacheAtomicMessageCountSelfTest.java | 1 +
.../GridCacheConcurrentTxMultiNodeTest.java | 10 +-
...idCacheConfigurationConsistencySelfTest.java | 14 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 4 +-
.../cache/GridCacheMemoryModeSelfTest.java | 23 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 2 +-
.../processors/cache/GridCacheOffHeapTest.java | 5 +-
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 3 +-
.../processors/cache/GridCachePutAllTask.java | 56 +-
.../cache/GridCacheReloadSelfTest.java | 6 +-
.../GridCacheReturnValueTransferSelfTest.java | 3 +
.../cache/GridCacheSwapReloadSelfTest.java | 20 +-
...acheTcpClientDiscoveryMultiThreadedTest.java | 190 +
.../processors/cache/GridCacheTestEntryEx.java | 6 +
.../GridCacheVariableTopologySelfTest.java | 12 +-
...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +
.../IgniteCacheAbstractStopBusySelfTest.java | 6 +-
.../cache/IgniteCacheAbstractTest.java | 2 +-
.../IgniteCacheConfigurationTemplateTest.java | 2 +-
.../IgniteCacheEntryListenerAbstractTest.java | 4 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 148 +
.../IgniteCacheP2pUnmarshallingErrorTest.java | 200 +
...gniteCacheP2pUnmarshallingNearErrorTest.java | 59 +
...CacheP2pUnmarshallingRebalanceErrorTest.java | 80 +
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 109 +
.../IgniteCachePartitionMapUpdateTest.java | 226 +
.../cache/IgniteCachePeekModesAbstractTest.java | 20 +-
.../cache/IgniteCachePutAllRestartTest.java | 203 +
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 86 +-
.../IgniteDynamicClientCacheStartSelfTest.java | 283 +
.../cache/IgniteExchangeFutureHistoryTest.java | 77 +
.../cache/IgniteSystemCacheOnClientTest.java | 97 +
...gniteTopologyValidatorAbstractCacheTest.java | 183 +
...iteTopologyValidatorAbstractTxCacheTest.java | 125 +
...ValidatorNearPartitionedAtomicCacheTest.java | 30 +
...logyValidatorNearPartitionedTxCacheTest.java | 30 +
...logyValidatorPartitionedAtomicCacheTest.java | 49 +
...TopologyValidatorPartitionedTxCacheTest.java | 30 +
...ologyValidatorReplicatedAtomicCacheTest.java | 49 +
...eTopologyValidatorReplicatedTxCacheTest.java | 30 +
.../cache/IgniteTxMultiNodeAbstractTest.java | 31 +-
.../cache/OffHeapTieredTransactionSelfTest.java | 127 +
.../GridCacheQueueApiSelfAbstractTest.java | 4 +-
.../IgniteClientDataStructuresAbstractTest.java | 283 +
.../IgniteClientDataStructuresTest.java | 28 +
...IgniteClientDiscoveryDataStructuresTest.java | 28 +
...CacheLoadingConcurrentGridStartSelfTest.java | 163 +
.../CacheNoValueClassOnServerNodeTest.java | 129 +
.../GridCacheAbstractNodeRestartSelfTest.java | 101 +-
.../GridCacheAtomicTimeoutSelfTest.java | 314 -
.../GridCacheClientModesAbstractSelfTest.java | 94 +-
...ientModesTcpClientDiscoveryAbstractTest.java | 168 +
...GridCacheLoadingConcurrentGridStartTest.java | 154 -
.../distributed/GridCacheLockAbstractTest.java | 73 +
.../distributed/GridCacheMixedModeSelfTest.java | 3 +
...ridCachePartitionNotLoadedEventSelfTest.java | 22 +-
.../IgniteCacheAtomicMessageRecoveryTest.java | 32 +
...niteCacheClientNodeChangingTopologyTest.java | 1803 +++++
.../IgniteCacheClientNodeConcurrentStart.java | 105 +
...teCacheClientNodePartitionsExchangeTest.java | 632 ++
.../IgniteCacheMessageRecoveryAbstractTest.java | 175 +
.../IgniteCachePutGetRestartAbstractTest.java | 234 +
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 +
.../IgniteCacheTxMessageRecoveryTest.java | 32 +
...arDisabledFairAffinityPutGetRestartTest.java | 35 +
...iteCacheTxNearDisabledPutGetRestartTest.java | 30 +
.../IgniteCrossCacheTxStoreSelfTest.java | 147 +-
.../distributed/IgniteTxGetAfterStopTest.java | 131 +
...xOriginatingNodeFailureAbstractSelfTest.java | 8 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 7 +-
.../dht/GridCacheClientOnlySelfTest.java | 60 +-
.../GridCacheDhtClientRemoveFailureTest.java | 28 +
...GridCacheDhtEvictionNearReadersSelfTest.java | 11 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 11 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 6 +-
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 43 +
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...achePartitionedNearDisabledLockSelfTest.java | 47 +
...ionedNearDisabledOffHeapFullApiSelfTest.java | 8 +-
...DisabledOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...abledOffHeapTieredAtomicFullApiSelfTest.java | 56 +
...earDisabledOffHeapTieredFullApiSelfTest.java | 33 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...itionedTxOriginatingNodeFailureSelfTest.java | 2 -
.../dht/IgniteCacheMultiTxLockSelfTest.java | 55 +-
...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 +
...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 +
...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 +
...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 ++
...cClientInvalidPartitionHandlingSelfTest.java | 29 +
.../GridCacheAtomicClientRemoveFailureTest.java | 28 +
...eAtomicInvalidPartitionHandlingSelfTest.java | 37 +-
...idCacheAtomicReplicatedFailoverSelfTest.java | 6 +
...unctionExcludeNeighborsAbstractSelfTest.java | 3 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...micFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 +
.../near/GridCacheAtomicNearOnlySelfTest.java | 32 -
...CacheAtomicOffHeapTieredFullApiSelfTest.java | 32 +
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...derFairAffinityMultiNodeFullApiSelfTest.java | 36 +
...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 +
...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 +
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +
.../near/GridCacheNearOnlySelfTest.java | 63 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 1 +
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 5 +-
.../GridCachePartitionedEvictionSelfTest.java | 11 +-
.../GridCachePartitionedFullApiSelfTest.java | 32 +
...achePartitionedMultiNodeFullApiSelfTest.java | 15 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 6 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...dCachePartitionedOffHeapFullApiSelfTest.java | 8 +-
...titionedOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...PartitionedOffHeapTieredFullApiSelfTest.java | 32 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 72 +
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 2 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 25 +-
...idCacheRendezvousAffinityClientSelfTest.java | 4 +
.../near/IgniteCacheNearOnlyTxTest.java | 190 +
.../near/IgniteCacheNearTxRollbackTest.java | 133 +
.../near/NoneRebalanceModeSelfTest.java | 67 +
...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 +
.../GridCacheReplicatedClientOnlySelfTest.java | 43 -
.../GridCacheReplicatedFailoverSelfTest.java | 6 +
.../GridCacheReplicatedLockSelfTest.java | 5 +
.../GridCacheReplicatedNearOnlySelfTest.java | 43 -
.../GridCacheReplicatedNodeRestartSelfTest.java | 82 +
...idCacheReplicatedOffHeapFullApiSelfTest.java | 8 +-
...plicatedOffHeapMultiNodeFullApiSelfTest.java | 8 +-
...eReplicatedOffHeapTieredFullApiSelfTest.java | 33 +
...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +
...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 -
.../GridCacheSyncReplicatedPreloadSelfTest.java | 1 -
...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +-
.../cache/eviction/EvictionAbstractTest.java | 1056 +++
.../GridCacheBatchEvictUnswapSelfTest.java | 5 +-
...heConcurrentEvictionConsistencySelfTest.java | 82 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 29 +-
.../GridCacheDistributedEvictionsSelfTest.java | 5 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 11 +-
.../eviction/GridCacheEvictionAbstractTest.java | 484 --
.../GridCacheEvictionTouchSelfTest.java | 22 +-
.../cache/eviction/GridCacheMockEntry.java | 5 +
.../fifo/FifoEvictionPolicySelfTest.java | 262 +
...ridCacheFifoBatchEvictionPolicySelfTest.java | 384 -
.../GridCacheFifoEvictionPolicySelfTest.java | 372 -
.../lru/GridCacheLruEvictionPolicySelfTest.java | 417 -
.../GridCacheLruNearEvictionPolicySelfTest.java | 136 -
...heNearOnlyLruNearEvictionPolicySelfTest.java | 171 -
.../eviction/lru/LruEvictionPolicySelfTest.java | 353 +
.../lru/LruNearEvictionPolicySelfTest.java | 140 +
.../LruNearOnlyNearEvictionPolicySelfTest.java | 172 +
.../GridCacheRandomEvictionPolicySelfTest.java | 258 -
.../RandomEvictionPolicyCacheSizeSelfTest.java | 78 +
.../random/RandomEvictionPolicySelfTest.java | 357 +
.../SortedEvictionPolicyPerformanceTest.java | 134 +
.../sorted/SortedEvictionPolicySelfTest.java | 266 +
.../IgniteCacheExpiryPolicyAbstractTest.java | 2 +-
.../IgniteCacheExpiryPolicyTestSuite.java | 2 +
.../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 +
...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +
...LocalAtomicOffHeapTieredFullApiSelfTest.java | 32 +
.../GridCacheLocalIsolatedNodesSelfTest.java | 118 +
.../GridCacheLocalOffHeapFullApiSelfTest.java | 6 +-
...dCacheLocalOffHeapTieredFullApiSelfTest.java | 32 +
.../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 6 +-
.../continuous/GridEventConsumeSelfTest.java | 93 +-
.../DataStreamProcessorSelfTest.java | 1 +
.../DataStreamerMultiThreadedSelfTest.java | 110 +
.../igfs/IgfsClientCacheSelfTest.java | 133 +
.../processors/igfs/IgfsCommonAbstractTest.java | 10 -
.../processors/igfs/IgfsOneClientNodeTest.java | 131 +
.../processors/igfs/IgfsSizeSelfTest.java | 2 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 4 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 10 +-
.../service/ClosureServiceClientsNodesTest.java | 251 +
.../service/GridServiceClientNodeTest.java | 81 +
.../GridServiceReassignmentSelfTest.java | 2 +-
.../util/nio/GridNioDelimitedBufferTest.java | 112 +
...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 5 +-
.../GridContinuousOperationsLoadTest.java | 3 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 6 +-
.../loadtests/hashmap/GridCacheTestContext.java | 3 +-
.../swap/GridSwapEvictAllBenchmark.java | 6 +-
.../logger/java/IgniteJavaLoggerTest.java | 65 -
.../ignite/logger/java/JavaLoggerTest.java | 65 +
.../OptimizedMarshallerNodeFailoverTest.java | 4 +-
...GridMessagingNoPeerClassLoadingSelfTest.java | 7 +-
.../ignite/messaging/GridMessagingSelfTest.java | 13 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 1 -
.../discovery/AbstractDiscoverySelfTest.java | 8 +-
...pClientDiscoveryMarshallerCheckSelfTest.java | 76 +
.../tcp/TcpClientDiscoverySelfTest.java | 692 --
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 +
.../tcp/TcpClientDiscoverySpiSelfTest.java | 1171 +++
.../tcp/TcpDiscoveryConcurrentStartTest.java | 61 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 18 +-
.../discovery/tcp/TcpDiscoveryRestartTest.java | 199 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 72 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 2 +-
.../stream/socket/SocketStreamerSelfTest.java | 315 +
.../ignite/stream/socket/package-info.java | 21 +
.../testframework/GridSpiTestContext.java | 30 +-
.../ignite/testframework/GridTestUtils.java | 15 +
.../testframework/junits/GridAbstractTest.java | 67 +-
.../junits/cache/TestCacheSession.java | 18 +
.../cache/TestThreadLocalCacheSession.java | 15 +
.../junits/common/GridCommonAbstractTest.java | 119 +-
.../junits/logger/GridTestLog4jLogger.java | 10 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 7 +
.../IgniteCacheDataStructuresSelfTestSuite.java | 3 +
.../IgniteCacheEvictionSelfTestSuite.java | 14 +-
.../IgniteCacheFailoverTestSuite.java | 18 +-
.../IgniteCacheFullApiSelfTestSuite.java | 27 +-
.../IgniteCacheMetricsSelfTestSuite.java | 1 +
.../IgniteCacheNearOnlySelfTestSuite.java | 16 +-
...niteCacheP2pUnmarshallingErrorTestSuite.java | 41 +
.../testsuites/IgniteCacheRestartTestSuite.java | 16 +-
.../IgniteCacheTcpClientDiscoveryTestSuite.java | 47 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 296 +-
.../testsuites/IgniteCacheTestSuite2.java | 143 +
.../testsuites/IgniteCacheTestSuite3.java | 142 +
.../testsuites/IgniteCacheTestSuite4.java | 140 +
.../IgniteCacheTxRecoverySelfTestSuite.java | 4 +
.../ignite/testsuites/IgniteIgfsTestSuite.java | 3 +
.../testsuites/IgniteKernalSelfTestSuite.java | 7 +-
.../testsuites/IgniteLoggingSelfTestSuite.java | 2 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 4 +-
.../testsuites/IgniteStreamTestSuite.java | 39 +
.../IgniteTopologyValidatorTestSuit.java | 43 +
.../testsuites/IgniteUtilSelfTestSuite.java | 1 +
.../ignite/util/TestTcpCommunicationSpi.java | 54 +
modules/extdata/p2p/pom.xml | 2 +-
.../CacheNoValueClassOnServerTestClient.java | 88 +
.../apache/ignite/tests/p2p/cache/Person.java | 42 +
.../CacheConfigurationP2PTestClient.java | 1 -
modules/extdata/uri/pom.xml | 2 +-
modules/gce/README.txt | 32 +
modules/gce/licenses/apache-2.0.txt | 202 +
modules/gce/pom.xml | 92 +
.../gce/TcpDiscoveryGoogleStorageIpFinder.java | 383 +
.../tcp/ipfinder/gce/package-info.java | 22 +
...pDiscoveryGoogleStorageIpFinderSelfTest.java | 73 +
.../tcp/ipfinder/gce/package-info.java | 22 +
.../ignite/testsuites/IgniteGCETestSuite.java | 71 +
modules/geospatial/pom.xml | 2 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 72 +-
modules/hadoop/pom.xml | 2 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 107 +-
.../hadoop/fs/v2/IgniteHadoopFileSystem.java | 32 +-
.../processors/hadoop/HadoopDefaultJobInfo.java | 3 +
.../processors/hadoop/HadoopProcessor.java | 2 +-
.../internal/processors/hadoop/HadoopUtils.java | 10 +-
.../hadoop/SecondaryFileSystemProvider.java | 53 +-
.../hadoop/fs/HadoopDistributedFileSystem.java | 91 -
.../hadoop/fs/HadoopFileSystemsUtils.java | 17 -
.../hadoop/fs/HadoopLazyConcurrentMap.java | 204 +
.../processors/hadoop/igfs/HadoopIgfsEx.java | 6 +
.../hadoop/igfs/HadoopIgfsInProc.java | 170 +-
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 5 +-
.../hadoop/igfs/HadoopIgfsOutProc.java | 33 +-
.../hadoop/igfs/HadoopIgfsWrapper.java | 19 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 19 +-
.../hadoop/taskexecutor/HadoopRunnableTask.java | 3 +
.../external/HadoopExternalTaskExecutor.java | 3 +
.../processors/hadoop/v2/HadoopV2Context.java | 10 +-
.../processors/hadoop/v2/HadoopV2Job.java | 11 +-
.../hadoop/v2/HadoopV2TaskContext.java | 13 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 +-
...oopSecondaryFileSystemConfigurationTest.java | 4 +-
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 5 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 63 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 2 +-
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 +
.../HadoopDefaultMapReducePlannerSelfTest.java | 8 +-
.../hadoop/HadoopFileSystemsTest.java | 23 +-
.../collections/HadoopSkipListSelfTest.java | 4 +-
.../testsuites/IgniteHadoopTestSuite.java | 2 +-
modules/hibernate/pom.xml | 2 +-
.../HibernateAccessStrategyAdapter.java | 10 +-
.../hibernate/HibernateCollectionRegion.java | 2 +-
.../cache/hibernate/HibernateEntityRegion.java | 2 +-
.../hibernate/HibernateGeneralDataRegion.java | 2 +-
.../hibernate/HibernateNaturalIdRegion.java | 2 +-
.../HibernateNonStrictAccessStrategy.java | 4 +-
.../hibernate/HibernateQueryResultsRegion.java | 2 +-
.../HibernateReadOnlyAccessStrategy.java | 2 +-
.../HibernateReadWriteAccessStrategy.java | 2 +-
.../ignite/cache/hibernate/HibernateRegion.java | 4 +-
.../cache/hibernate/HibernateRegionFactory.java | 10 +-
.../hibernate/HibernateTimestampsRegion.java | 2 +-
.../HibernateTransactionalAccessStrategy.java | 4 +-
.../HibernateTransactionalDataRegion.java | 2 +-
.../CacheHibernateStoreSessionListener.java | 216 +
.../HibernateL2CacheConfigurationSelfTest.java | 2 +-
.../hibernate/HibernateL2CacheSelfTest.java | 2 +-
...heHibernateStoreSessionListenerSelfTest.java | 228 +
.../testsuites/IgniteHibernateTestSuite.java | 2 +
modules/indexing/pom.xml | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 203 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 110 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +-
.../query/h2/opt/GridH2KeyValueRowOnheap.java | 6 +-
.../query/h2/opt/GridH2RowDescriptor.java | 14 +-
.../processors/query/h2/opt/GridH2Table.java | 10 +-
.../query/h2/opt/GridH2ValueCacheObject.java | 191 +
.../query/h2/opt/GridLuceneIndex.java | 84 +-
.../query/h2/sql/GridSqlFunction.java | 6 +-
.../query/h2/sql/GridSqlOperationType.java | 2 +-
.../query/h2/sql/GridSqlPlaceholder.java | 51 +
.../processors/query/h2/sql/GridSqlQuery.java | 20 +
.../query/h2/sql/GridSqlQueryParser.java | 16 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 15 +-
.../processors/query/h2/sql/GridSqlSelect.java | 2 +-
.../processors/query/h2/sql/GridSqlUnion.java | 2 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 61 +-
.../query/h2/twostep/GridMergeIndex.java | 6 +-
.../h2/twostep/GridMergeIndexUnsorted.java | 4 +-
.../h2/twostep/GridReduceQueryExecutor.java | 164 +-
.../query/h2/twostep/GridResultPage.java | 80 +-
.../query/h2/twostep/msg/GridH2Array.java | 124 +
.../query/h2/twostep/msg/GridH2Boolean.java | 112 +
.../query/h2/twostep/msg/GridH2Byte.java | 113 +
.../query/h2/twostep/msg/GridH2Bytes.java | 113 +
.../query/h2/twostep/msg/GridH2CacheObject.java | 148 +
.../query/h2/twostep/msg/GridH2Date.java | 115 +
.../query/h2/twostep/msg/GridH2Decimal.java | 134 +
.../query/h2/twostep/msg/GridH2Double.java | 113 +
.../query/h2/twostep/msg/GridH2Float.java | 113 +
.../query/h2/twostep/msg/GridH2Geometry.java | 134 +
.../query/h2/twostep/msg/GridH2Integer.java | 113 +
.../query/h2/twostep/msg/GridH2JavaObject.java | 113 +
.../query/h2/twostep/msg/GridH2Long.java | 113 +
.../query/h2/twostep/msg/GridH2Null.java | 78 +
.../query/h2/twostep/msg/GridH2Short.java | 113 +
.../query/h2/twostep/msg/GridH2String.java | 115 +
.../query/h2/twostep/msg/GridH2Time.java | 116 +
.../query/h2/twostep/msg/GridH2Timestamp.java | 133 +
.../query/h2/twostep/msg/GridH2Uuid.java | 133 +
.../h2/twostep/msg/GridH2ValueMessage.java | 49 +
.../twostep/msg/GridH2ValueMessageFactory.java | 201 +
.../GridCacheAbstractFieldsQuerySelfTest.java | 1282 ----
.../cache/GridCacheCrossCacheQuerySelfTest.java | 68 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +-
.../cache/GridCacheOffHeapSelfTest.java | 11 +-
.../GridCacheOffheapIndexEntryEvictTest.java | 200 +
.../cache/GridCacheOffheapIndexGetSelfTest.java | 123 +
.../cache/GridCacheQueryMetricsSelfTest.java | 106 +-
.../GridCacheQuerySerializationSelfTest.java | 144 +
...idCacheReduceQueryMultithreadedSelfTest.java | 10 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 23 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 256 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
...acheConfigurationPrimitiveTypesSelfTest.java | 104 +
...niteCacheP2pUnmarshallingQueryErrorTest.java | 57 +
...QueryMultiThreadedOffHeapTieredSelfTest.java | 37 +
.../IgniteCacheQueryMultiThreadedSelfTest.java | 52 +-
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 -
...GridCachePartitionedFieldsQuerySelfTest.java | 115 -
...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 -
...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 +
...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 -
.../GridCacheReplicatedFieldsQuerySelfTest.java | 157 -
...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 -
...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 +
.../local/IgniteCacheLocalQuerySelfTest.java | 6 +
...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +-
...cheReduceFieldsQueryPartitionedSelfTest.java | 5 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 6 +-
.../query/h2/GridH2IndexRebuildTest.java | 18 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 132 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 49 +-
.../query/h2/sql/BaseH2CompareQueryTest.java | 48 +-
.../query/h2/sql/GridQueryParsingTest.java | 9 +
.../query/h2/sql/H2CompareBigQueryTest.java | 2 +-
.../IgniteCacheQuerySelfTestSuite.java | 14 +-
.../IgniteCacheWithIndexingTestSuite.java | 5 +
.../processors/query/h2/sql/bigQuery.sql | 2 +-
modules/jcl/pom.xml | 2 +-
.../ignite/logger/jcl/IgniteJclLogger.java | 167 -
.../org/apache/ignite/logger/jcl/JclLogger.java | 167 +
.../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -
.../apache/ignite/logger/jcl/JclLoggerTest.java | 48 +
.../ignite/testsuites/IgniteJclTestSuite.java | 2 +-
modules/jta/pom.xml | 2 +-
.../processors/cache/jta/CacheJtaManager.java | 4 +-
modules/log4j/pom.xml | 2 +-
.../apache/ignite/logger/log4j/Log4JLogger.java | 8 +-
modules/mesos/README.txt | 28 +
modules/mesos/licenses/apache-2.0.txt | 202 +
modules/mesos/licenses/jetty-epl-license.txt | 69 +
modules/mesos/pom.xml | 101 +
.../apache/ignite/mesos/ClusterProperties.java | 519 ++
.../apache/ignite/mesos/IgniteFramework.java | 119 +
.../apache/ignite/mesos/IgniteScheduler.java | 361 +
.../org/apache/ignite/mesos/IgniteTask.java | 86 +
.../org/apache/ignite/mesos/package-info.java | 22 +
.../ignite/mesos/resource/IgniteProvider.java | 234 +
.../ignite/mesos/resource/JettyServer.java | 61 +
.../ignite/mesos/resource/ResourceHandler.java | 142 +
.../ignite/mesos/resource/ResourceProvider.java | 120 +
.../ignite/mesos/resource/package-info.java | 22 +
.../main/resources/ignite-default-config.xml | 35 +
.../org/apache/ignite/IgniteMesosTestSuite.java | 38 +
.../ignite/mesos/IgniteSchedulerSelfTest.java | 464 ++
modules/rest-http/pom.xml | 2 +-
.../http/jetty/GridJettyRestHandler.java | 3 +
modules/scalar/pom.xml | 2 +-
.../ignite/scalar/ScalarConversions.scala | 8 -
.../scalar/tests/ScalarCacheQueriesSpec.scala | 154 +-
.../ignite/scalar/tests/ScalarCacheSpec.scala | 23 +-
.../scalar/tests/ScalarConversionsSpec.scala | 43 +-
.../scalar/tests/ScalarProjectionSpec.scala | 128 +-
.../scalar/tests/ScalarReturnableSpec.scala | 41 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 8 +-
.../ignite/schema/generator/CodeGenerator.java | 105 +-
.../ignite/schema/ui/SchemaImportApp.java | 8 +-
modules/slf4j/pom.xml | 2 +-
.../ignite/logger/slf4j/GridSlf4jLogger.java | 138 -
.../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +
modules/spring/pom.xml | 16 +-
.../spring/CacheSpringStoreSessionListener.java | 207 +
.../util/spring/IgniteSpringHelperImpl.java | 217 +-
...CacheSpringStoreSessionListenerSelfTest.java | 197 +
.../ignite/internal/GridFactorySelfTest.java | 3 +-
.../IgniteStartFromStreamConfigurationTest.java | 50 +
.../testsuites/IgniteSpringTestSuite.java | 5 +
modules/ssh/pom.xml | 2 +-
...gniteProjectionStartStopRestartSelfTest.java | 26 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
.../uri/GridUriDeploymentClassLoader.java | 4 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 2 +-
.../licenses/jcraft-revised-bsd.txt | 28 -
modules/visor-console/pom.xml | 8 +-
.../ignite/visor/commands/VisorConsole.scala | 316 +-
.../visor/commands/VisorConsoleCommand.scala | 77 -
.../ignite/visor/commands/VisorTextTable.scala | 539 --
.../visor/commands/ack/VisorAckCommand.scala | 42 +-
.../commands/alert/VisorAlertCommand.scala | 35 +-
.../commands/cache/VisorCacheClearCommand.scala | 51 +-
.../commands/cache/VisorCacheCommand.scala | 36 +-
.../commands/cache/VisorCacheScanCommand.scala | 60 +-
.../commands/cache/VisorCacheStopCommand.scala | 30 +-
.../commands/cache/VisorCacheSwapCommand.scala | 66 +-
.../commands/common/VisorConsoleCommand.scala | 90 +
.../visor/commands/common/VisorTextTable.scala | 543 ++
.../config/VisorConfigurationCommand.scala | 438 +-
.../commands/deploy/VisorDeployCommand.scala | 47 +-
.../commands/disco/VisorDiscoveryCommand.scala | 58 +-
.../commands/events/VisorEventsCommand.scala | 338 +-
.../visor/commands/gc/VisorGcCommand.scala | 130 +-
.../visor/commands/kill/VisorKillCommand.scala | 53 +-
.../visor/commands/node/VisorNodeCommand.scala | 49 +-
.../visor/commands/ping/VisorPingCommand.scala | 41 +-
.../commands/start/VisorStartCommand.scala | 34 +-
.../commands/tasks/VisorTasksCommand.scala | 78 +-
.../commands/top/VisorTopologyCommand.scala | 36 +-
.../visor/commands/vvm/VisorVvmCommand.scala | 32 +-
.../scala/org/apache/ignite/visor/visor.scala | 349 +-
.../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +-
.../ignite/visor/VisorTextTableSpec.scala | 3 +-
.../visor/commands/VisorArgListSpec.scala | 60 +-
.../commands/VisorFileNameCompleterSpec.scala | 34 +-
.../commands/ack/VisorAckCommandSpec.scala | 20 +-
.../commands/alert/VisorAlertCommandSpec.scala | 68 +-
.../cache/VisorCacheClearCommandSpec.scala | 48 +-
.../commands/cache/VisorCacheCommandSpec.scala | 66 +-
.../config/VisorConfigurationCommandSpec.scala | 8 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 24 +-
.../deploy/VisorDeployCommandSpec.scala | 10 +-
.../disco/VisorDiscoveryCommandSpec.scala | 46 +-
.../events/VisorEventsCommandSpec.scala | 28 +-
.../visor/commands/gc/VisorGcCommandSpec.scala | 30 +-
.../commands/help/VisorHelpCommandSpec.scala | 57 +-
.../commands/kill/VisorKillCommandSpec.scala | 58 +-
.../commands/log/VisorLogCommandSpec.scala | 10 +-
.../commands/mem/VisorMemoryCommandSpec.scala | 77 +-
.../commands/node/VisorNodeCommandSpec.scala | 22 +-
.../commands/open/VisorOpenCommandSpec.scala | 16 +-
.../commands/ping/VisorPingCommandSpec.scala | 16 +-
.../commands/start/VisorStartCommandSpec.scala | 126 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 112 +-
.../commands/top/VisorTopologyCommandSpec.scala | 52 +-
.../commands/vvm/VisorVvmCommandSpec.scala | 30 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
.../config/benchmark-client-mode.properties | 89 +
modules/yardstick/pom.xml | 2 +-
.../cache/IgniteCacheAbstractBenchmark.java | 2 +-
.../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +-
parent/pom.xml | 9 +
pom.xml | 362 +-
scripts/git-apply-patch.sh | 8 +-
scripts/git-format-patch.sh | 16 +-
scripts/git-patch-functions.sh | 36 +-
scripts/git-patch-prop.sh | 2 +-
1021 files changed, 65871 insertions(+), 37944 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f516a25/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
index 65a7f1b,30be424..c5d70a5
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java
@@@ -212,14 -202,13 +205,13 @@@ public class VisorCacheMetrics implemen
cm.avgPutTime = m.getAveragePutTime();
cm.avgRemovalTime = m.getAverageRemoveTime();
- cm.readsPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAverageGetTime());
- cm.writesPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAveragePutTime());
- cm.hitsPerSec = -1;
- cm.missesPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAverageRemoveTime());
- cm.commitsPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAverageTxCommitTime());
- cm.rollbacksPerSec = (int)(MICROSECONDS_IN_SECOND * 1.f /
m.getAverageTxRollbackTime());
+ cm.readsPerSec = perSecond(m.getAverageGetTime());
+ cm.putsPerSec = perSecond(m.getAveragePutTime());
+ cm.removalsPerSec = perSecond(m.getAverageRemoveTime());
+ cm.commitsPerSec = perSecond(m.getAverageTxCommitTime());
+ cm.rollbacksPerSec = perSecond(m.getAverageTxRollbackTime());
- cm.qryMetrics =
VisorCacheQueryMetrics.from(c.context().queries().metrics());
+ cm.qryMetrics = VisorCacheQueryMetrics.from(c.queryMetrics());
cm.dhtEvictQueueCurrSize = m.getDhtEvictQueueCurrentSize();
cm.txThreadMapSize = m.getTxThreadMapSize();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f516a25/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
----------------------------------------------------------------------
