Merge branch 'sprint-1' into ignite-128
Conflicts:
modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientPartitionAffinitySelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
modules/core/src/main/java/org/apache/ignite/internal/client/balancer/GridClientBalancerAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientAbstractProjection.java
modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java
modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolProvider.java
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e8d42f5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e8d42f5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e8d42f5d
Branch: refs/heads/ignite-128
Commit: e8d42f5d72899a535cbabc42f0a60418a613ca52
Parents: fc521a9 9f04e64
Author: vozerov-gridgain <voze...@gridgain.com>
Authored: Wed Feb 4 09:41:37 2015 +0300
Committer: vozerov-gridgain <voze...@gridgain.com>
Committed: Wed Feb 4 09:41:37 2015 +0300
----------------------------------------------------------------------
assembly/dependencies-fabric.xml | 4 +
assembly/release-base.xml | 2 +-
bin/ignite.bat | 2 +-
bin/ignite.sh | 0
bin/igniterouter.bat | 2 +-
bin/igniterouter.sh | 2 +-
bin/ignitevisorcmd.bat | 2 +-
bin/ignitevisorcmd.sh | 0
bin/include/functions.sh | 2 +-
.../compute/ComputeContinuousMapperExample.java | 14 +-
.../ComputeFibonacciContinuationExample.java | 135 ++--
.../compute/ComputeRunnableExample.java | 4 +-
.../compute/ComputeScheduleExample.java | 19 +-
.../failover/ComputeFailoverExample.java | 51 +-
.../examples/datagrid/CacheAffinityExample.java | 12 +-
.../examples/datagrid/CacheEventsExample.java | 2 +-
.../datagrid/CachePopularNumbersExample.java | 6 +-
.../datastructures/CacheAtomicLongExample.java | 2 +-
.../store/CacheStoreLoadDataExample.java | 2 +-
.../examples/ggfs/GgfsMapReduceExample.java | 6 +-
.../examples/messaging/MessagingExample.java | 7 +-
.../messaging/MessagingPingPongExample.java | 4 +-
.../misc/deployment/DeploymentExample.java | 4 +-
.../streaming/StreamingCheckInExample.java | 18 +-
.../StreamingPopularNumbersExample.java | 5 +-
.../streaming/StreamingPriceBarsExample.java | 8 +-
.../StreamingRunningAverageExample.java | 7 +-
.../examples/ScalarCacheAffinityExample1.scala | 2 +-
.../examples/ScalarCacheAffinityExample2.scala | 2 +-
.../ScalarCachePopularNumbersExample.scala | 4 +-
.../examples/ScalarContinuationExample.scala | 8 +-
ipc/shmem/configure | 24 +-
ipc/shmem/configure.ac | 2 +-
ipc/shmem/readme.txt | 2 +-
.../aop/aspectj/GridifyAspectJAspect.java | 3 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 5 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 5 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 3 +-
.../spring/GridifySetToValueSpringAspect.java | 3 +-
.../aop/spring/GridifySpringPointcut.java | 1 +
.../apache/ignite/gridify/AbstractAopTest.java | 2 +-
.../apache/ignite/gridify/BasicAopSelfTest.java | 4 +-
.../GridifySetToXXXNonSpringAopSelfTest.java | 1 +
.../GridifySetToXXXSpringAopSelfTest.java | 1 +
.../apache/ignite/gridify/TestGridifyJob.java | 2 +-
.../apache/ignite/gridify/TestGridifyTask.java | 5 +-
.../optimized/OptimizedMarshallerAopTest.java | 2 +-
.../singlesplit/SingleSplitTestJobTarget.java | 4 +-
.../direct/singlesplit/SingleSplitTestTask.java | 7 +-
.../singlesplit/SingleSplitsLoadTest.java | 8 +-
.../loadtests/gridify/GridifyLoadTestTask.java | 6 +-
.../gridify/GridifySingleSplitLoadTest.java | 7 +-
.../org/test/gridify/ExternalGridifyTask.java | 4 +-
.../gridify/ExternalNonSpringAopSelfTest.java | 4 +-
.../spi/checkpoint/s3/S3CheckpointData.java | 1 +
.../spi/checkpoint/s3/S3CheckpointSpi.java | 9 +-
.../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 11 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 9 +-
.../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +-
.../s3/S3SessionCheckpointSelfTest.java | 2 +-
.../s3/TcpDiscoveryS3IpFinderSelfTest.java | 2 +-
.../internal/TaskEventSubjectIdSelfTest.java | 15 +-
.../ClientAbstractMultiThreadedSelfTest.java | 11 +-
.../client/ClientDefaultCacheSelfTest.java | 2 +-
.../internal/client/ClientGetAffinityTask.java | 6 +-
.../ignite/internal/client/ClientHttpTask.java | 7 +-
.../client/ClientPortableArgumentTask.java | 3 +-
.../internal/client/ClientPutPortableTask.java | 5 +-
.../internal/client/ClientStartNodeTask.java | 7 +-
.../internal/client/ClientStopNodeTask.java | 8 +-
.../internal/client/ClientStringLengthTask.java | 8 +-
.../ignite/internal/client/ClientTcpTask.java | 8 +-
.../internal/client/ClientTestPortable.java | 2 +-
.../ClientTestPortableAffinityKeyTask.java | 16 +-
.../ignite/internal/client/SleepTestTask.java | 8 +-
.../client/TaskSingleJobSplitAdapter.java | 15 +-
.../ClientAbstractMultiNodeSelfTest.java | 11 +-
.../integration/ClientAbstractSelfTest.java | 21 +-
.../integration/ClientPreferDirectSelfTest.java | 7 +-
.../client/router/ClientFailedInitSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 11 +-
.../rest/RestProcessorStartSelfTest.java | 1 +
.../processors/rest/RestProcessorTest.java | 4 +-
.../rest/TaskCommandHandlerSelfTest.java | 9 +-
.../processors/rest/TestMemcacheClient.java | 2 +-
.../internal/processors/rest/TestTask1.java | 8 +-
.../internal/processors/rest/TestTask2.java | 9 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 2 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 8 +-
.../apache/ignite/IgniteBasicWarmupClosure.java | 4 +-
.../java/org/apache/ignite/IgniteCluster.java | 39 +-
.../java/org/apache/ignite/IgniteCompute.java | 80 +--
.../org/apache/ignite/IgniteDataLoader.java | 46 +-
.../ignite/IgniteDeploymentException.java | 2 +-
.../java/org/apache/ignite/IgniteEvents.java | 28 +-
.../main/java/org/apache/ignite/IgniteFs.java | 98 +--
.../ignite/IgniteInterruptedException.java | 5 +-
.../java/org/apache/ignite/IgniteManaged.java | 31 +-
.../java/org/apache/ignite/IgniteMessaging.java | 35 +-
.../java/org/apache/ignite/IgniteScheduler.java | 12 +-
.../java/org/apache/ignite/IgniteStreamer.java | 20 +-
.../org/apache/ignite/IgniteTransactions.java | 8 +-
.../main/java/org/apache/ignite/Ignition.java | 45 +-
.../CacheAtomicUpdateTimeoutException.java | 4 +-
.../apache/ignite/cache/CacheConfiguration.java | 5 +-
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../apache/ignite/cache/CacheProjection.java | 8 +
.../ignite/cache/affinity/CacheAffinityKey.java | 2 +-
.../CacheConsistentHashAffinityFunction.java | 7 +-
.../fair/CachePartitionFairAffinity.java | 2 +-
.../CacheRendezvousAffinityFunction.java | 4 +-
.../datastructures/CacheCountDownLatch.java | 12 +-
.../eviction/fifo/CacheFifoEvictionPolicy.java | 4 +-
.../eviction/lru/CacheLruEvictionPolicy.java | 2 +-
.../cache/query/CacheQueryTypeMetadata.java | 2 +-
.../ignite/cache/query/QueryPredicate.java | 2 +-
.../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +-
.../cache/store/CacheStoreBalancingWrapper.java | 2 +-
.../cache/store/jdbc/CacheJdbcBlobStore.java | 7 +-
.../org/apache/ignite/cluster/ClusterGroup.java | 31 +-
.../cluster/ClusterGroupEmptyException.java | 4 +-
.../ignite/cluster/ClusterNodeLocalMap.java | 1 +
.../cluster/ClusterTopologyException.java | 2 +-
.../ComputeExecutionRejectedException.java | 2 +-
.../org/apache/ignite/compute/ComputeJob.java | 4 +-
.../ignite/compute/ComputeJobAdapter.java | 2 +-
.../compute/ComputeJobFailoverException.java | 5 +-
.../compute/ComputeJobMasterLeaveAware.java | 4 +-
.../apache/ignite/compute/ComputeJobResult.java | 6 +-
.../ignite/compute/ComputeJobSibling.java | 4 +-
.../ignite/compute/ComputeLoadBalancer.java | 4 +-
.../org/apache/ignite/compute/ComputeTask.java | 12 +-
.../ignite/compute/ComputeTaskAdapter.java | 8 +-
.../compute/ComputeTaskCancelledException.java | 2 +-
.../compute/ComputeTaskContinuousMapper.java | 16 +-
.../ignite/compute/ComputeTaskFuture.java | 16 +-
.../ignite/compute/ComputeTaskSession.java | 43 +-
.../ignite/compute/ComputeTaskSplitAdapter.java | 13 +-
.../compute/ComputeTaskTimeoutException.java | 2 +-
.../compute/ComputeUserUndeclaredException.java | 4 +-
.../gridify/aop/GridifyDefaultRangeTask.java | 11 +-
.../compute/gridify/aop/GridifyDefaultTask.java | 9 +-
.../aop/GridifySetToSetAbstractAspect.java | 9 +-
.../aop/GridifySetToValueAbstractAspect.java | 7 +-
.../configuration/IgniteConfiguration.java | 4 +
.../dataload/IgniteDataLoadCacheUpdater.java | 4 +-
.../events/IgniteAuthenticationEvent.java | 2 +-
.../ignite/events/IgniteAuthorizationEvent.java | 2 +-
.../apache/ignite/events/IgniteCacheEvent.java | 2 +-
.../events/IgniteCacheQueryExecutedEvent.java | 2 +-
.../events/IgniteCacheQueryReadEvent.java | 2 +-
.../ignite/events/IgniteEventAdapter.java | 2 +-
.../apache/ignite/events/IgniteJobEvent.java | 2 +-
.../ignite/events/IgniteSecureSessionEvent.java | 2 +-
.../apache/ignite/events/IgniteTaskEvent.java | 2 +-
.../org/apache/ignite/fs/IgniteFsException.java | 2 +-
.../apache/ignite/fs/IgniteFsFileSystem.java | 56 +-
.../IgniteFsInputStreamJobAdapter.java | 6 +-
.../apache/ignite/fs/mapreduce/IgniteFsJob.java | 4 +-
.../fs/mapreduce/IgniteFsRecordResolver.java | 8 +-
.../ignite/fs/mapreduce/IgniteFsTask.java | 20 +-
.../IgniteFsByteDelimiterRecordResolver.java | 8 +-
.../IgniteFsFixedLengthRecordResolver.java | 4 +-
.../apache/ignite/hadoop/GridHadoopTask.java | 2 +-
.../ignite/internal/ClusterGroupAdapter.java | 87 ++-
.../internal/ComputeTaskInternalFuture.java | 292 ++++++++
.../apache/ignite/internal/GridDiagnostic.java | 2 +-
.../internal/GridEventConsumeHandler.java | 10 +-
.../ignite/internal/GridJobCancelRequest.java | 2 +-
.../ignite/internal/GridJobContextImpl.java | 4 +-
.../ignite/internal/GridJobExecuteRequest.java | 2 +-
.../ignite/internal/GridJobExecuteResponse.java | 26 +-
.../ignite/internal/GridJobResultImpl.java | 12 +-
.../ignite/internal/GridJobSessionImpl.java | 64 +-
.../ignite/internal/GridJobSiblingImpl.java | 14 +-
.../ignite/internal/GridJobSiblingsRequest.java | 2 +-
.../internal/GridJobSiblingsResponse.java | 2 +-
.../ignite/internal/GridKernalContext.java | 12 +-
.../ignite/internal/GridKernalContextImpl.java | 12 +-
.../ignite/internal/GridKernalGatewayImpl.java | 2 +-
.../apache/ignite/internal/GridKillTask.java | 12 +-
.../apache/ignite/internal/GridLoggerProxy.java | 13 +-
.../internal/GridMessageListenHandler.java | 6 +-
.../ignite/internal/GridPluginComponent.java | 1 -
.../ignite/internal/GridPluginContext.java | 3 +-
.../apache/ignite/internal/GridProductImpl.java | 2 +-
.../ignite/internal/GridTaskCancelRequest.java | 2 +-
.../ignite/internal/GridTaskFutureImpl.java | 122 ----
.../ignite/internal/GridTaskSessionImpl.java | 75 +-
.../ignite/internal/GridTaskSessionRequest.java | 2 +-
.../org/apache/ignite/internal/GridTopic.java | 2 +-
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../ignite/internal/IgniteClusterAsyncImpl.java | 62 +-
.../ignite/internal/IgniteComputeImpl.java | 144 +++-
.../IgniteDeploymentCheckedException.java | 58 ++
.../ignite/internal/IgniteEventsImpl.java | 24 +-
.../IgniteFutureCancelledCheckedException.java | 58 ++
.../IgniteFutureTimeoutCheckedException.java | 58 ++
.../ignite/internal/IgniteInternalFuture.java | 16 +-
.../IgniteInterruptedCheckedException.java | 58 ++
.../apache/ignite/internal/IgniteKernal.java | 147 ++--
.../ignite/internal/IgniteManagedImpl.java | 38 +-
.../ignite/internal/IgniteMessagingImpl.java | 35 +-
.../ignite/internal/IgniteSchedulerImpl.java | 14 +-
.../ignite/internal/IgniteTransactionsEx.java | 58 ++
.../org/apache/ignite/internal/IgnitionEx.java | 99 +--
.../ignite/internal/IgnitionMXBeanAdapter.java | 2 +-
.../impl/GridClientAbstractProjection.java | 4 +-
.../GridClientConnectionManagerAdapter.java | 3 +-
.../client/router/GridRouterFactory.java | 7 +-
.../router/GridTcpRouterConfiguration.java | 1 +
.../impl/GridRouterCommandLineStartup.java | 33 +-
.../client/router/impl/GridTcpRouterImpl.java | 16 +-
.../ClusterGroupEmptyCheckedException.java | 55 ++
.../ClusterTopologyCheckedException.java | 49 ++
.../ComputeTaskCancelledCheckedException.java | 58 ++
.../ComputeTaskTimeoutCheckedException.java | 61 ++
.../internal/executor/GridExecutorService.java | 107 ++-
.../fs/common/GridGgfsControlResponse.java | 12 +-
.../internal/fs/common/GridGgfsLogger.java | 6 +-
.../fs/common/GridGgfsStreamControlRequest.java | 2 +-
.../internal/managers/GridManagerAdapter.java | 115 +--
.../checkpoint/GridCheckpointManager.java | 10 +-
.../checkpoint/GridCheckpointRequest.java | 2 +-
.../collision/GridCollisionManager.java | 2 +-
.../managers/communication/GridIoManager.java | 14 +-
.../managers/communication/GridIoMessage.java | 2 +-
.../communication/GridIoUserMessage.java | 4 +-
.../managers/deployment/GridDeployment.java | 5 +-
.../deployment/GridDeploymentClassLoader.java | 2 +-
.../deployment/GridDeploymentCommunication.java | 10 +-
.../deployment/GridDeploymentInfoBean.java | 4 +-
.../deployment/GridDeploymentLocalStore.java | 6 +-
.../deployment/GridDeploymentManager.java | 4 +-
.../deployment/GridDeploymentMetadata.java | 5 +-
.../GridDeploymentPerLoaderStore.java | 7 +-
.../GridDeploymentPerVersionStore.java | 8 +-
.../deployment/GridDeploymentRequest.java | 4 +-
.../deployment/GridDeploymentResponse.java | 1 -
.../deployment/GridDeploymentStoreAdapter.java | 2 +-
.../protocol/gg/GridProtocolHandler.java | 3 +-
.../protocol/gg/GridUrlConnection.java | 2 +-
.../discovery/GridDiscoveryManager.java | 32 +-
.../GridDiscoveryTopologySnapshot.java | 2 +-
.../eventstorage/GridEventStorageManager.java | 16 +-
.../eventstorage/GridEventStorageMessage.java | 4 +-
.../failover/GridFailoverContextImpl.java | 5 +-
.../managers/failover/GridFailoverManager.java | 2 +-
.../managers/indexing/GridIndexingManager.java | 4 +-
.../loadbalancer/GridLoadBalancerManager.java | 37 +-
.../securesession/GridSecureSessionManager.java | 2 +-
.../os/GridOsSecureSessionManager.java | 2 +-
.../managers/security/GridSecurityContext.java | 2 +-
.../managers/security/GridSecurityImpl.java | 19 +-
.../managers/security/GridSecurityManager.java | 2 +-
.../security/GridSecuritySubjectAdapter.java | 2 +-
.../security/os/GridOsSecurityManager.java | 4 +-
.../swapspace/GridSwapSpaceManager.java | 6 +-
.../internal/processors/GridProcessor.java | 2 +-
.../processors/GridProcessorAdapter.java | 4 +-
.../affinity/GridAffinityAssignmentCache.java | 2 +-
.../affinity/GridAffinityMessage.java | 4 +-
.../affinity/GridAffinityProcessor.java | 8 +-
.../processors/affinity/GridAffinityUtils.java | 10 +-
...acheAtomicUpdateTimeoutCheckedException.java | 47 ++
.../processors/cache/CacheInvokeResult.java | 4 +-
.../processors/cache/CacheLockImpl.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 161 ++---
.../cache/GridCacheAffinityManager.java | 2 +-
.../processors/cache/GridCacheAttributes.java | 2 +-
.../cache/GridCacheConcurrentMap.java | 2 +-
.../processors/cache/GridCacheContext.java | 20 +-
.../GridCacheDefaultAffinityKeyMapper.java | 4 +-
.../cache/GridCacheDeploymentManager.java | 4 +-
.../processors/cache/GridCacheEntryEx.java | 16 +-
.../processors/cache/GridCacheEntryImpl.java | 6 +-
.../processors/cache/GridCacheEntryInfo.java | 2 +-
.../processors/cache/GridCacheEntrySet.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 10 +-
.../cache/GridCacheEvictionEntry.java | 10 +-
.../cache/GridCacheEvictionManager.java | 20 +-
.../cache/GridCacheExplicitLockSpan.java | 6 +-
.../cache/GridCacheFilterEvaluationEntry.java | 2 +-
.../processors/cache/GridCacheIoManager.java | 20 +-
.../processors/cache/GridCacheIterator.java | 2 +-
.../processors/cache/GridCacheKeySet.java | 2 +-
.../cache/GridCacheLoaderWriterStore.java | 7 +-
.../processors/cache/GridCacheLogger.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 33 +-
.../processors/cache/GridCacheMessage.java | 4 +-
.../cache/GridCacheMultiTxFuture.java | 21 +-
.../processors/cache/GridCacheMvcc.java | 4 +-
.../cache/GridCacheMvccCandidate.java | 2 +-
.../processors/cache/GridCacheMvccManager.java | 15 +-
.../cache/GridCacheOffheapSwapEntry.java | 2 +-
.../GridCachePartitionExchangeManager.java | 19 +-
.../processors/cache/GridCachePreloader.java | 2 +-
.../cache/GridCachePreloaderAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 14 +-
.../processors/cache/GridCacheProjectionEx.java | 2 +-
.../cache/GridCacheProjectionImpl.java | 16 +-
.../processors/cache/GridCacheProxyImpl.java | 21 +-
.../processors/cache/GridCacheReturn.java | 4 +-
.../cache/GridCacheSharedContext.java | 15 +-
.../processors/cache/GridCacheStoreManager.java | 63 +-
.../cache/GridCacheSwapEntryImpl.java | 2 +-
.../processors/cache/GridCacheSwapManager.java | 10 +-
.../processors/cache/GridCacheTtlManager.java | 5 +-
.../cache/GridCacheUpdateAtomicResult.java | 2 +-
.../cache/GridCacheUpdateTxResult.java | 2 +-
.../processors/cache/GridCacheUtils.java | 47 +-
.../cache/GridCacheValueCollection.java | 2 +-
.../cache/GridCacheWriteBehindStore.java | 31 +-
.../processors/cache/GridPartitionLockKey.java | 2 +-
.../processors/cache/IgniteCacheProxy.java | 62 +-
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../GridAtomicCacheQueueImpl.java | 29 +-
.../GridCacheAnnotationHelper.java | 2 +-
.../datastructures/GridCacheAtomicLongImpl.java | 20 +-
.../GridCacheAtomicReferenceImpl.java | 9 +-
.../GridCacheAtomicSequenceImpl.java | 8 +-
.../GridCacheAtomicStampedImpl.java | 9 +-
.../GridCacheAtomicStampedValue.java | 4 +-
.../GridCacheCountDownLatchImpl.java | 8 +-
.../GridCacheDataStructuresManager.java | 44 +-
.../GridCacheInternalKeyImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 59 +-
.../datastructures/GridCacheQueueHeader.java | 2 +-
.../datastructures/GridCacheQueueItemKey.java | 2 +-
.../datastructures/GridCacheQueueProxy.java | 2 +-
.../datastructures/GridCacheSetHeader.java | 2 +-
.../cache/datastructures/GridCacheSetImpl.java | 4 +-
.../datastructures/GridCacheSetItemKey.java | 2 +-
.../cache/datastructures/GridCacheSetProxy.java | 2 +-
.../datastructures/GridSetQueryPredicate.java | 2 +-
.../GridTransactionalCacheQueueImpl.java | 110 ++-
.../distributed/GridCacheCommittedTxInfo.java | 4 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 13 +-
...idCacheOptimisticCheckPreparedTxRequest.java | 6 +-
...dCacheOptimisticCheckPreparedTxResponse.java | 2 +-
.../GridCachePerThreadTxCommitBuffer.java | 6 +-
...dCachePessimisticCheckCommittedTxFuture.java | 17 +-
...CachePessimisticCheckCommittedTxRequest.java | 6 +-
...achePessimisticCheckCommittedTxResponse.java | 2 +-
.../distributed/GridCacheTxCommitBuffer.java | 2 +-
.../distributed/GridCacheTxFinishSync.java | 2 +-
.../GridDistributedCacheAdapter.java | 4 +-
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../distributed/GridDistributedLockRequest.java | 6 +-
.../GridDistributedLockResponse.java | 2 +-
.../GridDistributedTxFinishRequest.java | 4 +-
.../GridDistributedTxFinishResponse.java | 2 +-
.../distributed/GridDistributedTxMapping.java | 2 +-
.../GridDistributedTxPrepareRequest.java | 6 +-
.../GridDistributedTxRemoteAdapter.java | 18 +-
.../GridPartitionedCacheEntryImpl.java | 4 +-
.../IgniteExternalizableExpiryPolicy.java | 2 +-
.../dht/GridClientPartitionTopology.java | 2 +-
.../dht/GridDhtAssignmentFetchFuture.java | 3 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../distributed/dht/GridDhtCacheEntry.java | 8 +-
.../distributed/dht/GridDhtCacheEntryImpl.java | 2 +-
.../distributed/dht/GridDhtEmbeddedFuture.java | 4 +-
.../distributed/dht/GridDhtFinishedFuture.java | 2 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 8 +-
.../distributed/dht/GridDhtLocalPartition.java | 6 +-
.../distributed/dht/GridDhtLockFuture.java | 19 +-
.../distributed/dht/GridDhtLockRequest.java | 6 +-
.../distributed/dht/GridDhtLockResponse.java | 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 32 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 41 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 6 +-
.../dht/GridDhtTxFinishResponse.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 51 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 8 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 39 +-
.../dht/GridDhtTxPrepareRequest.java | 4 +-
.../dht/GridDhtTxPrepareResponse.java | 4 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 6 +-
.../distributed/dht/GridNoStorageCacheMap.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 17 +-
.../dht/atomic/GridDhtAtomicCache.java | 26 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 11 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 17 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 2 +-
.../dht/colocated/GridDhtColocatedCache.java | 10 +-
.../colocated/GridDhtColocatedLockFuture.java | 21 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 17 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 2 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 2 +-
.../preloader/GridDhtPartitionDemandPool.java | 21 +-
.../preloader/GridDhtPartitionExchangeId.java | 2 +-
.../preloader/GridDhtPartitionSupplyPool.java | 12 +-
.../GridDhtPartitionsExchangeFuture.java | 15 +-
.../dht/preloader/GridDhtPreloader.java | 9 +-
.../distributed/near/GridNearAtomicCache.java | 10 +-
.../distributed/near/GridNearCacheAdapter.java | 10 +-
.../distributed/near/GridNearCacheEntry.java | 8 +-
.../distributed/near/GridNearGetFuture.java | 21 +-
.../distributed/near/GridNearGetRequest.java | 2 +-
.../distributed/near/GridNearGetResponse.java | 2 +-
.../distributed/near/GridNearLockFuture.java | 21 +-
.../distributed/near/GridNearLockMapping.java | 2 +-
.../distributed/near/GridNearLockRequest.java | 6 +-
.../distributed/near/GridNearLockResponse.java | 2 +-
.../near/GridNearTransactionalCache.java | 11 +-
.../near/GridNearTxFinishFuture.java | 39 +-
.../near/GridNearTxFinishRequest.java | 4 +-
.../near/GridNearTxFinishResponse.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 81 +--
.../near/GridNearTxPrepareFuture.java | 51 +-
.../near/GridNearTxPrepareRequest.java | 4 +-
.../near/GridNearTxPrepareResponse.java | 4 +-
.../distributed/near/GridNearTxRemote.java | 4 +-
.../processors/cache/dr/GridCacheDrManager.java | 1 -
.../processors/cache/local/GridLocalCache.java | 6 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../cache/local/GridLocalLockFuture.java | 6 +-
.../processors/cache/local/GridLocalTx.java | 12 +-
.../cache/local/GridLocalTxFuture.java | 26 +-
.../local/atomic/GridLocalAtomicCache.java | 16 +-
.../query/GridCacheDistributedQueryFuture.java | 3 +-
.../query/GridCacheDistributedQueryManager.java | 11 +-
.../cache/query/GridCacheLocalQueryFuture.java | 4 +-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/query/GridCacheQueryAdapter.java | 7 +-
.../cache/query/GridCacheQueryBean.java | 2 +-
.../query/GridCacheQueryFutureAdapter.java | 9 +-
.../cache/query/GridCacheQueryInfo.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 2 +-
.../cache/query/GridCacheQueryRequest.java | 4 +-
.../GridCacheContinuousQueryAdapter.java | 11 +-
.../GridCacheContinuousQueryEntry.java | 6 +-
.../GridCacheContinuousQueryHandler.java | 8 +-
.../GridCacheContinuousQueryManager.java | 4 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 19 +-
.../query/jdbc/GridCacheQueryJdbcTask.java | 259 +++----
.../jdbc/GridCacheQueryJdbcValidationTask.java | 6 +-
.../cache/transactions/IgniteInternalTx.java | 706 +++++++++++++++++++
.../transactions/IgniteTransactionsImpl.java | 141 +++-
.../cache/transactions/IgniteTxAdapter.java | 498 ++++++++++++-
.../cache/transactions/IgniteTxEntry.java | 10 +-
.../cache/transactions/IgniteTxEx.java | 541 --------------
.../cache/transactions/IgniteTxHandler.java | 93 +--
.../transactions/IgniteTxLocalAdapter.java | 49 +-
.../cache/transactions/IgniteTxLocalEx.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 199 +++---
.../cache/transactions/IgniteTxMap.java | 2 +-
.../transactions/IgniteTxMetricsAdapter.java | 2 +-
.../cache/transactions/IgniteTxProxyImpl.java | 52 +-
.../cache/transactions/IgniteTxRemoteEx.java | 2 +-
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/version/GridCacheVersionManager.java | 4 +-
.../clock/GridClockDeltaSnapshot.java | 10 +-
.../clock/GridClockDeltaSnapshotMessage.java | 2 +-
.../processors/clock/GridClockServer.java | 4 +-
.../clock/GridClockSyncProcessor.java | 8 +-
.../closure/GridClosureProcessor.java | 330 +++++----
.../continuous/GridContinuousMessage.java | 4 +-
.../continuous/GridContinuousProcessor.java | 39 +-
.../dataload/GridDataLoadCacheUpdaters.java | 18 +-
.../dataload/GridDataLoadRequest.java | 4 +-
.../dataload/GridDataLoaderFuture.java | 8 +-
.../dataload/GridDataLoaderProcessor.java | 20 +-
.../dataload/IgniteDataLoaderImpl.java | 97 ++-
.../dr/GridDrDataLoadCacheUpdater.java | 59 +-
.../processors/email/GridEmailHolder.java | 2 +-
.../processors/fs/GridGgfsAckMessage.java | 2 +-
.../processors/fs/GridGgfsAsyncImpl.java | 100 ++-
.../processors/fs/GridGgfsBlockKey.java | 2 +-
.../processors/fs/GridGgfsBlocksMessage.java | 2 +-
.../fs/GridGgfsCommunicationMessage.java | 2 +-
.../processors/fs/GridGgfsDataManager.java | 59 +-
.../processors/fs/GridGgfsDeleteMessage.java | 4 +-
.../processors/fs/GridGgfsDeleteWorker.java | 9 +-
.../internal/processors/fs/GridGgfsEx.java | 8 +-
.../fs/GridGgfsFileAffinityRange.java | 2 +-
.../processors/fs/GridGgfsFileInfo.java | 4 +-
.../internal/processors/fs/GridGgfsFileMap.java | 2 +-
.../processors/fs/GridGgfsFileWorkerBatch.java | 3 +-
.../fs/GridGgfsFragmentizerManager.java | 24 +-
.../fs/GridGgfsFragmentizerRequest.java | 4 +-
.../fs/GridGgfsFragmentizerResponse.java | 2 +-
.../internal/processors/fs/GridGgfsImpl.java | 276 +++++---
.../processors/fs/GridGgfsInputStreamImpl.java | 2 +-
.../processors/fs/GridGgfsIpcHandler.java | 177 ++---
.../internal/processors/fs/GridGgfsJobImpl.java | 12 +-
.../processors/fs/GridGgfsListingEntry.java | 2 +-
.../processors/fs/GridGgfsLocalMetrics.java | 2 +-
.../processors/fs/GridGgfsMetaManager.java | 229 +++---
.../internal/processors/fs/GridGgfsServer.java | 10 +-
.../processors/fs/GridGgfsServerManager.java | 4 +-
.../processors/fs/IgniteFsFileImpl.java | 2 +-
.../processors/fs/IgniteFsOutputStreamImpl.java | 4 +-
.../processors/fs/IgniteFsProcessor.java | 6 +-
.../hadoop/IgniteHadoopNoopProcessor.java | 2 +-
.../hadoop/IgniteHadoopProcessorAdapter.java | 2 +-
.../processors/job/GridJobProcessor.java | 24 +-
.../internal/processors/job/GridJobWorker.java | 29 +-
.../jobmetrics/GridJobMetricsProcessor.java | 2 +-
.../license/os/GridOsLicenseProcessor.java | 2 +-
.../offheap/GridOffHeapProcessor.java | 4 +-
.../plugin/IgnitePluginProcessor.java | 2 +-
.../processors/port/GridPortProcessor.java | 2 +-
.../processors/port/GridPortRecord.java | 2 +-
.../portable/os/GridOsPortableProcessor.java | 1 +
.../processors/query/GridQueryIndexing.java | 2 +-
.../processors/query/GridQueryProcessor.java | 10 +-
.../processors/resource/GridResourceField.java | 1 +
.../processors/resource/GridResourceIoc.java | 2 +-
.../resource/GridResourceLoggerInjector.java | 2 +-
.../processors/resource/GridResourceMethod.java | 1 +
.../resource/GridResourceProcessor.java | 6 +-
.../resource/GridResourceServiceInjector.java | 2 +-
.../processors/rest/GridRestProcessor.java | 12 +-
.../processors/rest/GridRestResponse.java | 2 +-
.../message/GridClientAbstractMessage.java | 2 +-
.../GridClientAuthenticationRequest.java | 2 +-
.../message/GridClientCacheQueryRequest.java | 7 +-
.../client/message/GridClientCacheRequest.java | 2 +-
.../message/GridClientGetMetaDataRequest.java | 2 +-
.../client/message/GridClientLogRequest.java | 2 +-
.../message/GridClientMetaDataResponse.java | 2 +-
.../rest/client/message/GridClientNodeBean.java | 2 +-
.../message/GridClientPortableMetaData.java | 2 +-
.../message/GridClientPutMetaDataRequest.java | 2 +-
.../rest/client/message/GridClientResponse.java | 2 +-
.../client/message/GridClientTaskRequest.java | 2 +-
.../message/GridClientTaskResultBean.java | 2 +-
.../message/GridClientTopologyRequest.java | 2 +-
.../cache/GridCacheClientQueryResult.java | 2 +-
.../handlers/cache/GridCacheCommandHandler.java | 30 +-
.../cache/GridCacheQueryCommandHandler.java | 63 +-
.../metadata/GridPortableMetadataHandler.java | 2 +-
.../handlers/task/GridTaskCommandHandler.java | 43 +-
.../handlers/task/GridTaskResultRequest.java | 2 +-
.../top/GridTopologyCommandHandler.java | 2 +-
.../rest/protocols/GridRestProtocolAdapter.java | 2 +-
.../tcp/GridMemcachedMessageWrapper.java | 2 +-
.../tcp/GridTcpMemcachedNioListener.java | 4 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +
.../rest/request/GridRestCacheQueryRequest.java | 2 +-
.../service/GridServiceAssignments.java | 4 +-
.../service/GridServiceDeployment.java | 2 +-
.../service/GridServiceDeploymentFuture.java | 2 +-
.../service/GridServiceProcessor.java | 41 +-
.../processors/service/GridServiceProxy.java | 9 +-
.../service/ManagedServiceContextImpl.java | 2 +-
.../service/ManagedServiceDescriptorImpl.java | 2 +-
.../session/GridTaskSessionProcessor.java | 4 +-
.../spring/IgniteSpringProcessor.java | 2 +-
.../streamer/GridStreamProcessor.java | 8 +-
.../streamer/GridStreamerAttributes.java | 4 +-
.../streamer/GridStreamerCancelRequest.java | 2 +-
.../streamer/GridStreamerContextDelegate.java | 16 +-
.../streamer/GridStreamerContextImpl.java | 20 +-
.../streamer/GridStreamerExecutionBatch.java | 6 +-
.../streamer/GridStreamerExecutionRequest.java | 4 +-
.../streamer/GridStreamerResponse.java | 2 +-
.../GridStreamerStageExecutionFuture.java | 11 +-
.../processors/streamer/IgniteStreamerImpl.java | 41 +-
.../streamer/StreamerMetricsAdapter.java | 4 +-
.../streamer/StreamerMetricsHolder.java | 2 +-
.../streamer/StreamerStageMetricsAdapter.java | 2 +-
.../streamer/StreamerStageWrapper.java | 6 +-
.../streamer/StreamerWindowMetricsAdapter.java | 2 +-
.../task/GridStreamerBroadcastTask.java | 13 +-
.../streamer/task/GridStreamerQueryTask.java | 13 +-
.../streamer/task/GridStreamerReduceTask.java | 13 +-
.../processors/task/GridTaskProcessor.java | 55 +-
.../processors/task/GridTaskWorker.java | 118 ++--
.../timeout/GridTimeoutObjectAdapter.java | 2 +-
.../timeout/GridTimeoutProcessor.java | 2 +-
.../IgniteTxHeuristicCheckedException.java | 51 ++
.../IgniteTxOptimisticCheckedException.java | 47 ++
.../IgniteTxRollbackCheckedException.java | 47 ++
.../IgniteTxTimeoutCheckedException.java | 47 ++
.../org/apache/ignite/internal/util/F0.java | 4 +-
.../internal/util/GridAnnotationsCache.java | 2 +-
.../internal/util/GridAtomicInitializer.java | 5 +-
.../util/GridBoundedConcurrentOrderedMap.java | 2 +-
.../ignite/internal/util/GridByteArrayList.java | 2 +-
.../internal/util/GridCircularBuffer.java | 2 +-
.../util/GridConcurrentPhantomHashSet.java | 5 +-
.../util/GridConcurrentWeakHashSet.java | 5 +-
.../internal/util/GridConsistentHash.java | 4 +-
.../apache/ignite/internal/util/GridDebug.java | 4 +-
.../util/GridEmptyCloseableIterator.java | 1 -
.../ignite/internal/util/GridEmptyIterator.java | 2 +-
.../internal/util/GridExecutionStatistics.java | 2 +-
.../ignite/internal/util/GridHandleTable.java | 1 -
.../ignite/internal/util/GridJavaProcess.java | 2 +-
.../ignite/internal/util/GridLeanMap.java | 4 +-
.../ignite/internal/util/GridListSet.java | 2 +-
.../ignite/internal/util/GridLogThrottle.java | 2 +-
.../apache/ignite/internal/util/GridMutex.java | 1 +
.../apache/ignite/internal/util/GridQueue.java | 2 +-
.../ignite/internal/util/GridSetWrapper.java | 2 +-
.../util/GridSpiCloseableIteratorWrapper.java | 3 +-
.../internal/util/GridStripedReadWriteLock.java | 2 +-
.../ignite/internal/util/GridThreadLocal.java | 2 +-
.../ignite/internal/util/GridThreadLocalEx.java | 2 +-
.../apache/ignite/internal/util/GridUnsafe.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 222 ++++--
.../GridTcpCommunicationMessageAdapter.java | 6 +-
.../GridTcpCommunicationMessageState.java | 6 +-
.../util/future/GridCompoundFuture.java | 12 +-
.../util/future/GridCompoundIdentityFuture.java | 2 +-
.../util/future/GridEmbeddedFuture.java | 2 +-
.../util/future/GridFinishedFuture.java | 2 +-
.../util/future/GridFinishedFutureEx.java | 2 +-
.../internal/util/future/GridFutureAdapter.java | 16 +-
.../util/future/GridFutureAdapterEx.java | 14 +-
.../util/future/GridFutureChainListener.java | 4 +-
.../util/future/IgniteFinishedFutureImpl.java | 40 ++
.../util/future/IgniteFinishedFutureImplEx.java | 30 +
.../internal/util/future/IgniteFutureImpl.java | 219 ++++++
.../util/gridify/GridifyArgumentBuilder.java | 6 +-
.../util/gridify/GridifyJobAdapter.java | 15 +-
.../util/gridify/GridifyRangeArgument.java | 1 +
.../internal/util/gridify/GridifyUtils.java | 1 +
.../internal/util/ipc/IpcEndpointFactory.java | 2 +-
.../util/ipc/loopback/IpcServerTcpEndpoint.java | 4 +-
.../shmem/IpcSharedMemoryClientEndpoint.java | 2 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 17 +-
.../util/lang/GridComputeJobWrapper.java | 6 +-
.../ignite/internal/util/lang/GridFunc.java | 30 +-
.../util/lang/GridMetadataAwareAdapter.java | 3 +-
.../internal/util/lang/GridNodePredicate.java | 5 +-
.../internal/util/lang/GridPlainFuture.java | 2 +-
.../util/lang/GridPlainFutureAdapter.java | 4 +-
.../ignite/internal/util/lang/GridTuple.java | 2 +-
.../ignite/internal/util/lang/GridTuple3.java | 2 +-
.../ignite/internal/util/lang/GridTuple4.java | 2 +-
.../ignite/internal/util/lang/GridTuple5.java | 2 +-
.../ignite/internal/util/lang/GridTuple6.java | 2 +-
.../ignite/internal/util/lang/GridTupleV.java | 2 +-
.../internal/util/lang/IgniteClosure2X.java | 2 +-
.../internal/util/lang/IgniteClosureX.java | 2 +-
.../internal/util/lang/IgniteInClosure2X.java | 2 +-
.../internal/util/lang/IgniteInClosureX.java | 2 +-
.../internal/util/lang/IgniteOutClosureX.java | 2 +-
.../ignite/internal/util/lang/IgnitePair.java | 1 +
.../internal/util/lang/IgnitePredicate2X.java | 2 +-
.../internal/util/lang/IgnitePredicateX.java | 2 +-
.../internal/util/lang/IgniteReducerX.java | 2 +-
.../internal/util/nio/GridDirectParser.java | 2 +-
.../internal/util/nio/GridNioCodecFilter.java | 2 +-
.../util/nio/GridNioEmbeddedFuture.java | 2 +-
.../util/nio/GridNioFinishedFuture.java | 2 +-
.../ignite/internal/util/nio/GridNioFuture.java | 16 +-
.../internal/util/nio/GridNioFutureImpl.java | 15 +-
.../util/nio/GridNioMessageTracker.java | 2 +-
.../util/nio/GridNioRecoveryDescriptor.java | 2 +-
.../ignite/internal/util/nio/GridNioServer.java | 15 +-
.../util/nio/GridSelectorNioSessionImpl.java | 2 +-
.../util/nio/GridShmemCommunicationClient.java | 4 +-
.../internal/util/nio/ssl/GridNioSslFilter.java | 2 +-
.../util/nio/ssl/GridNioSslHandler.java | 2 +-
.../util/nodestart/GridNodeStartUtils.java | 2 +-
.../internal/util/offheap/GridOffHeapMap.java | 2 +-
.../util/offheap/GridOffHeapPartitionedMap.java | 2 +-
.../util/offheap/unsafe/GridUnsafeLru.java | 2 +-
.../util/offheap/unsafe/GridUnsafeMap.java | 2 +-
.../unsafe/GridUnsafePartitionedMap.java | 2 +-
.../apache/ignite/internal/util/typedef/C1.java | 2 +-
.../apache/ignite/internal/util/typedef/C2.java | 2 +-
.../ignite/internal/util/typedef/CI1.java | 2 +-
.../ignite/internal/util/typedef/CI2.java | 2 +-
.../apache/ignite/internal/util/typedef/CO.java | 2 +-
.../apache/ignite/internal/util/typedef/P1.java | 2 +-
.../apache/ignite/internal/util/typedef/P2.java | 2 +-
.../ignite/internal/util/typedef/PCE.java | 2 +-
.../apache/ignite/internal/util/typedef/PE.java | 2 +-
.../ignite/internal/util/typedef/PKV.java | 2 +-
.../apache/ignite/internal/util/typedef/PN.java | 2 +-
.../apache/ignite/internal/util/typedef/R1.java | 2 +-
.../apache/ignite/internal/util/typedef/T2.java | 2 +-
.../apache/ignite/internal/util/typedef/X.java | 6 +-
.../ignite/internal/util/worker/GridWorker.java | 7 +-
.../apache/ignite/internal/visor/VisorJob.java | 7 +-
.../internal/visor/VisorMultiNodeTask.java | 19 +-
.../ignite/internal/visor/VisorOneNodeTask.java | 3 +-
.../visor/cache/VisorCacheClearTask.java | 7 +-
.../visor/cache/VisorCacheCompactTask.java | 37 +-
.../cache/VisorCacheDefaultConfiguration.java | 2 +-
.../visor/cache/VisorCacheLoadTask.java | 39 +-
.../visor/cache/VisorCacheMetadataTask.java | 21 +-
.../cache/VisorCacheMetricsCollectorTask.java | 10 +-
.../visor/cache/VisorCachePreloadTask.java | 25 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 5 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 7 +-
.../compute/VisorComputeCancelSessionsTask.java | 8 +-
.../compute/VisorComputeResetMetricsTask.java | 5 +-
.../VisorComputeToggleMonitoringTask.java | 9 +-
.../visor/debug/VisorThreadDumpTask.java | 7 +-
.../event/VisorGridAuthenticationEvent.java | 2 +-
.../event/VisorGridAuthorizationEvent.java | 2 +-
.../visor/event/VisorGridDeploymentEvent.java | 2 +-
.../visor/event/VisorGridDiscoveryEvent.java | 2 +-
.../internal/visor/event/VisorGridEvent.java | 2 +-
.../visor/event/VisorGridEventsLost.java | 2 +-
.../internal/visor/event/VisorGridJobEvent.java | 2 +-
.../visor/event/VisorGridLicenseEvent.java | 2 +-
.../event/VisorGridSecuritySessionEvent.java | 2 +-
.../visor/event/VisorGridTaskEvent.java | 2 +-
.../internal/visor/file/VisorFileBlockTask.java | 7 +-
.../visor/file/VisorLatestTextFilesTask.java | 7 +-
.../visor/ggfs/VisorGgfsFormatTask.java | 6 +-
.../visor/ggfs/VisorGgfsProfilerClearTask.java | 13 +-
.../visor/ggfs/VisorGgfsProfilerTask.java | 9 +-
.../visor/ggfs/VisorGgfsResetMetricsTask.java | 6 +-
.../visor/ggfs/VisorGgfsSamplingStateTask.java | 13 +-
.../internal/visor/log/VisorLogSearchTask.java | 13 +-
.../internal/visor/misc/VisorAckTask.java | 7 +-
.../visor/misc/VisorLatestVersionTask.java | 5 +-
.../internal/visor/misc/VisorNopTask.java | 9 +-
.../visor/misc/VisorResolveHostNameTask.java | 10 +-
.../visor/node/VisorGridConfiguration.java | 2 +-
.../VisorNodeConfigurationCollectorJob.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 10 +-
.../visor/node/VisorNodeDataCollectorTask.java | 12 +-
.../node/VisorNodeEventsCollectorTask.java | 13 +-
.../internal/visor/node/VisorNodeGcTask.java | 10 +-
.../internal/visor/node/VisorNodePingTask.java | 7 +-
.../visor/node/VisorNodeRestartTask.java | 6 +-
.../internal/visor/node/VisorNodeStopTask.java | 6 +-
.../node/VisorSegmentationConfiguration.java | 2 +-
.../visor/node/VisorSpisConfiguration.java | 2 +-
.../VisorPortableMetadataCollectorTask.java | 8 +-
.../visor/query/VisorQueryCleanupTask.java | 9 +-
.../visor/query/VisorQueryNextPageTask.java | 13 +-
.../internal/visor/query/VisorQueryTask.java | 7 +-
.../streamer/VisorStreamerConfiguration.java | 2 +-
.../visor/streamer/VisorStreamerMetrics.java | 2 +-
.../streamer/VisorStreamerMetricsResetTask.java | 6 +-
.../visor/streamer/VisorStreamerResetTask.java | 6 +-
.../streamer/VisorStreamerStageMetrics.java | 2 +-
.../internal/visor/util/VisorTaskUtils.java | 8 +-
.../ignite/jdbc/util/IgniteJdbcUtils.java | 2 +-
.../apache/ignite/lang/IgniteAsyncSupport.java | 4 +-
.../ignite/lang/IgniteAsyncSupportAdapter.java | 23 +-
.../org/apache/ignite/lang/IgniteFuture.java | 176 +++++
.../lang/IgniteFutureCancelledException.java | 2 +-
.../lang/IgniteFutureTimeoutException.java | 2 +-
.../java/org/apache/ignite/lang/IgniteUuid.java | 4 +-
.../apache/ignite/lifecycle/IgniteListener.java | 1 +
.../apache/ignite/lifecycle/LifecycleAware.java | 8 +-
.../apache/ignite/lifecycle/LifecycleBean.java | 4 +-
.../ignite/logger/java/IgniteJavaLogger.java | 2 +-
.../managed/ManagedServiceConfiguration.java | 2 +-
.../marshaller/IgniteMarshallerExclusions.java | 2 +-
.../marshaller/jdk/IgniteJdkMarshaller.java | 2 +-
.../IgniteOptimizedClassDescriptor.java | 2 +-
.../optimized/IgniteOptimizedClassResolver.java | 2 +-
.../optimized/IgniteOptimizedMarshaller.java | 2 +-
.../IgniteOptimizedObjectInputStream.java | 2 +-
.../IgniteOptimizedObjectOutputStream.java | 2 +-
.../IgniteOptimizedObjectStreamRegistry.java | 17 +-
.../ignite/messaging/MessagingListenActor.java | 2 +-
.../org/apache/ignite/plugin/PluginContext.java | 2 +-
.../ignite/plugin/security/GridSecurity.java | 4 +-
.../security/GridSecurityCredentials.java | 2 +-
.../ignite/portables/PortableConfiguration.java | 2 +-
.../ignite/scheduler/SchedulerFuture.java | 48 +-
.../java/org/apache/ignite/spi/IgniteSpi.java | 1 +
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 39 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 57 +-
.../apache/ignite/spi/IgniteSpiException.java | 2 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 1 +
.../AuthenticationAclProvider.java | 4 +-
.../spi/authentication/AuthenticationSpi.java | 2 +-
.../noop/NoopAuthenticationSpi.java | 8 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 14 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 5 +-
.../spi/checkpoint/noop/NoopCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointData.java | 1 +
.../sharedfs/SharedFsCheckpointSpi.java | 4 +-
.../sharedfs/SharedFsTimeoutTask.java | 3 +-
.../spi/checkpoint/sharedfs/SharedFsUtils.java | 3 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 2 +-
.../jobstealing/JobStealingCollisionSpi.java | 6 +-
.../spi/collision/noop/NoopCollisionSpi.java | 2 +-
.../PriorityQueueCollisionSpi.java | 4 +-
.../communication/tcp/TcpCommunicationSpi.java | 15 +-
.../deployment/local/LocalDeploymentSpi.java | 4 +-
.../DiscoverySpiNodeAuthenticator.java | 6 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 15 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 28 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 9 +-
.../tcp/internal/TcpDiscoveryNode.java | 4 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 2 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 6 +-
.../ipfinder/TcpDiscoveryIpFinderAdapter.java | 2 +-
.../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 9 +-
.../TcpDiscoveryMulticastIpFinder.java | 9 +-
.../sharedfs/TcpDiscoverySharedFsIpFinder.java | 9 +-
.../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 6 +-
.../messages/TcpDiscoveryAbstractMessage.java | 2 +-
.../TcpDiscoveryClientReconnectMessage.java | 2 +-
.../messages/TcpDiscoveryDiscardMessage.java | 2 +-
.../TcpDiscoveryDuplicateIdMessage.java | 2 +-
.../TcpDiscoveryJoinRequestMessage.java | 2 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 4 +-
.../TcpDiscoveryStatusCheckMessage.java | 2 +-
.../memory/MemoryEventStorageSpi.java | 4 +-
.../ignite/spi/failover/FailoverContext.java | 4 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 6 +-
.../jobstealing/JobStealingFailoverSpi.java | 6 +-
.../spi/failover/never/NeverFailoverSpi.java | 3 +-
.../spi/indexing/GridIndexingQueryFilter.java | 1 -
.../spi/loadbalancing/LoadBalancingSpi.java | 4 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 17 +-
.../RoundRobinGlobalLoadBalancer.java | 22 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 7 +-
.../WeightedRandomLoadBalancingSpi.java | 6 +-
.../spi/securesession/SecureSessionSpi.java | 4 +-
.../noop/NoopSecureSessionSpi.java | 4 +-
.../apache/ignite/spi/swapspace/SwapKey.java | 2 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 11 +-
.../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 +-
.../ignite/startup/BasicWarmupClosure.java | 4 +-
.../startup/cmdline/CommandLineStartup.java | 2 +-
.../ignite/streamer/StreamerConfiguration.java | 2 +-
.../apache/ignite/streamer/StreamerContext.java | 24 +-
.../apache/ignite/streamer/StreamerStage.java | 4 +-
.../apache/ignite/streamer/StreamerWindow.java | 44 +-
.../streamer/index/StreamerIndexProvider.java | 8 +-
.../index/StreamerIndexProviderAdapter.java | 26 +-
.../streamer/index/StreamerIndexUpdater.java | 4 +-
.../index/hash/StreamerHashIndexProvider.java | 8 +-
.../index/tree/StreamerTreeIndexProvider.java | 16 +-
.../router/StreamerAffinityEventRouter.java | 4 +-
.../router/StreamerLocalEventRouter.java | 2 +-
.../router/StreamerRandomEventRouter.java | 2 +-
.../window/StreamerBoundedSizeBatchWindow.java | 17 +-
.../StreamerBoundedSizeWindowAdapter.java | 4 +-
.../window/StreamerBoundedTimeBatchWindow.java | 19 +-
.../window/StreamerBoundedTimeWindow.java | 6 +-
.../streamer/window/StreamerWindowAdapter.java | 40 +-
.../apache/ignite/transactions/IgniteTx.java | 17 +-
.../IgniteTxHeuristicException.java | 24 +-
.../IgniteTxOptimisticException.java | 24 +-
.../transactions/IgniteTxRollbackException.java | 24 +-
.../transactions/IgniteTxTimeoutException.java | 24 +-
.../ignite/GridSuppressedExceptionSelfTest.java | 1 -
.../java/org/apache/ignite/GridTestJob.java | 3 +-
.../org/apache/ignite/GridTestJobResult.java | 10 +-
.../apache/ignite/GridTestStoreNodeStartup.java | 1 -
.../java/org/apache/ignite/GridTestTask.java | 2 +-
.../org/apache/ignite/GridTestTaskSession.java | 14 +-
.../IgniteExternalizableAbstractTest.java | 1 +
.../store/GridCacheBalancingStoreSelfTest.java | 2 +-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 2 +-
.../cache/store/GridGeneratingTestStore.java | 3 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 6 +-
.../fs/GridGgfsEventsAbstractSelfTest.java | 4 +-
.../GridGgfsFragmentizerAbstractSelfTest.java | 2 +-
.../ignite/internal/ClusterMetricsSelfTest.java | 2 +-
.../internal/ClusterNodeMetricsSelfTest.java | 2 +-
.../ignite/internal/GridAffinityMappedTest.java | 2 +-
.../internal/GridAffinityP2PSelfTest.java | 2 +-
.../ignite/internal/GridAffinitySelfTest.java | 4 +-
.../GridAlwaysFailoverSpiFailSelfTest.java | 20 +-
.../internal/GridCancelOnGridStopSelfTest.java | 11 +-
.../internal/GridCancelUnusedJobSelfTest.java | 8 +-
.../GridCancelledJobsMetricsSelfTest.java | 12 +-
.../GridCollisionJobsContextSelfTest.java | 3 +-
.../internal/GridCommunicationSelfTest.java | 2 +-
.../GridContinuousJobAnnotationSelfTest.java | 16 +-
.../GridContinuousJobSiblingsSelfTest.java | 11 +-
.../internal/GridContinuousTaskSelfTest.java | 24 +-
.../GridDeploymentMultiThreadedSelfTest.java | 6 +-
.../ignite/internal/GridDeploymentSelfTest.java | 15 +-
.../internal/GridDiscoveryEventSelfTest.java | 4 +-
.../ignite/internal/GridDiscoverySelfTest.java | 8 +-
.../GridEventStorageCheckAllEventsSelfTest.java | 14 +-
...ventStorageRuntimeConfigurationSelfTest.java | 2 +-
.../internal/GridEventStorageSelfTest.java | 8 +-
.../internal/GridFactoryVmShutdownTest.java | 5 +-
.../GridFailoverCustomTopologySelfTest.java | 8 +-
.../ignite/internal/GridFailoverSelfTest.java | 12 +-
.../GridFailoverTaskWithPredicateSelfTest.java | 18 +-
.../internal/GridFailoverTopologySelfTest.java | 12 +-
.../GridJobCheckpointCleanupSelfTest.java | 7 +-
.../GridJobCollisionCancelSelfTest.java | 2 +-
.../ignite/internal/GridJobContextSelfTest.java | 4 +-
.../GridJobMasterLeaveAwareSelfTest.java | 88 +--
.../internal/GridJobStealingSelfTest.java | 13 +-
.../GridJobStealingZeroActiveJobsSelfTest.java | 8 +-
.../internal/GridJobSubjectIdSelfTest.java | 9 +-
.../ignite/internal/GridKernalTestUtils.java | 2 +-
.../internal/GridLifecycleAwareSelfTest.java | 11 +-
.../internal/GridLifecycleBeanSelfTest.java | 8 +-
.../internal/GridListenActorSelfTest.java | 2 +-
.../internal/GridManagementJobSelfTest.java | 2 +-
.../internal/GridMultipleJobsSelfTest.java | 9 +-
.../internal/GridMultipleSpisSelfTest.java | 12 +-
.../GridMultipleVersionsDeploymentSelfTest.java | 8 +-
.../GridMultithreadedJobStealingSelfTest.java | 15 +-
.../ignite/internal/GridNodeLocalSelfTest.java | 2 +-
.../internal/GridNonHistoryMetricsSelfTest.java | 4 +-
.../internal/GridProjectionAbstractTest.java | 28 +-
.../GridProjectionForCachesSelfTest.java | 56 +-
...ectionLocalJobMultipleArgumentsSelfTest.java | 2 +-
.../ignite/internal/GridReduceSelfTest.java | 11 +-
.../internal/GridRuntimeExceptionSelfTest.java | 17 +-
.../internal/GridSameVmStartupSelfTest.java | 2 +-
.../apache/ignite/internal/GridSelfTest.java | 2 +-
.../internal/GridSpiExceptionSelfTest.java | 12 +-
.../ignite/internal/GridStartStopSelfTest.java | 2 +-
.../internal/GridStopWithCancelSelfTest.java | 8 +-
.../internal/GridStopWithWaitSelfTest.java | 18 +-
.../GridTaskCancelSingleNodeSelfTest.java | 6 +-
.../GridTaskContinuousMapperSelfTest.java | 28 +-
.../GridTaskExecutionContextSelfTest.java | 10 +-
.../internal/GridTaskFailoverSelfTest.java | 3 +-
.../GridTaskFutureImplStopGridSelfTest.java | 11 +-
.../GridTaskInstanceExecutionSelfTest.java | 6 +-
.../internal/GridTaskInstantiationSelfTest.java | 4 +-
.../internal/GridTaskJobRejectSelfTest.java | 4 +-
.../internal/GridTaskListenerSelfTest.java | 8 +-
.../internal/GridTaskMapAsyncSelfTest.java | 10 +-
.../GridTaskNameAnnotationSelfTest.java | 10 +-
.../internal/GridTaskResultCacheSelfTest.java | 11 +-
.../internal/GridTaskTimeoutSelfTest.java | 8 +-
.../GridTopologyBuildVersionSelfTest.java | 2 +-
.../ignite/internal/GridVersionSelfTest.java | 2 +-
.../IgniteComputeEmptyClusterGroupTest.java | 198 ++++++
.../internal/IgniteExecutorServiceTest.java | 6 +-
...gniteExplicitImplicitDeploymentSelfTest.java | 10 +-
.../managers/GridManagerStopSelfTest.java | 20 +-
.../GridCheckpointManagerAbstractSelfTest.java | 70 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 14 +-
...idCommunicationManagerListenersSelfTest.java | 8 +-
.../GridCommunicationSendMessageSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 5 +-
.../GridDeploymentManagerStopSelfTest.java | 2 +-
.../GridDeploymentMessageCountSelfTest.java | 4 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +-
.../discovery/GridDiscoveryManagerSelfTest.java | 2 +-
.../events/GridEventStorageManagerSelfTest.java | 5 +-
.../GridSwapSpaceCustomLocalValue.java | 1 +
.../swapspace/GridSwapSpaceManagerSelfTest.java | 4 +-
.../GridCacheAbstractFailoverSelfTest.java | 16 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 24 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 2 +-
.../GridCacheAbstractProjectionSelfTest.java | 4 +-
.../GridCacheAbstractRemoveFailureTest.java | 2 +-
.../cache/GridCacheAbstractSelfTest.java | 13 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 12 +-
.../GridCacheAtomicMessageCountSelfTest.java | 6 +-
.../cache/GridCacheBasicApiAbstractTest.java | 5 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 6 +-
...acheBasicStoreMultithreadedAbstractTest.java | 1 -
.../cache/GridCacheClearAllSelfTest.java | 6 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 2 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 20 +-
...idCacheConfigurationConsistencySelfTest.java | 8 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 4 +-
.../GridCacheDeploymentOffHeapSelfTest.java | 2 +-
.../cache/GridCacheDeploymentSelfTest.java | 14 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 6 +-
.../cache/GridCacheEntryVersionSelfTest.java | 2 +-
.../GridCacheExAbstractFullApiSelfTest.java | 6 +-
.../GridCacheFinishPartitionsSelfTest.java | 6 +-
.../cache/GridCacheGenericTestStore.java | 5 +-
.../GridCacheGroupLockAbstractSelfTest.java | 7 +-
.../GridCacheGroupLockFailoverSelfTest.java | 11 +-
.../cache/GridCacheGroupLockPutTask.java | 45 +-
.../cache/GridCacheIncrementTransformTest.java | 2 +-
.../GridCacheInterceptorAbstractSelfTest.java | 2 +-
.../cache/GridCacheIteratorPerformanceTest.java | 2 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 6 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 4 +-
.../GridCacheMarshallerTxAbstractTest.java | 2 +-
.../cache/GridCacheMemoryModeSelfTest.java | 4 +-
.../GridCacheMissingCommitVersionSelfTest.java | 3 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 4 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 8 +-
.../cache/GridCacheMvccManagerSelfTest.java | 2 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 2 +-
.../cache/GridCacheNestedTxAbstractTest.java | 6 +-
.../cache/GridCacheObjectToStringSelfTest.java | 4 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 2 +-
.../cache/GridCacheOffHeapSelfTest.java | 8 +-
.../processors/cache/GridCacheOffHeapTest.java | 2 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 2 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 2 +-
.../GridCacheOrderedPreloadingSelfTest.java | 2 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 8 +-
.../cache/GridCachePartitionedGetSelfTest.java | 2 +-
...hePartitionedProjectionAffinitySelfTest.java | 4 +-
.../cache/GridCachePartitionedWritesTest.java | 3 +-
.../GridCachePreloadingEvictionsSelfTest.java | 10 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 23 +-
.../processors/cache/GridCachePutAllTask.java | 15 +-
.../GridCacheReferenceCleanupSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
...ridCacheReplicatedSynchronousCommitTest.java | 4 +-
.../GridCacheReturnValueTransferSelfTest.java | 2 +-
.../cache/GridCacheSlowTxWarnTest.java | 2 +-
.../processors/cache/GridCacheStopSelfTest.java | 2 +-
.../cache/GridCacheStorePutxSelfTest.java | 3 +-
.../cache/GridCacheSwapReloadSelfTest.java | 6 +-
.../processors/cache/GridCacheTestEntryEx.java | 16 +-
.../processors/cache/GridCacheTestKey.java | 1 +
.../processors/cache/GridCacheTestStore.java | 14 +-
.../processors/cache/GridCacheTestValue.java | 1 +
.../processors/cache/GridCacheTestValue2.java | 1 +
.../cache/GridCacheTtlManagerSelfTest.java | 4 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 2 +-
...idCacheValueConsistencyAbstractSelfTest.java | 2 +-
.../GridCacheVariableTopologySelfTest.java | 7 +-
.../GridCacheWriteBehindStoreAbstractTest.java | 4 +-
...heWriteBehindStoreMultithreadedSelfTest.java | 1 -
...BehindStorePartitionedMultiNodeSelfTest.java | 10 +-
.../IgniteCacheEntryListenerAbstractTest.java | 1 -
.../cache/IgniteCacheInvokeAbstractTest.java | 15 +-
.../cache/IgniteCachingProviderSelfTest.java | 1 -
.../processors/cache/IgniteTxAbstractTest.java | 11 +-
.../IgniteTxConcurrentGetAbstractTest.java | 2 +-
.../IgniteTxExceptionAbstractSelfTest.java | 14 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 12 +-
.../IgniteTxMultiThreadedAbstractTest.java | 5 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 8 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 18 +-
...eAbstractDataStructuresFailoverSelfTest.java | 2 +-
.../GridCacheAtomicLongApiSelfTest.java | 2 +-
...CacheAtomicReferenceApiSelfAbstractTest.java | 1 -
...cheAtomicReferenceMultiNodeAbstractTest.java | 2 +-
.../GridCacheCountDownLatchSelfTest.java | 6 +-
.../GridCacheQueueApiSelfAbstractTest.java | 2 +-
...ridCacheQueueJoinedNodeSelfAbstractTest.java | 20 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 6 +-
...CacheQueueRotativeMultiNodeAbstractTest.java | 8 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 4 +-
...dCacheSequenceMultiNodeAbstractSelfTest.java | 4 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 2 +-
...titionedAtomicSequenceMultiThreadedTest.java | 4 +-
...achePartitionedAtomicStampedApiSelfTest.java | 2 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 6 +-
.../GridCachePartitionedQueueApiSelfTest.java | 2 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 4 +-
...CachePartitionedQueueJoinedNodeSelfTest.java | 2 +-
...dCachePartitionedQueueMultiNodeSelfTest.java | 2 +-
...GridCachePartitionedSequenceApiSelfTest.java | 2 +-
...chePartitionedSequenceMultiNodeSelfTest.java | 2 +-
...tractDistributedByteArrayValuesSelfTest.java | 2 +-
.../GridCacheAbstractJobExecutionTest.java | 10 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 13 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 4 +-
.../GridCacheAtomicTimeoutSelfTest.java | 17 +-
.../GridCacheBasicOpAbstractTest.java | 6 +-
.../GridCacheClientModesAbstractSelfTest.java | 2 +-
.../GridCacheEntrySetAbstractSelfTest.java | 4 +-
.../distributed/GridCacheEventAbstractTest.java | 6 +-
.../GridCacheMultiNodeAbstractTest.java | 6 +-
...dCacheMultithreadedFailoverAbstractTest.java | 8 +-
.../GridCacheNodeFailureAbstractTest.java | 17 +-
...dCachePartitionedAffinityFilterSelfTest.java | 4 +-
...chePartitionedReloadAllAbstractSelfTest.java | 5 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 8 +-
.../GridCachePreloadLifecycleAbstractTest.java | 6 +-
...GridCachePreloadRestartAbstractSelfTest.java | 6 +-
.../GridCacheTransformEventSelfTest.java | 10 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 6 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 15 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 16 +-
.../IgniteTxPreloadAbstractTest.java | 4 +-
.../IgniteTxTimeoutAbstractTest.java | 5 +-
...heAbstractTransformWriteThroughSelfTest.java | 4 +-
...acheAtomicExpiredEntriesPreloadSelfTest.java | 2 +-
.../dht/GridCacheColocatedFailoverSelfTest.java | 2 +-
...eColocatedOptimisticTransactionSelfTest.java | 10 +-
.../GridCacheColocatedTxExceptionSelfTest.java | 2 +-
...ssimisticOriginatingNodeFailureSelfTest.java | 2 +-
...dCacheColocatedTxSingleThreadedSelfTest.java | 2 +-
.../GridCacheDhtAtomicRemoveFailureTest.java | 2 +-
.../dht/GridCacheDhtEntrySelfTest.java | 8 +-
.../dht/GridCacheDhtEntrySetSelfTest.java | 2 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 12 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 14 +-
...idCacheDhtExpiredEntriesPreloadSelfTest.java | 2 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 6 +-
.../dht/GridCacheDhtMappingSelfTest.java | 2 +-
.../dht/GridCacheDhtMultiBackupTest.java | 2 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 12 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 10 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 10 +-
.../GridCacheDhtPreloadMessageCountTest.java | 6 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 21 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 18 +-
.../dht/GridCacheDhtRemoveFailureTest.java | 2 +-
.../dht/GridCacheDhtTxPreloadSelfTest.java | 2 +-
...cheGroupLockPartitionedAbstractSelfTest.java | 2 +-
...ockPartitionedMultiNodeAbstractSelfTest.java | 4 +-
...dCachePartitionedTopologyChangeSelfTest.java | 8 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 9 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 2 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 2 +-
.../near/GridCacheExNearFullApiSelfTest.java | 2 +-
.../near/GridCacheGetStoreErrorSelfTest.java | 2 +-
.../near/GridCacheNearEvictionSelfTest.java | 2 +-
...dCacheNearExpiredEntriesPreloadSelfTest.java | 2 +-
.../near/GridCacheNearMultiGetSelfTest.java | 13 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 9 +-
.../near/GridCacheNearOneNodeSelfTest.java | 3 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 9 +-
.../GridCacheNearPartitionedClearSelfTest.java | 4 +-
.../GridCacheNearReaderPreloadSelfTest.java | 2 +-
.../near/GridCacheNearReadersSelfTest.java | 2 +-
.../near/GridCacheNearRemoveFailureTest.java | 2 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 14 +-
...ssimisticOriginatingNodeFailureSelfTest.java | 2 +-
.../near/GridCacheNearTxPreloadSelfTest.java | 2 +-
.../GridCachePartitionedAffinitySelfTest.java | 10 +-
.../near/GridCachePartitionedBasicApiTest.java | 2 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 6 +-
.../GridCachePartitionedEntryLockSelfTest.java | 6 +-
.../near/GridCachePartitionedEventSelfTest.java | 2 +-
.../GridCachePartitionedEvictionSelfTest.java | 8 +-
...titionedExplicitLockNodeFailureSelfTest.java | 12 +-
...GridCachePartitionedFilteredPutSelfTest.java | 6 +-
.../near/GridCachePartitionedFlagsTest.java | 4 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 3 +-
.../near/GridCachePartitionedLockSelfTest.java | 2 +-
...achePartitionedMultiNodeCounterSelfTest.java | 10 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 11 +-
.../GridCachePartitionedMultiNodeSelfTest.java | 2 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
.../near/GridCachePartitionedNestedTxTest.java | 3 +-
...GridCachePartitionedNodeFailureSelfTest.java | 2 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 2 +-
...achePartitionedPreloadLifecycleSelfTest.java | 69 +-
.../GridCachePartitionedProjectionSelfTest.java | 2 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 6 +-
.../GridCachePartitionedStorePutSelfTest.java | 3 +-
...CachePartitionedTxMultiThreadedSelfTest.java | 2 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 14 +-
...achePartitionedTxSingleThreadedSelfTest.java | 2 +-
.../near/GridCachePutArrayValueSelfTest.java | 2 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 1 -
.../GridCacheReplicatedEvictionSelfTest.java | 7 +-
.../GridCacheReplicatedFlagsTest.java | 4 +-
...ReplicatedFullApiMultithreadedSelfTest1.java | 2 +-
.../GridCacheReplicatedFullApiSelfTest.java | 2 +-
.../GridCacheReplicatedInvalidateSelfTest.java | 11 +-
...ridCacheReplicatedPreloadEventsSelfTest.java | 2 +-
...dCacheReplicatedTxMultiThreadedSelfTest.java | 2 +-
...ssimisticOriginatingNodeFailureSelfTest.java | 2 +-
.../GridCacheReplicatedTxReadTest.java | 4 +-
...CacheReplicatedTxSingleThreadedSelfTest.java | 2 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 2 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 2 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 75 +-
.../GridCacheReplicatedPreloadSelfTest.java | 6 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 1 -
...heConcurrentEvictionConsistencySelfTest.java | 8 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 4 +-
.../GridCacheDistributedEvictionsSelfTest.java | 4 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 23 +-
.../eviction/GridCacheEvictionAbstractTest.java | 10 +-
.../GridCacheEvictionFilterSelfTest.java | 4 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 4 +-
.../GridCacheEvictionTouchSelfTest.java | 6 +-
.../cache/eviction/GridCacheMockEntry.java | 2 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 6 +-
.../IgniteCacheLoadAllAbstractTest.java | 2 +-
.../IgniteCacheLoaderWriterAbstractTest.java | 8 +-
.../IgniteCacheNoReadThroughAbstractTest.java | 2 +-
.../IgniteCacheNoWriteThroughAbstractTest.java | 1 -
.../IgniteCacheStoreSessionAbstractTest.java | 2 +-
.../IgniteCacheTxStoreSessionTest.java | 6 +-
.../local/GridCacheDaemonNodeLocalSelfTest.java | 2 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 4 +-
.../local/GridCacheLocalFullApiSelfTest.java | 2 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 2 +-
.../GridCacheLocalTxExceptionSelfTest.java | 2 +-
.../local/GridCacheLocalTxTimeoutSelfTest.java | 7 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 10 +-
...eContinuousQueryPartitionedOnlySelfTest.java | 2 +-
...dCacheAbstractReduceFieldsQuerySelfTest.java | 2 +-
.../clock/GridTimeSyncProcessorSelfTest.java | 4 +-
.../closure/GridClosureProcessorRemoteTest.java | 3 +-
.../closure/GridClosureProcessorSelfTest.java | 42 +-
.../continuous/GridEventConsumeSelfTest.java | 8 +-
.../continuous/GridMessageListenSelfTest.java | 2 +-
.../dataload/GridDataLoaderImplSelfTest.java | 4 +-
.../dataload/GridDataLoaderPerformanceTest.java | 6 +-
.../GridDataLoaderProcessorSelfTest.java | 15 +-
...heGgfsPerBlockLruEvictionPolicySelfTest.java | 18 +-
.../processors/fs/GridGgfsAbstractSelfTest.java | 54 +-
.../fs/GridGgfsDataManagerSelfTest.java | 12 +-
.../fs/GridGgfsDualAbstractSelfTest.java | 12 +-
.../processors/fs/GridGgfsFileInfoSelfTest.java | 2 +-
.../processors/fs/GridGgfsFileMapSelfTest.java | 2 +-
...GgfsGroupDataBlockKeyMapperHashSelfTest.java | 2 +-
.../fs/GridGgfsMetaManagerSelfTest.java | 24 +-
.../processors/fs/GridGgfsMetricsSelfTest.java | 4 +-
.../processors/fs/GridGgfsModesSelfTest.java | 14 +-
.../GridGgfsPrimaryOffheapTieredSelfTest.java | 2 +-
.../GridGgfsPrimaryOffheapValuesSelfTest.java | 2 +-
.../fs/GridGgfsProcessorSelfTest.java | 6 +-
.../fs/GridGgfsProcessorValidationSelfTest.java | 9 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 8 +-
...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +-
.../processors/fs/GridGgfsSizeSelfTest.java | 8 +-
.../processors/fs/GridGgfsStreamsSelfTest.java | 4 +-
.../processors/fs/GridGgfsTaskSelfTest.java | 20 +-
.../GridGgfsAbstractRecordResolverSelfTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 4 +-
.../GridServiceProcessorAbstractSelfTest.java | 26 +-
...ServiceProcessorMultiNodeConfigSelfTest.java | 2 +-
.../GridServiceProcessorMultiNodeSelfTest.java | 8 +-
.../GridServiceProcessorProxySelfTest.java | 2 +-
.../streamer/GridStreamerEvictionSelfTest.java | 2 +-
.../streamer/GridStreamerFailoverSelfTest.java | 8 +-
.../GridStreamerLifecycleAwareSelfTest.java | 2 +-
.../streamer/GridStreamerSelfTest.java | 13 +-
.../processors/streamer/GridTestStage.java | 4 +-
.../ignite/internal/processors/streamer/SC.java | 2 +-
.../product/GridProductVersionSelfTest.java | 2 +-
...artupWithSpecifiedWorkDirectorySelfTest.java | 4 +-
...tartupWithUndefinedGridGainHomeSelfTest.java | 4 +-
.../internal/util/IgniteUtilsSelfTest.java | 34 +-
.../util/future/GridEmbeddedFutureSelfTest.java | 4 +-
.../util/future/GridFinishedFutureSelfTest.java | 2 +-
.../util/future/GridFutureAdapterSelfTest.java | 23 +-
.../util/future/IgniteFutureImplTest.java | 525 ++++++++++++++
.../util/future/nio/GridNioFutureSelfTest.java | 12 +-
.../ipc/shmem/GgfsSharedMemoryTestClient.java | 4 +-
.../ipc/shmem/IpcSharedMemoryFakeClient.java | 2 +-
.../ipc/shmem/IpcSharedMemoryNodeStartup.java | 6 +-
.../LoadWithCorruptedLibFileTestRunner.java | 4 +-
.../IpcSharedMemoryBenchmarkWriter.java | 2 +-
.../offheap/GridOffHeapMapAbstractSelfTest.java | 2 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 2 +-
.../unsafe/GridUnsafeMemorySelfTest.java | 6 +-
.../ignite/jvmtest/ConcurrentMapTest.java | 2 +-
.../ignite/jvmtest/MultipleFileIOTest.java | 2 +-
.../ignite/lang/GridByteArrayListSelfTest.java | 1 +
.../ignite/lang/GridFuncPerformanceTest.java | 3 +-
.../apache/ignite/lang/GridFuncSelfTest.java | 8 +-
.../lang/GridMetadataAwareAdapterSelfTest.java | 2 +-
.../GridConcurrentWeakHashSetSelfTest.java | 1 +
.../ignite/lang/utils/GridTrieMapSelfTest.java | 4 +-
.../loadtest/GridSingleExecutionTest.java | 20 +-
...idFileSwapSpaceSpiMultithreadedLoadTest.java | 6 +-
.../loadtests/GridCacheLoadPopulationTask.java | 10 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 2 +-
.../cache/GridCacheAbstractLoadTest.java | 6 +-
...ridCacheAffinityTransactionsOffHeapTest.java | 4 +-
.../cache/GridCacheGroupLockComparisonTest.java | 6 +-
.../cache/GridCachePutRemoveLoadTest.java | 4 +-
.../cache/GridCacheSingleNodeLoadTest.java | 8 +-
.../loadtests/cache/GridCacheSwapLoadTest.java | 2 +-
.../GridCacheWriteBehindStoreLoadTest.java | 3 +-
.../colocation/GridTestCacheStore.java | 1 -
.../colocation/GridTestLifecycleBean.java | 6 +-
.../loadtests/colocation/GridTestMain.java | 12 +-
.../communication/GridIoManagerBenchmark.java | 6 +-
.../communication/GridIoManagerBenchmark0.java | 8 +-
.../communication/GridTestMessage.java | 2 +-
.../GridContinuousOperationsLoadTest.java | 14 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 6 +-
.../direct/multisplit/GridLoadTestJob.java | 2 +-
.../direct/multisplit/GridLoadTestTask.java | 4 +-
.../multisplit/GridMultiSplitsLoadTest.java | 4 +-
.../GridMultiSplitsRedeployLoadTest.java | 4 +-
.../GridSingleSplitNewNodesTestJobTarget.java | 5 +-
.../GridSingleSplitNewNodesTestTask.java | 7 +-
...ridSingleSplitsNewNodesAbstractLoadTest.java | 4 +-
.../GridSingleSplitsRedeployLoadTest.java | 4 +-
.../direct/session/GridSessionLoadTest.java | 2 +-
.../direct/session/GridSessionLoadTestJob.java | 2 +-
.../direct/session/GridSessionLoadTestTask.java | 6 +-
.../stealing/GridStealingLoadTestJob.java | 2 +-
.../stealing/GridStealingLoadTestTask.java | 5 +-
.../ignite/loadtests/dsi/GridDsiClient.java | 4 +-
.../loadtests/dsi/GridDsiLifecycleBean.java | 28 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 6 +-
.../loadtests/dsi/GridDsiRequestTask.java | 5 +-
.../loadtests/dsi/GridDsiResponseTask.java | 5 +-
...dBoundedConcurrentLinkedHashSetLoadTest.java | 4 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 4 +-
.../job/GridJobExecutionLoadTestClient.java | 6 +-
...GridJobExecutionLoadTestClientSemaphore.java | 11 +-
.../job/GridJobExecutionLoadTestJob.java | 3 +-
.../job/GridJobExecutionLoadTestTask.java | 8 +-
.../job/GridJobExecutionSingleNodeLoadTest.java | 11 +-
...JobExecutionSingleNodeSemaphoreLoadTest.java | 17 +-
.../loadtests/job/GridJobLoadTestJob.java | 4 +-
.../loadtests/job/GridJobLoadTestSubmitter.java | 7 +-
.../loadtests/job/GridJobLoadTestTask.java | 8 +-
.../mapper/GridContinuousMapperTask1.java | 19 +-
.../mapper/GridContinuousMapperTask2.java | 9 +-
.../mergesort/GridMergeSortLoadTask.java | 10 +-
.../mergesort/GridMergeSortLoadTest.java | 2 +-
.../loadtests/nio/GridNioBenchmarkTest.java | 2 +-
.../GridOffHeapMapPerformanceAbstractTest.java | 2 +-
...apPartitionedMapPerformanceAbstractTest.java | 2 +-
.../ignite/loadtests/streamer/EventClosure.java | 4 +-
.../streamer/GridStreamerBenchmark.java | 2 +-
.../streamer/GridStreamerIndexLoadTest.java | 6 +-
.../ignite/loadtests/streamer/QueryClosure.java | 7 +-
.../loadtests/streamer/average/TestStage.java | 6 +-
.../swap/GridSwapEvictAllBenchmark.java | 5 +-
.../ignite/logger/java/GridJavaLoggerTest.java | 2 +-
.../marshaller/GridMarshallerAbstractTest.java | 16 +-
.../GridMarshallerExternalizableBean.java | 1 +
.../GridMarshallerPerformanceTest.java | 4 +-
.../marshaller/GridMarshallerResourceBean.java | 2 +-
.../GridOptimizedMarshallerSelfTest.java | 2 +-
.../optimized/GridOptimizedMarshallerTest.java | 4 +-
.../GridOptimizedObjectStreamSelfTest.java | 2 +-
.../GridTestTcpDiscoveryIpFinderAdapter.java | 8 +-
.../ignite/messaging/GridMessagingSelfTest.java | 16 +-
.../ignite/p2p/GridP2PClassLoadingSelfTest.java | 4 +-
.../GridP2PContinuousDeploymentSelfTest.java | 2 +-
.../GridP2PDifferentClassLoaderSelfTest.java | 1 +
.../p2p/GridP2PJobClassLoaderSelfTest.java | 6 +-
.../p2p/GridP2PLocalDeploymentSelfTest.java | 9 +-
.../GridP2PMissedResourceCacheSizeSelfTest.java | 4 +-
.../ignite/p2p/GridP2PNodeLeftSelfTest.java | 1 +
.../p2p/GridP2PRecursionTaskSelfTest.java | 9 +-
.../p2p/GridP2PRemoteClassLoadersSelfTest.java | 7 +-
.../org/apache/ignite/p2p/GridP2PTestJob.java | 2 +-
.../org/apache/ignite/p2p/GridP2PTestTask.java | 4 +-
.../ignite/p2p/GridP2PTimeoutSelfTest.java | 4 +-
.../ignite/p2p/GridSwapSpaceCustomKey.java | 1 +
.../ignite/p2p/GridSwapSpaceCustomValue.java | 1 +
...SessionCancelSiblingsFromFutureSelfTest.java | 8 +-
...ridSessionCancelSiblingsFromJobSelfTest.java | 11 +-
...idSessionCancelSiblingsFromTaskSelfTest.java | 9 +-
.../GridSessionCheckpointAbstractSelfTest.java | 12 +-
.../GridSessionCollisionSpiSelfTest.java | 8 +-
...idSessionFutureWaitJobAttributeSelfTest.java | 11 +-
...dSessionFutureWaitTaskAttributeSelfTest.java | 9 +-
.../session/GridSessionJobFailoverSelfTest.java | 15 +-
...GridSessionJobWaitTaskAttributeSelfTest.java | 13 +-
.../ignite/session/GridSessionLoadSelfTest.java | 20 +-
.../GridSessionSetFutureAttributeSelfTest.java | 13 +-
...nSetFutureAttributeWaitListenerSelfTest.java | 13 +-
.../GridSessionSetJobAttribute2SelfTest.java | 8 +-
...GridSessionSetJobAttributeOrderSelfTest.java | 10 +-
.../GridSessionSetJobAttributeSelfTest.java | 17 +-
...sionSetJobAttributeWaitListenerSelfTest.java | 12 +-
.../GridSessionSetTaskAttributeSelfTest.java | 19 +-
...GridSessionTaskWaitJobAttributeSelfTest.java | 17 +-
.../GridSessionWaitAttributeSelfTest.java | 15 +-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../spi/GridSpiStartStopAbstractTest.java | 1 -
.../spi/GridTcpSpiForwardingSelfTest.java | 4 +-
.../cache/GridCacheCheckpointSpiSelfTest.java | 4 +-
.../GridJdbcCheckpointSpiConfigSelfTest.java | 1 +
...GridSharedFsCheckpointSpiConfigSelfTest.java | 1 +
...heckpointSpiMultipleDirectoriesSelfTest.java | 4 +-
.../GridSharedFsCheckpointSpiSelfTest.java | 5 +-
.../collision/GridTestCollisionTaskSession.java | 19 +-
.../GridFifoQueueCollisionSpiSelfTest.java | 2 +-
...bStealingCollisionSpiAttributesSelfTest.java | 4 +-
...alingCollisionSpiCustomTopologySelfTest.java | 2 +-
.../GridJobStealingCollisionSpiSelfTest.java | 4 +-
...obStealingCollisionSpiStartStopSelfTest.java | 3 +-
.../GridAbstractCommunicationSelfTest.java | 2 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 8 +-
.../GridTcpCommunicationSpiAbstractTest.java | 4 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 6 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 6 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 12 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 6 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 8 +-
.../local/GridLocalDeploymentSpiSelfTest.java | 9 +-
.../GridAbstractDiscoverySelfTest.java | 6 +-
.../tcp/GridTcpClientDiscoverySelfTest.java | 4 +-
.../tcp/GridTcpDiscoveryMultiThreadedTest.java | 2 +-
.../discovery/tcp/GridTcpDiscoverySelfTest.java | 10 +-
.../GridTcpDiscoverySnapshotHistoryTest.java | 2 +-
...ridTcpDiscoveryIpFinderAbstractSelfTest.java | 2 +-
...MemoryEventStorageMultiThreadedSelfTest.java | 1 +
.../GridMemoryEventStorageSpiSelfTest.java | 2 +-
.../spi/failover/GridFailoverTestContext.java | 3 +-
...idJobStealingFailoverSpiOneNodeSelfTest.java | 2 +-
.../GridJobStealingFailoverSpiSelfTest.java | 2 +-
...JobStealingFailoverSpiStartStopSelfTest.java | 1 +
.../never/GridNeverFailoverSpiSelfTest.java | 1 +
...iveLoadBalancingSpiMultipleNodeSelfTest.java | 1 +
...dRobinLoadBalancingSpiLocalNodeSelfTest.java | 1 +
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
...dWeightedRandomLoadBalancingSpiSelfTest.java | 1 +
...dRandomLoadBalancingSpiWeightedSelfTest.java | 3 +-
.../GridSwapSpaceSpiAbstractSelfTest.java | 4 +-
.../file/GridFileSwapCompactionSelfTest.java | 4 +-
.../file/GridFileSwapSpaceSpiSelfTest.java | 4 +-
.../inmemory/GridTestSwapSpaceSpi.java | 2 +-
.../startup/GridRandomCommandLineLoader.java | 6 +-
.../ignite/startup/GridVmNodesStarter.java | 4 +-
.../cmdline/GridCommandLineLoaderTest.java | 3 +-
.../startup/servlet/GridServletLoaderTest.java | 1 +
.../GridCacheStoreValueBytesNode.java | 4 +-
.../GridCacheStoreValueBytesTest.java | 2 +-
.../index/GridStreamerIndexSelfTest.java | 17 +-
.../window/GridStreamerWindowSelfTest.java | 28 +-
.../testframework/GridSpiTestContext.java | 37 +-
.../ignite/testframework/GridTestNode.java | 2 +-
.../GridTestSafeThreadFactory.java | 3 +-
.../ignite/testframework/GridTestUtils.java | 14 +-
.../config/GridTestProperties.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 10 +-
.../testframework/junits/GridTestIgnite.java | 4 +-
.../testframework/junits/GridTestResources.java | 6 +-
.../cache/GridAbstractCacheStoreSelfTest.java | 13 +-
.../junits/cache/TestCacheSession.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 8 +-
.../logger/GridLog4jRollingFileAppender.java | 2 +-
.../junits/logger/GridTestLog4jLogger.java | 6 +-
.../junits/spi/GridSpiAbstractTest.java | 6 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 6 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 8 +-
.../testsuites/IgniteComputeGridTestSuite.java | 1 +
.../ignite/testsuites/IgniteFsTestSuite.java | 4 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +-
.../testsuites/IgniteLangSelfTestSuite.java | 5 +-
.../IgniteMarshallerSelfTestSuite.java | 4 +-
.../testsuites/IgniteUtilSelfTestSuite.java | 10 +-
...dConcurrentLinkedDequeMultiThreadedTest.java | 2 +-
.../util/GridTopologyHeapSizeSelfTest.java | 4 +-
.../apache/ignite/util/GridTransientTest.java | 1 +
.../ignite/util/mbeans/GridMBeanSelfTest.java | 1 +
.../tests/p2p/CacheDeploymentTestTask1.java | 13 +-
.../tests/p2p/CacheDeploymentTestTask2.java | 6 +-
.../tests/p2p/CacheDeploymentTestTask3.java | 10 +-
.../ignite/tests/p2p/ExcludeNodeFilter.java | 2 +-
.../p2p/GridP2PContinuousDeploymentTask1.java | 10 +-
.../p2p/GridP2PContinuousDeploymentTask2.java | 5 +-
.../p2p/GridP2PEventFilterExternalPath1.java | 2 +-
.../p2p/GridP2PEventFilterExternalPath2.java | 2 +-
.../tests/p2p/GridTestMessageListener.java | 2 +-
.../ignite/tests/p2p/JobStealingTask.java | 10 +-
.../tests/p2p/P2PTestTaskExternalPath1.java | 10 +-
.../tests/p2p/P2PTestTaskExternalPath2.java | 10 +-
.../ignite/tests/p2p/SingleSplitTestTask.java | 5 +-
.../GridUriDeploymentAbstractTestTask.java | 5 +-
.../uri/tasks/GridUriDeploymentDependency1.java | 1 +
.../uri/tasks/GridUriDeploymentDependency2.java | 1 +
.../tasks/GridUriDeploymentInnerTestTask.java | 5 +-
.../GridUriDeploymentNonePublicTestTask.java | 5 +-
.../uri/tasks/GridUriDeploymentTestTask0.java | 5 +-
.../uri/tasks/GridUriDeploymentTestTask1.java | 5 +-
.../uri/tasks/GridUriDeploymentTestTask2.java | 6 +-
.../uri/tasks/GridUriDeploymentTestTask3.java | 5 +-
.../uri/tasks/GridUriDeploymentTestTask4.java | 5 +-
.../uri/tasks/GridUriDeploymentTestTask5.java | 5 +-
.../uri/tasks/GridUriDeploymentTestTask6.java | 5 +-
.../GridUriDeploymentTestWithNameTask0.java | 5 +-
.../GridUriDeploymentTestWithNameTask3.java | 5 +-
.../GridUriDeploymentTestWithNameTask4.java | 5 +-
.../GridUriDeploymentTestWithNameTask5.java | 5 +-
.../GridUriDeploymentTestWithNameTask6.java | 5 +-
.../GridUriDeploymentTestWithNameTask7.java | 5 +-
modules/geospatial/licenses/apache-2.0.txt | 202 ++++++
.../geospatial/licenses/jts-lgpl-license.txt | 165 +++++
modules/geospatial/pom.xml | 59 ++
modules/geospatial/readme.txt | 33 +
.../query/h2/opt/GridH2SpatialIndex.java | 326 +++++++++
.../query/h2/GridH2IndexingGeoSelfTest.java | 248 +++++++
.../testsuites/GeoSpatialIndexingTestSuite.java | 39 +
.../client/hadoop/GridHadoopClientProtocol.java | 1 +
.../fs/hadoop/v1/GridGgfsHadoopFileSystem.java | 8 +-
.../fs/hadoop/v2/GridGgfsHadoopFileSystem.java | 2 +-
.../fs/hadoop/GridGgfsHadoopEndpoint.java | 2 +-
.../fs/hadoop/GridGgfsHadoopFSProperties.java | 6 +-
.../hadoop/GridGgfsHadoopFileSystemWrapper.java | 40 +-
.../fs/hadoop/GridGgfsHadoopInProc.java | 43 ++
.../internal/fs/hadoop/GridGgfsHadoopIpcIo.java | 4 +-
.../fs/hadoop/GridGgfsHadoopReader.java | 1 +
.../internal/fs/hadoop/GridGgfsHadoopUtils.java | 8 +-
.../fs/hadoop/GridGgfsHadoopWrapper.java | 10 +-
.../processors/hadoop/GridHadoopImpl.java | 2 +-
.../processors/hadoop/GridHadoopUtils.java | 5 +-
.../hadoop/IgniteHadoopProcessor.java | 2 +-
.../counter/GridHadoopFSCounterWriter.java | 1 +
.../hadoop/counter/GridHadoopLongCounter.java | 1 +
.../hadoop/jobtracker/GridHadoopJobTracker.java | 8 +-
.../GridHadoopDefaultMapReducePlanner.java | 16 +-
.../proto/GridHadoopProtocolJobStatusTask.java | 4 +-
.../proto/GridHadoopProtocolNextTaskIdTask.java | 3 +-
.../proto/GridHadoopProtocolTaskAdapter.java | 21 +-
.../hadoop/shuffle/GridHadoopShuffle.java | 4 +-
.../hadoop/shuffle/GridHadoopShuffleJob.java | 10 +-
.../collections/GridHadoopMultimapBase.java | 2 +-
.../GridHadoopEmbeddedTaskExecutor.java | 2 +-
.../taskexecutor/GridHadoopExecutorService.java | 5 +-
.../GridHadoopExternalTaskExecutor.java | 8 +-
.../child/GridHadoopChildProcessRunner.java | 2 +-
.../child/GridHadoopExternalProcessStarter.java | 6 +-
.../GridHadoopExternalCommunication.java | 6 +-
.../GridHadoopMarshallerFilter.java | 2 +-
.../hadoop/v1/GridHadoopV1OutputCollector.java | 3 -
.../processors/hadoop/v1/GridHadoopV1Task.java | 3 +-
.../v2/GridHadoopSerializationWrapper.java | 4 +-
.../hadoop/v2/GridHadoopSplitWrapper.java | 2 +-
.../hadoop/v2/GridHadoopV2CleanupTask.java | 9 +-
.../processors/hadoop/v2/GridHadoopV2Job.java | 2 +-
.../v2/GridHadoopV2JobResourceManager.java | 7 +-
.../hadoop/v2/GridHadoopV2MapTask.java | 15 +-
.../hadoop/v2/GridHadoopV2ReduceTask.java | 8 +-
.../hadoop/v2/GridHadoopV2SetupTask.java | 8 +-
.../hadoop/v2/GridHadoopV2Splitter.java | 3 +-
.../apache/ignite/fs/GridFileSystemLoad.java | 3 +-
...dGgfsHadoop20FileSystemAbstractSelfTest.java | 6 +-
.../fs/GridGgfsHadoopDualAbstractSelfTest.java | 9 +-
...ridGgfsHadoopFileSystemAbstractSelfTest.java | 10 +-
.../GridGgfsHadoopFileSystemClientSelfTest.java | 8 +-
...idGgfsHadoopFileSystemHandshakeSelfTest.java | 2 +-
...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 8 +-
.../GridGgfsHadoopFileSystemLoggerSelfTest.java | 1 -
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 8 +-
...fsHadoopFileSystemSecondaryModeSelfTest.java | 8 +-
.../fs/GridGgfsNearOnlyMultiNodeSelfTest.java | 6 +-
.../ignite/fs/IgniteFsEventsTestSuite.java | 2 +-
.../hadoop/GridHadoopAbstractWordCountTest.java | 2 +-
.../hadoop/GridHadoopClassLoaderTest.java | 6 +-
.../hadoop/GridHadoopCommandLineTest.java | 2 +-
...idHadoopDefaultMapReducePlannerSelfTest.java | 96 +--
.../hadoop/GridHadoopFileSystemsTest.java | 5 +-
.../hadoop/GridHadoopJobTrackerSelfTest.java | 6 +-
.../GridHadoopMapReduceEmbeddedSelfTest.java | 2 +-
.../hadoop/GridHadoopMapReduceTest.java | 9 +-
.../processors/hadoop/GridHadoopSharedMap.java | 4 +-
.../hadoop/GridHadoopTaskExecutionSelfTest.java | 3 +-
.../GridHadoopTestRoundRobinMrPlanner.java | 2 +-
.../examples/GridHadoopWordCount2Mapper.java | 6 +-
.../examples/GridHadoopWordCount2Reducer.java | 7 +-
.../GridHadoopExecutorServiceTest.java | 12 +-
...GridHadoopExternalTaskExecutionSelfTest.java | 4 +-
...GridHadoopExternalCommunicationSelfTest.java | 4 +-
.../ggfs/GridGgfsPerformanceBenchmark.java | 1 +
.../GridHibernateAccessStrategyAdapter.java | 4 +-
.../GridHibernateQueryResultsRegion.java | 2 +-
.../GridHibernateReadWriteAccessStrategy.java | 2 +-
.../hibernate/GridHibernateRegionFactory.java | 2 +-
.../hibernate/CacheHibernateBlobStore.java | 9 +-
...idHibernateL2CacheConfigurationSelfTest.java | 2 -
.../hibernate/GridHibernateL2CacheSelfTest.java | 3 +-
...idHibernateL2CacheTransactionalSelfTest.java | 3 +-
modules/indexing/licenses/jts-lgpl-license.txt | 165 -----
modules/indexing/pom.xml | 6 -
.../processors/query/h2/IgniteH2Indexing.java | 53 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 2 +-
.../query/h2/opt/GridH2IndexBase.java | 4 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 2 +-
.../query/h2/opt/GridH2SpatialIndex.java | 326 ---------
.../query/h2/opt/GridH2TreeIndex.java | 4 +-
.../query/h2/opt/GridLuceneDirectory.java | 2 +-
.../query/h2/opt/GridLuceneIndex.java | 8 +-
.../query/h2/opt/GridLuceneInputStream.java | 2 +-
.../query/h2/opt/GridLuceneOutputStream.java | 5 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 2 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../query/h2/twostep/GridResultPage.java | 2 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 6 +-
.../cache/GridCacheAbstractQuerySelfTest.java | 13 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 10 +-
.../cache/GridCacheQueryLoadSelfTest.java | 7 +-
.../GridCacheQueryMultiThreadedSelfTest.java | 8 +-
...idCacheReduceQueryMultithreadedSelfTest.java | 2 +-
.../processors/cache/GridCacheSwapSelfTest.java | 8 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 5 +-
.../near/GridCacheQueryNodeRestartSelfTest.java | 4 +-
.../GridCacheReplicatedFieldsQuerySelfTest.java | 4 +-
.../GridCacheReplicatedQuerySelfTest.java | 6 +-
.../query/h2/GridH2IndexRebuildTest.java | 6 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 248 -------
.../h2/GridIndexingSpiAbstractSelfTest.java | 4 +-
.../query/h2/sql/GridQueryParsingTest.java | 4 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 40 +-
.../IgniteCacheQuerySelfTestSuite.java | 6 +-
.../IgniteH2IndexingSpiTestSuite.java | 3 -
.../org/jdk8/backport/ThreadLocalRandom8.java | 2 +-
.../apache/ignite/cache/jta/CacheTmLookup.java | 4 +-
.../cache/jta/jndi/CacheJndiTmLookup.java | 4 +-
.../jta/reflect/CacheReflectionTmLookup.java | 8 +-
.../processors/cache/jta/CacheJtaManager.java | 15 +-
.../cache/jta/GridCacheXAResource.java | 6 +-
...CacheJtaConfigurationValidationSelfTest.java | 3 +-
.../processors/cache/GridCacheJtaSelfTest.java | 3 +-
.../GridTmLookupLifecycleAwareSelfTest.java | 2 +-
.../IgniteLog4jDailyRollingFileAppender.java | 2 +-
...IgniteLog4jExternallyRolledFileAppender.java | 2 +-
.../logger/log4j/IgniteLog4jFileAppender.java | 2 +-
.../ignite/logger/log4j/IgniteLog4jLogger.java | 6 +-
.../logger/log4j/IgniteLog4jNodeIdFilePath.java | 2 +-
.../log4j/IgniteLog4jRollingFileAppender.java | 2 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 5 +-
.../logger/log4j/GridLog4jInitializedTest.java | 2 +-
.../logger/log4j/GridLog4jLoggingFileTest.java | 2 +-
.../logger/log4j/GridLog4jLoggingPathTest.java | 1 -
.../logger/log4j/GridLog4jLoggingUrlTest.java | 2 +-
.../http/jetty/GridJettyRestHandler.java | 10 +-
.../http/jetty/GridJettyRestProtocol.java | 8 +-
.../scalar/pimps/ScalarProjectionPimp.scala | 38 +-
.../schedule/IgniteScheduleProcessor.java | 2 +-
.../processors/schedule/ScheduleFutureImpl.java | 99 ++-
.../schedule/GridScheduleSelfTest.java | 50 +-
.../java/org/apache/ignite/IgniteSpring.java | 2 +-
.../org/apache/ignite/IgniteSpringBean.java | 6 +-
.../apache/ignite/cache/spring/SpringCache.java | 11 +-
.../ignite/cache/spring/SpringCacheManager.java | 6 +-
.../cache/spring/SpringDynamicCacheManager.java | 4 +-
.../GridResourceSpringBeanInjector.java | 2 +-
.../spring/IgniteSpringProcessorImpl.java | 2 +-
.../ignite/internal/GridFactorySelfTest.java | 14 +-
.../GridSpringBeanSerializationSelfTest.java | 2 +-
.../resource/GridLoggerInjectionSelfTest.java | 2 +-
.../resource/GridResourceProcessorSelfTest.java | 4 +-
.../resource/GridServiceInjectionSelfTest.java | 8 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 2 +-
.../GridSpringDynamicCacheManagerSelfTest.java | 2 -
.../testsuites/IgniteSpringTestSuite.java | 1 -
.../util/nodestart/GridNodeCallableImpl.java | 9 +-
.../internal/GridNodeStartUtilsSelfTest.java | 2 +-
.../GridProjectionStartStopRestartSelfTest.java | 6 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 2 +-
.../util/antgar/IgniteDeploymentGarAntTask.java | 1 +
.../uri/GridUriDeploymentDiscovery.java | 3 +-
.../uri/GridUriDeploymentFileProcessor.java | 2 +-
.../GridUriDeploymentFileProcessorResult.java | 1 +
.../uri/GridUriDeploymentJarVerifier.java | 1 +
.../uri/GridUriDeploymentSpringDocument.java | 3 +-
.../uri/GridUriDeploymentSpringParser.java | 3 +-
.../uri/GridUriDeploymentUnitDescriptor.java | 2 +-
.../uri/GridUriDeploymentUriParser.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 7 +-
.../uri/scanners/GridUriDeploymentScanner.java | 4 +-
.../file/GridUriDeploymentFileScanner.java | 6 +-
.../ftp/GridUriDeploymentFtpClient.java | 1 +
.../ftp/GridUriDeploymentFtpConfiguration.java | 2 +-
.../scanners/ftp/GridUriDeploymentFtpFile.java | 1 +
.../ftp/GridUriDeploymentFtpScanner.java | 2 +-
.../http/GridUriDeploymentHttpScanner.java | 6 +-
.../GridTaskUriDeploymentDeadlockSelfTest.java | 4 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 4 +-
.../GridUriDeploymentClassLoaderSelfTest.java | 2 +-
...riDeploymentClassloaderRegisterSelfTest.java | 8 +-
.../uri/GridUriDeploymentConfigSelfTest.java | 1 +
.../GridUriDeploymentFileProcessorSelfTest.java | 5 +-
.../uri/GridUriDeploymentMd5CheckSelfTest.java | 7 +-
.../GridUriDeploymentMultiScannersSelfTest.java | 1 +
.../uri/GridUriDeploymentSimpleSelfTest.java | 11 +-
.../file/GridFileDeploymentSelfTest.java | 1 +
.../GridFileDeploymentUndeploySelfTest.java | 3 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 1 +
.../http/GridHttpDeploymentSelfTest.java | 8 +-
.../apache/ignite/tools/GridToolsSelfTest.java | 4 +-
.../visor/commands/ack/VisorAckCommand.scala | 3 +-
.../commands/alert/VisorAlertCommand.scala | 6 +-
.../commands/cache/VisorCacheClearCommand.scala | 2 +-
.../commands/cache/VisorCacheCommand.scala | 4 +-
.../cache/VisorCacheCompactCommand.scala | 2 +-
.../commands/cache/VisorCacheScanCommand.scala | 4 +-
.../commands/cache/VisorCacheSwapCommand.scala | 2 +-
.../config/VisorConfigurationCommand.scala | 2 +-
.../commands/events/VisorEventsCommand.scala | 2 +-
.../visor/commands/gc/VisorGcCommand.scala | 5 +-
.../visor/commands/kill/VisorKillCommand.scala | 4 +-
.../commands/start/VisorStartCommand.scala | 4 +-
.../commands/tasks/VisorTasksCommand.scala | 10 +-
.../commands/top/VisorTopologyCommand.scala | 4 +-
.../scala/org/apache/ignite/visor/visor.scala | 23 +-
.../ignite/cache/websession/GridWebSession.java | 2 +-
.../cache/websession/GridWebSessionFilter.java | 12 +-
.../websession/GridWebSessionListener.java | 3 +-
.../IgniteServletContextListenerStartup.java | 2 +-
.../startup/servlet/IgniteServletStartup.java | 2 +-
.../internal/websession/WebSessionSelfTest.java | 6 +-
.../websession/WebSessionServerStart.java | 4 +-
.../config/benchmark-atomic-win.properties | 9 +-
.../config/benchmark-atomic.properties | 9 +-
.../config/benchmark-query-win.properties | 5 +-
.../yardstick/config/benchmark-query.properties | 5 +-
.../config/benchmark-tx-win.properties | 6 +-
.../yardstick/config/benchmark-tx.properties | 6 +-
modules/yardstick/config/ignite-base-config.xml | 93 ++-
.../cache/IgniteGetOffHeapBenchmark.java | 32 +
.../cache/IgniteGetOffHeapValuesBenchmark.java | 32 +
.../cache/IgnitePutGetOffHeapBenchmark.java | 32 +
.../IgnitePutGetOffHeapValuesBenchmark.java | 32 +
.../cache/IgnitePutGetTxOffHeapBenchmark.java | 32 +
.../IgnitePutGetTxOffHeapValuesBenchmark.java | 32 +
.../cache/IgnitePutOffHeapBenchmark.java | 32 +
.../cache/IgnitePutOffHeapValuesBenchmark.java | 32 +
.../cache/IgnitePutTxOffHeapBenchmark.java | 32 +
.../IgnitePutTxOffHeapValuesBenchmark.java | 32 +
.../IgniteSqlQueryJoinOffHeapBenchmark.java | 32 +
.../cache/IgniteSqlQueryOffHeapBenchmark.java | 32 +
.../IgniteSqlQueryPutOffHeapBenchmark.java | 32 +
.../yardstick/compute/model/NoopTask.java | 13 +-
pom.xml | 25 +-
1714 files changed, 13492 insertions(+), 8895 deletions(-)
----------------------------------------------------------------------
