Merge remote-tracking branch 'origin/master' into ignite-9469 Conflicts: modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73528bb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73528bb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73528bb4 Branch: refs/heads/ignite-21 Commit: 73528bb4ef8c87890c1a4087bb1932814584635e Parents: b9ba2bb 35b7921 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Dec 11 16:51:19 2014 +0300 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Dec 11 16:51:19 2014 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 17 +- .../gridgain/examples/ComputeNodeStartup.java | 4 +- .../compute/ComputeBroadcastExample.java | 10 +- .../compute/ComputeCallableExample.java | 4 +- .../examples/compute/ComputeClosureExample.java | 4 +- .../compute/ComputeContinuousMapperExample.java | 16 +- .../compute/ComputeExecutorServiceExample.java | 2 +- .../ComputeFibonacciContinuationExample.java | 8 +- .../compute/ComputeProjectionExample.java | 6 +- .../examples/compute/ComputeReducerExample.java | 4 +- .../compute/ComputeRunnableExample.java | 4 +- .../compute/ComputeScheduleExample.java | 8 +- .../examples/compute/ComputeTaskMapExample.java | 4 +- .../compute/ComputeTaskSplitExample.java | 4 +- .../failover/ComputeFailoverExample.java | 6 +- .../failover/ComputeFailoverNodeStartup.java | 8 +- .../compute/montecarlo/CreditRiskExample.java | 4 +- .../examples/datagrid/CacheAffinityExample.java | 12 +- .../examples/datagrid/CacheApiExample.java | 10 +- .../datagrid/CacheContinuousQueryExample.java | 4 +- .../datagrid/CacheDataLoaderExample.java | 2 +- .../examples/datagrid/CacheEventsExample.java | 4 +- .../examples/datagrid/CacheNodeStartup.java | 4 +- .../datagrid/CachePopularNumbersExample.java | 10 +- .../examples/datagrid/CachePutGetExample.java | 10 +- .../examples/datagrid/CacheQueryExample.java | 34 +- .../datagrid/CacheTransactionExample.java | 8 +- .../datastructures/CacheAtomicLongExample.java | 4 +- .../CacheAtomicReferenceExample.java | 8 +- .../CacheAtomicSequenceExample.java | 8 +- .../CacheAtomicStampedExample.java | 8 +- .../CacheCountDownLatchExample.java | 4 +- .../datastructures/CacheQueueExample.java | 24 +- .../datastructures/CacheSetExample.java | 20 +- .../hibernate/HibernateL2CacheExample.java | 4 +- .../HibernateL2CacheExampleNodeStartup.java | 8 +- .../starschema/CacheStarSchemaExample.java | 18 +- .../store/CacheNodeWithStoreStartup.java | 8 +- .../datagrid/store/CacheStoreExample.java | 2 +- .../store/CacheStoreLoadDataExample.java | 2 +- .../store/dummy/CacheDummyPersonStore.java | 8 +- .../hibernate/CacheHibernatePersonStore.java | 24 +- .../store/jdbc/CacheJdbcPersonStore.java | 34 +- .../gridgain/examples/events/EventsExample.java | 8 +- .../org/gridgain/examples/ggfs/GgfsExample.java | 30 +- .../examples/ggfs/GgfsMapReduceExample.java | 6 +- .../gridgain/examples/ggfs/GgfsNodeStartup.java | 4 +- .../examples/messaging/MessagingExample.java | 10 +- .../messaging/MessagingPingPongExample.java | 8 +- .../MessagingPingPongListenActorExample.java | 8 +- .../MemcacheRestExampleNodeStartup.java | 24 +- .../misc/deployment/DeploymentExample.java | 8 +- .../misc/lifecycle/LifecycleExample.java | 4 +- .../misc/springbean/SpringBeanExample.java | 2 +- .../streaming/StreamingCheckInExample.java | 18 +- .../streaming/StreamingNodeStartup.java | 4 +- .../StreamingPopularNumbersExample.java | 10 +- .../streaming/StreamingPriceBarsExample.java | 12 +- .../StreamingRunningAverageExample.java | 6 +- .../org/gridgain/examples/ComputeExample.java | 2 +- .../org/gridgain/examples/MessagingExample.java | 10 +- ..._util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 2 +- .../aop/aspectj/GridifyAspectJAspect.java | 4 +- .../aspectj/GridifySetToSetAspectJAspect.java | 2 +- .../aspectj/GridifySetToValueAspectJAspect.java | 2 +- .../aop/spring/GridifySetToSetSpringAspect.java | 2 +- .../spring/GridifySetToValueSpringAspect.java | 2 +- .../gridify/aop/spring/GridifySpringAspect.java | 4 +- .../grid/gridify/GridBasicAopSelfTest.java | 8 +- .../grid/gridify/GridTestGridifyJob.java | 2 +- .../grid/gridify/GridTestGridifyTask.java | 6 +- .../GridSingleSplitTestJobTarget.java | 6 +- .../singlesplit/GridSingleSplitTestTask.java | 8 +- .../singlesplit/GridSingleSplitsLoadTest.java | 2 +- .../loadtests/gridify/GridifyLoadTestTask.java | 8 +- .../test/gridify/GridExternalGridifyTask.java | 4 +- .../spi/checkpoint/s3/GridS3CheckpointSpi.java | 14 +- .../s3/GridS3CheckpointSpiSelfTest.java | 13 +- ...GridClientAbstractMultiThreadedSelfTest.java | 4 +- .../client/GridClientGetAffinityTask.java | 4 +- .../org/gridgain/client/GridClientHttpTask.java | 8 +- .../gridgain/client/GridClientNodeStartup.java | 4 +- .../client/GridClientPortableArgumentTask.java | 4 +- .../client/GridClientPutPortableTask.java | 2 +- .../client/GridClientReconnectionSelfTest.java | 6 +- .../client/GridClientSslNodeStartup.java | 4 +- .../client/GridClientStartNodeTask.java | 10 +- .../gridgain/client/GridClientStopNodeTask.java | 6 +- .../client/GridClientStringLengthTask.java | 8 +- .../org/gridgain/client/GridClientTcpTask.java | 8 +- .../GridClientTestPortableAffinityKeyTask.java | 16 +- .../client/GridClientTestRestServer.java | 6 +- .../org/gridgain/client/GridHashMapStore.java | 10 +- .../org/gridgain/client/GridSleepTestTask.java | 8 +- .../client/GridTaskSingleJobSplitAdapter.java | 16 +- .../GridClientAbstractMultiNodeSelfTest.java | 4 +- .../integration/GridClientAbstractSelfTest.java | 34 +- .../GridClientPreferDirectSelfTest.java | 4 +- .../router/GridClientFailedInitSelfTest.java | 8 +- .../router/GridTcpRouterAbstractSelfTest.java | 6 +- .../router/GridTcpRouterMultiNodeSelfTest.java | 6 +- .../client/router/GridTcpSslRouterSelfTest.java | 3 +- .../kernal/GridTaskEventSubjectIdSelfTest.java | 16 +- .../rest/GridRestBinaryProtocolSelfTest.java | 20 +- .../rest/GridRestMemcacheProtocolSelfTest.java | 5 +- .../processors/rest/GridRestProcessorTest.java | 12 +- .../rest/GridTaskCommandHandlerSelfTest.java | 4 +- .../processors/rest/GridTestBinaryClient.java | 84 +- .../processors/rest/GridTestMemcacheClient.java | 94 +- .../grid/kernal/processors/rest/TestTask1.java | 6 +- .../grid/kernal/processors/rest/TestTask2.java | 6 +- .../jdbc/GridJdbcLocalCachesSelfTest.java | 10 +- .../client/GridClientCacheBenchmark.java | 4 +- .../clients/src/test/resources/spring-cache.xml | 29 +- .../src/main/java/org/apache/ignite/Ignite.java | 4 +- .../apache/ignite/IgniteCheckedException.java | 108 + .../java/org/apache/ignite/IgniteCluster.java | 32 +- .../java/org/apache/ignite/IgniteCompute.java | 72 +- .../org/apache/ignite/IgniteDataLoader.java | 32 +- .../java/org/apache/ignite/IgniteEvents.java | 20 +- .../java/org/apache/ignite/IgniteException.java | 2 +- .../main/java/org/apache/ignite/IgniteFs.java | 80 +- .../java/org/apache/ignite/IgniteManaged.java | 30 +- .../java/org/apache/ignite/IgniteMessaging.java | 20 +- .../java/org/apache/ignite/IgniteScheduler.java | 2 +- .../java/org/apache/ignite/IgniteStreamer.java | 16 +- .../org/apache/ignite/IgniteTransactions.java | 8 +- .../main/java/org/apache/ignite/Ignition.java | 16 +- .../cache/query/QueryContinuousPredicate.java | 6 +- .../org/apache/ignite/cluster/ClusterGroup.java | 4 +- .../cluster/ClusterTopologyException.java | 4 +- .../ComputeExecutionRejectedException.java | 4 +- .../org/apache/ignite/compute/ComputeJob.java | 9 +- .../compute/ComputeJobContinuationAdapter.java | 6 +- .../compute/ComputeJobFailoverException.java | 4 +- .../compute/ComputeJobMasterLeaveAware.java | 6 +- .../apache/ignite/compute/ComputeJobResult.java | 6 +- .../ignite/compute/ComputeJobSibling.java | 5 +- .../ignite/compute/ComputeLoadBalancer.java | 11 +- .../org/apache/ignite/compute/ComputeTask.java | 22 +- .../ignite/compute/ComputeTaskAdapter.java | 13 +- .../compute/ComputeTaskCancelledException.java | 4 +- .../compute/ComputeTaskContinuousMapper.java | 18 +- .../ignite/compute/ComputeTaskFuture.java | 8 +- .../ignite/compute/ComputeTaskSession.java | 42 +- .../ignite/compute/ComputeTaskSplitAdapter.java | 16 +- .../compute/ComputeTaskTimeoutException.java | 4 +- .../compute/ComputeUserUndeclaredException.java | 4 +- .../apache/ignite/compute/gridify/Gridify.java | 2 +- .../compute/gridify/GridifyInterceptor.java | 7 +- .../gridify/GridifyRuntimeException.java | 4 +- .../gridify/aop/GridifyDefaultRangeTask.java | 8 +- .../compute/gridify/aop/GridifyDefaultTask.java | 4 +- .../aop/GridifySetToSetAbstractAspect.java | 24 +- .../aop/GridifySetToValueAbstractAspect.java | 28 +- .../configuration/GridQueryConfiguration.java | 194 ++ .../configuration/IgniteAddressResolver.java | 6 +- .../configuration/IgniteConfiguration.java | 36 +- .../dataload/IgniteDataLoadCacheUpdater.java | 6 +- .../events/IgniteCacheQueryReadEvent.java | 6 +- .../org/apache/ignite/fs/IgniteFsException.java | 4 +- .../apache/ignite/fs/IgniteFsFileSystem.java | 58 +- .../IgniteFsInputStreamJobAdapter.java | 6 +- .../apache/ignite/fs/mapreduce/IgniteFsJob.java | 4 +- .../fs/mapreduce/IgniteFsRecordResolver.java | 4 +- .../ignite/fs/mapreduce/IgniteFsTask.java | 14 +- .../IgniteFsByteDelimiterRecordResolver.java | 2 +- .../IgniteFsFixedLengthRecordResolver.java | 2 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 6 +- .../org/apache/ignite/lang/IgniteFuture.java | 33 +- .../lang/IgniteFutureCancelledException.java | 4 +- .../lang/IgniteFutureTimeoutException.java | 4 +- .../apache/ignite/lifecycle/LifecycleAware.java | 10 +- .../apache/ignite/lifecycle/LifecycleBean.java | 6 +- .../ignite/logger/java/IgniteJavaLogger.java | 2 +- .../java/IgniteJavaLoggerFileHandler.java | 6 +- .../marshaller/IgniteAbstractMarshaller.java | 8 +- .../ignite/marshaller/IgniteMarshaller.java | 18 +- .../marshaller/jdk/IgniteJdkMarshaller.java | 12 +- .../optimized/IgniteOptimizedMarshaller.java | 42 +- .../IgniteOptimizedObjectStreamRegistry.java | 5 +- .../optimized-classnames.previous.properties | 2 +- .../optimized/optimized-classnames.properties | 2 +- .../ignite/messaging/MessagingListenActor.java | 18 +- .../apache/ignite/plugin/PluginProvider.java | 14 +- .../ignite/plugin/security/GridSecurity.java | 6 +- .../GridSecurityCredentialsBasicProvider.java | 4 +- .../GridSecurityCredentialsProvider.java | 6 +- .../plugin/security/GridSecurityException.java | 4 +- .../segmentation/GridSegmentationResolver.java | 6 +- .../ignite/portables/PortableException.java | 4 +- .../ignite/portables/PortableRawReader.java | 13 + .../ignite/portables/PortableRawWriter.java | 13 + .../apache/ignite/portables/PortableReader.java | 15 + .../apache/ignite/portables/PortableWriter.java | 15 + .../product/IgniteProductLicenseException.java | 4 +- .../ignite/product/IgniteProductVersion.java | 4 +- .../ignite/scheduler/SchedulerFuture.java | 25 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 26 +- .../ignite/spi/IgniteSpiCloseableIterator.java | 6 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 58 +- .../apache/ignite/spi/IgniteSpiException.java | 4 +- .../AuthenticationAclProvider.java | 6 +- .../checkpoint/cache/CacheCheckpointSpi.java | 6 +- .../sharedfs/SharedFsCheckpointSpi.java | 8 +- .../sharedfs/SharedFsTimeoutTask.java | 2 +- .../spi/checkpoint/sharedfs/SharedFsUtils.java | 8 +- .../jobstealing/JobStealingDisabled.java | 2 +- .../PriorityQueueCollisionSpi.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 94 +- .../DiscoverySpiNodeAuthenticator.java | 8 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 17 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 40 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 18 +- .../TcpDiscoveryMulticastIpFinder.java | 16 +- .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 2 +- .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 2 +- .../ignite/spi/failover/FailoverContext.java | 6 +- .../spi/failover/always/AlwaysFailoverSpi.java | 2 +- .../jobstealing/JobStealingFailoverSpi.java | 2 +- .../spi/indexing/GridIndexingQueryFilter.java | 27 + .../ignite/spi/indexing/GridIndexingSpi.java | 104 + .../spi/indexing/GridNoopIndexingSpi.java | 58 + .../ignite/spi/indexing/IndexDescriptor.java | 42 - .../apache/ignite/spi/indexing/IndexType.java | 24 - .../ignite/spi/indexing/IndexingEntity.java | 50 - .../spi/indexing/IndexingEntityAdapter.java | 57 - .../spi/indexing/IndexingFieldMetadata.java | 46 - .../spi/indexing/IndexingFieldsResult.java | 35 - .../indexing/IndexingFieldsResultAdapter.java | 49 - .../spi/indexing/IndexingKeyValueRow.java | 42 - .../indexing/IndexingKeyValueRowAdapter.java | 82 - .../ignite/spi/indexing/IndexingMarshaller.java | 38 - .../spi/indexing/IndexingQueryFilter.java | 27 - .../apache/ignite/spi/indexing/IndexingSpi.java | 188 -- .../spi/indexing/IndexingTypeDescriptor.java | 84 - .../ignite/spi/indexing/NoopIndexingSpi.java | 119 - .../spi/loadbalancing/LoadBalancingSpi.java | 12 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 18 +- .../RoundRobinGlobalLoadBalancer.java | 18 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 8 +- .../WeightedRandomLoadBalancingSpi.java | 6 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 18 +- .../apache/ignite/streamer/StreamerContext.java | 26 +- .../apache/ignite/streamer/StreamerStage.java | 6 +- .../apache/ignite/streamer/StreamerWindow.java | 46 +- .../ignite/streamer/index/StreamerIndex.java | 2 +- .../streamer/index/StreamerIndexProvider.java | 10 +- .../index/StreamerIndexProviderAdapter.java | 26 +- .../streamer/index/StreamerIndexUpdater.java | 6 +- .../index/hash/StreamerHashIndexProvider.java | 8 +- .../index/tree/StreamerTreeIndexProvider.java | 16 +- .../window/StreamerBoundedSizeBatchWindow.java | 9 +- .../StreamerBoundedSizeWindowAdapter.java | 6 +- .../window/StreamerBoundedTimeBatchWindow.java | 11 +- .../window/StreamerBoundedTimeWindow.java | 10 +- .../streamer/window/StreamerWindowAdapter.java | 40 +- .../gridgain/client/impl/GridClientImpl.java | 4 +- .../GridClientConnectionManagerAdapter.java | 8 +- .../connection/GridClientNioTcpConnection.java | 3 +- .../GridClientOptimizedMarshaller.java | 9 +- .../client/router/GridRouterFactory.java | 6 +- .../impl/GridRouterCommandLineStartup.java | 8 +- .../client/router/impl/GridTcpRouterImpl.java | 16 +- .../router/impl/GridTcpRouterNioParser.java | 6 +- .../grid/GridAuthenticationException.java | 4 +- .../gridgain/grid/GridBasicWarmupClosure.java | 4 +- .../gridgain/grid/GridDeploymentException.java | 4 +- .../java/org/gridgain/grid/GridException.java | 108 - .../gridgain/grid/GridInterruptedException.java | 6 +- .../org/gridgain/grid/GridRuntimeException.java | 85 - .../java/org/gridgain/grid/cache/GridCache.java | 26 +- .../GridCacheAtomicUpdateTimeoutException.java | 4 +- .../org/gridgain/grid/cache/GridCacheEntry.java | 77 +- .../grid/cache/GridCacheFlagException.java | 4 +- .../cache/GridCachePartialUpdateException.java | 4 +- .../grid/cache/GridCacheProjection.java | 150 +- .../org/gridgain/grid/cache/GridCacheTx.java | 13 +- .../cache/GridCacheTxHeuristicException.java | 4 +- .../cache/GridCacheTxOptimisticException.java | 4 +- .../cache/GridCacheTxRollbackException.java | 4 +- .../grid/cache/GridCacheTxTimeoutException.java | 4 +- .../GridCacheRendezvousAffinityFunction.java | 9 +- .../grid/cache/cloner/GridCacheBasicCloner.java | 4 +- .../grid/cache/cloner/GridCacheCloner.java | 6 +- .../grid/cache/cloner/GridCacheDeepCloner.java | 6 +- .../datastructures/GridCacheAtomicLong.java | 38 +- .../GridCacheAtomicReference.java | 14 +- .../datastructures/GridCacheAtomicSequence.java | 22 +- .../datastructures/GridCacheAtomicStamped.java | 22 +- .../datastructures/GridCacheCountDownLatch.java | 25 +- .../GridCacheDataStructureInvalidException.java | 4 +- ...cheDataStructureInvalidRuntimeException.java | 4 +- .../GridCacheDataStructureRemovedException.java | 4 +- ...cheDataStructureRemovedRuntimeException.java | 4 +- .../datastructures/GridCacheDataStructures.java | 62 +- .../cache/datastructures/GridCacheQueue.java | 60 +- .../grid/cache/datastructures/GridCacheSet.java | 8 +- .../fifo/GridCacheFifoEvictionPolicy.java | 3 +- .../GridCacheGgfsPerBlockLruEvictionPolicy.java | 8 +- .../random/GridCacheRandomEvictionPolicy.java | 3 +- .../cache/query/GridCacheContinuousQuery.java | 14 +- .../grid/cache/query/GridCacheQuery.java | 6 +- .../query/GridCacheQueryConfiguration.java | 117 + .../grid/cache/query/GridCacheQueryFuture.java | 14 +- .../cache/query/GridCacheQuerySqlField.java | 2 +- .../cache/query/GridCacheQuerySqlFunction.java | 4 +- .../grid/cache/query/GridCacheQueryType.java | 5 +- .../store/GridCacheLoadOnlyStoreAdapter.java | 20 +- .../grid/cache/store/GridCacheStore.java | 35 +- .../grid/cache/store/GridCacheStoreAdapter.java | 16 +- .../store/GridCacheStoreBalancingWrapper.java | 22 +- .../store/jdbc/GridCacheJdbcBlobStore.java | 36 +- .../org/gridgain/grid/hadoop/GridHadoop.java | 18 +- .../grid/hadoop/GridHadoopCounterWriter.java | 6 +- .../org/gridgain/grid/hadoop/GridHadoopJob.java | 24 +- .../gridgain/grid/hadoop/GridHadoopJobInfo.java | 4 +- .../grid/hadoop/GridHadoopMapReducePlanner.java | 4 +- .../grid/hadoop/GridHadoopSerialization.java | 14 +- .../gridgain/grid/hadoop/GridHadoopTask.java | 5 +- .../grid/hadoop/GridHadoopTaskContext.java | 26 +- .../grid/hadoop/GridHadoopTaskInput.java | 6 +- .../grid/hadoop/GridHadoopTaskOutput.java | 8 +- .../grid/kernal/ClusterGroupAdapter.java | 2 +- .../org/gridgain/grid/kernal/GridComponent.java | 14 +- .../gridgain/grid/kernal/GridComponentType.java | 44 +- .../grid/kernal/GridEventConsumeHandler.java | 19 +- .../org/gridgain/grid/kernal/GridGainEx.java | 127 +- .../grid/kernal/GridInternalException.java | 4 +- .../grid/kernal/GridJobContextImpl.java | 4 +- .../grid/kernal/GridJobExecuteResponse.java | 16 +- .../gridgain/grid/kernal/GridJobResultImpl.java | 9 +- .../grid/kernal/GridJobSessionImpl.java | 22 +- .../grid/kernal/GridJobSiblingImpl.java | 8 +- .../grid/kernal/GridJobSiblingsResponse.java | 6 +- .../org/gridgain/grid/kernal/GridKernal.java | 134 +- .../gridgain/grid/kernal/GridKernalContext.java | 8 + .../grid/kernal/GridKernalContextImpl.java | 14 +- .../org/gridgain/grid/kernal/GridKillTask.java | 8 +- .../gridgain/grid/kernal/GridLoggerProxy.java | 4 +- .../grid/kernal/GridMessageListenHandler.java | 7 +- .../grid/kernal/GridPluginComponent.java | 8 +- .../grid/kernal/GridTaskFutureImpl.java | 8 +- .../grid/kernal/GridTaskSessionImpl.java | 40 +- .../grid/kernal/GridUpdateNotifier.java | 6 +- .../grid/kernal/IgniteClusterAsyncImpl.java | 18 +- .../gridgain/grid/kernal/IgniteComputeImpl.java | 36 +- .../gridgain/grid/kernal/IgniteEventsImpl.java | 10 +- .../gridgain/grid/kernal/IgniteManagedImpl.java | 16 +- .../grid/kernal/IgniteMessagingImpl.java | 10 +- .../kernal/executor/GridExecutorService.java | 30 +- .../ggfs/common/GridGgfsControlResponse.java | 20 +- .../kernal/ggfs/common/GridGgfsMarshaller.java | 14 +- .../grid/kernal/managers/GridManager.java | 7 +- .../kernal/managers/GridManagerAdapter.java | 76 +- .../kernal/managers/GridNoopManagerAdapter.java | 10 +- .../checkpoint/GridCheckpointManager.java | 20 +- .../collision/GridCollisionManager.java | 8 +- .../managers/communication/GridIoManager.java | 91 +- .../managers/deployment/GridDeployment.java | 26 +- .../deployment/GridDeploymentClassLoader.java | 8 +- .../deployment/GridDeploymentCommunication.java | 14 +- .../deployment/GridDeploymentLocalStore.java | 11 +- .../deployment/GridDeploymentManager.java | 20 +- .../GridDeploymentPerLoaderStore.java | 10 +- .../GridDeploymentPerVersionStore.java | 8 +- .../deployment/GridDeploymentStore.java | 14 +- .../deployment/GridDeploymentStoreAdapter.java | 4 +- .../discovery/GridDiscoveryManager.java | 43 +- .../eventstorage/GridEventStorageManager.java | 41 +- .../failover/GridFailoverContextImpl.java | 9 +- .../managers/failover/GridFailoverManager.java | 9 +- .../managers/indexing/GridIndexingManager.java | 1790 +------------ .../loadbalancer/GridLoadBalancerManager.java | 26 +- .../securesession/GridSecureSessionManager.java | 10 +- .../os/GridOsSecureSessionManager.java | 6 +- .../managers/security/GridSecurityImpl.java | 8 +- .../managers/security/GridSecurityManager.java | 20 +- .../security/os/GridOsSecurityManager.java | 8 +- .../swapspace/GridSwapSpaceManager.java | 88 +- .../grid/kernal/processors/GridProcessor.java | 6 +- .../kernal/processors/GridProcessorAdapter.java | 14 +- .../affinity/GridAffinityAssignmentCache.java | 4 +- .../affinity/GridAffinityProcessor.java | 74 +- .../processors/affinity/GridAffinityUtils.java | 8 +- .../processors/cache/GridCacheAdapter.java | 354 +-- .../cache/GridCacheAffinityManager.java | 6 +- .../cache/GridCacheClearAllRunnable.java | 6 +- .../cache/GridCacheConcurrentMap.java | 12 +- .../processors/cache/GridCacheContext.java | 24 +- .../GridCacheDefaultAffinityKeyMapper.java | 4 +- .../cache/GridCacheDeploymentManager.java | 30 +- .../processors/cache/GridCacheEntryEx.java | 101 +- .../processors/cache/GridCacheEntryImpl.java | 63 +- .../processors/cache/GridCacheEntryInfo.java | 16 +- .../GridCacheEntryInfoCollectSwapListener.java | 2 +- .../processors/cache/GridCacheEntrySet.java | 5 +- .../cache/GridCacheEvictionEntry.java | 50 +- .../cache/GridCacheEvictionManager.java | 49 +- .../cache/GridCacheEvictionRequest.java | 10 +- .../cache/GridCacheEvictionResponse.java | 8 +- .../cache/GridCacheFilterEvaluationEntry.java | 41 +- .../processors/cache/GridCacheGateway.java | 8 +- .../cache/GridCacheIndexUpdateException.java | 4 +- .../processors/cache/GridCacheIoManager.java | 48 +- .../processors/cache/GridCacheIterator.java | 6 +- .../processors/cache/GridCacheKeySet.java | 5 +- .../processors/cache/GridCacheMBeanAdapter.java | 4 +- .../processors/cache/GridCacheManager.java | 10 +- .../cache/GridCacheManagerAdapter.java | 12 +- .../processors/cache/GridCacheMapAdapter.java | 33 +- .../processors/cache/GridCacheMapEntry.java | 168 +- .../processors/cache/GridCacheMessage.java | 78 +- .../processors/cache/GridCacheMvccManager.java | 4 +- .../GridCachePartitionExchangeManager.java | 21 +- .../processors/cache/GridCachePreloader.java | 10 +- .../cache/GridCachePreloaderAdapter.java | 4 +- .../processors/cache/GridCacheProcessor.java | 68 +- .../processors/cache/GridCacheProjectionEx.java | 54 +- .../cache/GridCacheProjectionImpl.java | 116 +- .../processors/cache/GridCacheProxyImpl.java | 116 +- .../cache/GridCacheSharedContext.java | 12 +- .../cache/GridCacheSharedManager.java | 10 +- .../cache/GridCacheSharedManagerAdapter.java | 12 +- .../processors/cache/GridCacheStoreManager.java | 54 +- .../processors/cache/GridCacheSwapManager.java | 180 +- .../processors/cache/GridCacheTtlManager.java | 5 +- .../processors/cache/GridCacheTxAdapter.java | 18 +- .../processors/cache/GridCacheTxEntry.java | 20 +- .../kernal/processors/cache/GridCacheTxEx.java | 6 +- .../processors/cache/GridCacheTxHandler.java | 44 +- .../cache/GridCacheTxLocalAdapter.java | 146 +- .../processors/cache/GridCacheTxLocalEx.java | 14 +- .../processors/cache/GridCacheTxManager.java | 32 +- .../processors/cache/GridCacheTxProxyImpl.java | 9 +- .../kernal/processors/cache/GridCacheUtils.java | 42 +- .../cache/GridCacheValueCollection.java | 8 +- .../cache/GridCacheVersionManager.java | 6 +- .../cache/GridCacheWriteBehindStore.java | 36 +- .../GridAtomicCacheQueueImpl.java | 24 +- .../GridCacheAnnotationHelper.java | 18 +- .../datastructures/GridCacheAtomicLongImpl.java | 45 +- .../GridCacheAtomicReferenceImpl.java | 18 +- .../GridCacheAtomicSequenceImpl.java | 24 +- .../GridCacheAtomicStampedImpl.java | 26 +- .../GridCacheCountDownLatchImpl.java | 20 +- .../GridCacheDataStructuresImpl.java | 32 +- .../GridCacheDataStructuresManager.java | 160 +- .../GridCacheDataStructuresProxy.java | 32 +- .../datastructures/GridCacheQueueAdapter.java | 62 +- .../datastructures/GridCacheQueueProxy.java | 114 +- .../cache/datastructures/GridCacheSetImpl.java | 42 +- .../cache/datastructures/GridCacheSetProxy.java | 57 +- .../GridTransactionalCacheQueueImpl.java | 24 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 4 +- ...dCachePessimisticCheckCommittedTxFuture.java | 4 +- ...achePessimisticCheckCommittedTxResponse.java | 6 +- .../distributed/GridCacheTxFinishSync.java | 4 +- .../distributed/GridDistributedBaseMessage.java | 8 +- .../distributed/GridDistributedLockRequest.java | 12 +- .../GridDistributedLockResponse.java | 12 +- .../GridDistributedTxFinishRequest.java | 8 +- .../GridDistributedTxPrepareRequest.java | 8 +- .../GridDistributedTxPrepareResponse.java | 8 +- .../GridDistributedTxRemoteAdapter.java | 34 +- .../GridDistributedUnlockRequest.java | 10 +- .../GridPartitionedCacheEntryImpl.java | 27 +- .../dht/GridClientPartitionTopology.java | 2 +- .../dht/GridDhtAffinityAssignmentResponse.java | 6 +- .../dht/GridDhtAssignmentFetchFuture.java | 2 +- .../cache/distributed/dht/GridDhtCache.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 38 +- .../distributed/dht/GridDhtCacheEntry.java | 12 +- .../distributed/dht/GridDhtCacheEntryImpl.java | 18 +- .../distributed/dht/GridDhtLocalPartition.java | 8 +- .../distributed/dht/GridDhtLockFuture.java | 12 +- .../distributed/dht/GridDhtLockRequest.java | 18 +- .../distributed/dht/GridDhtLockResponse.java | 10 +- .../dht/GridDhtPartitionTopology.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 8 +- .../distributed/dht/GridDhtTopologyFuture.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 46 +- .../distributed/dht/GridDhtTxFinishFuture.java | 8 +- .../distributed/dht/GridDhtTxFinishRequest.java | 8 +- .../cache/distributed/dht/GridDhtTxLocal.java | 42 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 28 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 16 +- .../dht/GridDhtTxPrepareRequest.java | 10 +- .../dht/GridDhtTxPrepareResponse.java | 8 +- .../cache/distributed/dht/GridDhtTxRemote.java | 6 +- .../distributed/dht/GridDhtUnlockRequest.java | 8 +- .../dht/GridPartitionedGetFuture.java | 10 +- .../dht/atomic/GridDhtAtomicCache.java | 68 +- .../dht/atomic/GridDhtAtomicCacheEntry.java | 4 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 8 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 14 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 8 +- .../atomic/GridNearAtomicUpdateResponse.java | 14 +- .../dht/colocated/GridDhtColocatedCache.java | 16 +- .../colocated/GridDhtColocatedLockFuture.java | 40 +- .../colocated/GridDhtDetachedCacheEntry.java | 12 +- .../dht/preloader/GridDhtForceKeysFuture.java | 4 +- .../dht/preloader/GridDhtForceKeysRequest.java | 6 +- .../dht/preloader/GridDhtForceKeysResponse.java | 8 +- .../GridDhtPartitionDemandMessage.java | 8 +- .../preloader/GridDhtPartitionDemandPool.java | 14 +- .../GridDhtPartitionSupplyMessage.java | 16 +- .../preloader/GridDhtPartitionSupplyPool.java | 6 +- .../GridDhtPartitionsExchangeFuture.java | 26 +- .../preloader/GridDhtPartitionsFullMessage.java | 8 +- .../GridDhtPartitionsSingleMessage.java | 8 +- .../dht/preloader/GridDhtPreloader.java | 10 +- .../distributed/near/GridNearAtomicCache.java | 66 +- .../distributed/near/GridNearCacheAdapter.java | 32 +- .../distributed/near/GridNearCacheEntry.java | 18 +- .../distributed/near/GridNearGetFuture.java | 16 +- .../distributed/near/GridNearGetRequest.java | 12 +- .../distributed/near/GridNearGetResponse.java | 10 +- .../distributed/near/GridNearLockFuture.java | 28 +- .../distributed/near/GridNearLockRequest.java | 16 +- .../distributed/near/GridNearLockResponse.java | 8 +- .../near/GridNearTransactionalCache.java | 20 +- .../near/GridNearTxFinishFuture.java | 8 +- .../near/GridNearTxFinishResponse.java | 6 +- .../cache/distributed/near/GridNearTxLocal.java | 58 +- .../near/GridNearTxPrepareFuture.java | 24 +- .../near/GridNearTxPrepareResponse.java | 10 +- .../distributed/near/GridNearTxRemote.java | 20 +- .../processors/cache/dr/GridCacheDrManager.java | 20 +- .../cache/dr/os/GridOsCacheDrManager.java | 12 +- .../cache/jta/GridCacheJtaManagerAdapter.java | 10 +- .../cache/jta/GridCacheNoopJtaManager.java | 6 +- .../processors/cache/local/GridLocalCache.java | 10 +- .../cache/local/GridLocalLockFuture.java | 6 +- .../processors/cache/local/GridLocalTx.java | 22 +- .../cache/local/GridLocalTxFuture.java | 12 +- .../local/atomic/GridLocalAtomicCache.java | 72 +- .../GridCacheDistributedFieldsQueryFuture.java | 8 +- .../query/GridCacheDistributedQueryFuture.java | 5 +- .../query/GridCacheDistributedQueryManager.java | 35 +- .../query/GridCacheFieldsQueryErrorFuture.java | 6 +- .../query/GridCacheLocalFieldsQueryFuture.java | 8 +- .../cache/query/GridCacheLocalQueryFuture.java | 8 +- .../cache/query/GridCacheLocalQueryManager.java | 18 +- .../cache/query/GridCacheQueriesEx.java | 13 +- .../cache/query/GridCacheQueriesImpl.java | 25 +- .../cache/query/GridCacheQueriesProxy.java | 16 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../cache/query/GridCacheQueryErrorFuture.java | 6 +- .../query/GridCacheQueryFutureAdapter.java | 46 +- .../cache/query/GridCacheQueryManager.java | 514 ++-- .../query/GridCacheQueryMetadataAware.java | 4 +- .../cache/query/GridCacheQueryRequest.java | 14 +- .../cache/query/GridCacheQueryResponse.java | 143 +- .../cache/query/GridCacheQueryType.java | 5 + .../cache/query/GridCacheSqlMetadata.java | 3 +- .../GridCacheContinuousQueryAdapter.java | 10 +- .../GridCacheContinuousQueryEntry.java | 49 +- .../GridCacheContinuousQueryHandler.java | 19 +- .../GridCacheContinuousQueryManager.java | 12 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 6 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 20 +- .../jdbc/GridCacheQueryJdbcValidationTask.java | 4 +- .../transactions/IgniteTransactionsImpl.java | 4 +- .../processors/clock/GridClockMessage.java | 8 +- .../processors/clock/GridClockServer.java | 16 +- .../clock/GridClockSyncProcessor.java | 17 +- .../closure/GridClosureProcessor.java | 100 +- .../continuous/GridContinuousHandler.java | 14 +- .../continuous/GridContinuousProcessor.java | 75 +- .../dataload/GridDataLoadCacheUpdaters.java | 14 +- .../dataload/GridDataLoaderFuture.java | 2 +- .../dataload/GridDataLoaderProcessor.java | 14 +- .../dataload/IgniteDataLoaderImpl.java | 56 +- .../dr/GridDrDataLoadCacheUpdater.java | 2 +- .../processors/dr/GridRawVersionedEntry.java | 10 +- .../processors/dr/GridVersionedEntry.java | 10 +- .../email/GridEmailProcessorAdapter.java | 9 +- .../processors/ggfs/GridGgfsAckMessage.java | 12 +- .../processors/ggfs/GridGgfsAsyncImpl.java | 66 +- .../ggfs/GridGgfsBlockLocationImpl.java | 6 +- .../ggfs/GridGgfsCommunicationMessage.java | 10 +- .../kernal/processors/ggfs/GridGgfsContext.java | 14 +- .../processors/ggfs/GridGgfsDataManager.java | 114 +- .../processors/ggfs/GridGgfsDeleteMessage.java | 12 +- .../processors/ggfs/GridGgfsDeleteWorker.java | 14 +- .../grid/kernal/processors/ggfs/GridGgfsEx.java | 18 +- .../kernal/processors/ggfs/GridGgfsFileMap.java | 10 +- .../ggfs/GridGgfsFileWorkerBatch.java | 19 +- .../processors/ggfs/GridGgfsFileWorkerTask.java | 6 +- .../ggfs/GridGgfsFragmentizerManager.java | 35 +- .../kernal/processors/ggfs/GridGgfsHelper.java | 6 +- .../processors/ggfs/GridGgfsHelperImpl.java | 6 +- .../kernal/processors/ggfs/GridGgfsImpl.java | 162 +- .../ggfs/GridGgfsInputStreamImpl.java | 14 +- .../ggfs/GridGgfsInvalidRangeException.java | 4 +- .../processors/ggfs/GridGgfsIpcHandler.java | 28 +- .../kernal/processors/ggfs/GridGgfsJobImpl.java | 4 +- .../kernal/processors/ggfs/GridGgfsManager.java | 12 +- .../processors/ggfs/GridGgfsMetaManager.java | 254 +- .../processors/ggfs/GridGgfsProcessor.java | 42 +- .../kernal/processors/ggfs/GridGgfsServer.java | 28 +- .../processors/ggfs/GridGgfsServerHandler.java | 6 +- .../processors/ggfs/GridGgfsServerManager.java | 14 +- .../processors/ggfs/GridNoopGgfsHelper.java | 4 +- .../ggfs/IgniteFsOutputStreamAdapter.java | 14 +- .../ggfs/IgniteFsOutputStreamImpl.java | 24 +- .../hadoop/GridHadoopNoopProcessor.java | 10 +- .../hadoop/GridHadoopProcessorAdapter.java | 18 +- .../processors/interop/GridInteropAware.java | 10 +- .../interop/GridInteropProcessor.java | 16 +- .../processors/interop/GridInteropTarget.java | 30 +- .../interop/os/GridOsInteropProcessor.java | 9 +- .../kernal/processors/job/GridJobProcessor.java | 45 +- .../kernal/processors/job/GridJobWorker.java | 22 +- .../jobmetrics/GridJobMetricsProcessor.java | 8 +- .../offheap/GridOffHeapProcessor.java | 42 +- .../processors/port/GridPortProcessor.java | 5 +- .../query/GridQueryFieldMetadata.java | 46 + .../processors/query/GridQueryFieldsResult.java | 34 + .../query/GridQueryFieldsResultAdapter.java | 49 + .../query/GridQueryIndexDescriptor.java | 42 + .../processors/query/GridQueryIndexType.java | 24 + .../processors/query/GridQueryIndexing.java | 162 ++ .../processors/query/GridQueryProcessor.java | 1673 ++++++++++++ .../query/GridQueryTypeDescriptor.java | 78 + .../resource/GridResourceBasicInjector.java | 6 +- .../resource/GridResourceCustomInjector.java | 32 +- .../resource/GridResourceInjector.java | 10 +- .../processors/resource/GridResourceIoc.java | 12 +- .../GridResourceJobContextInjector.java | 6 +- .../resource/GridResourceLoggerInjector.java | 4 +- .../resource/GridResourceProcessor.java | 72 +- .../resource/GridResourceServiceInjector.java | 6 +- .../processors/resource/GridResourceUtils.java | 18 +- .../resource/GridSpringResourceContext.java | 8 +- .../processors/rest/GridRestProcessor.java | 58 +- .../processors/rest/GridRestProtocol.java | 6 +- .../rest/GridRestProtocolHandler.java | 6 +- .../handlers/cache/GridCacheCommandHandler.java | 70 +- .../cache/GridCacheQueryCommandHandler.java | 34 +- .../handlers/log/GridLogCommandHandler.java | 20 +- .../metadata/GridPortableMetadataHandler.java | 3 +- .../handlers/task/GridTaskCommandHandler.java | 38 +- .../top/GridTopologyCommandHandler.java | 4 +- .../rest/protocols/GridRestProtocolAdapter.java | 8 +- .../tcp/GridMemcachedMessageWrapper.java | 14 +- .../tcp/GridTcpMemcachedNioListener.java | 4 +- .../protocols/tcp/GridTcpRestDirectParser.java | 18 +- .../protocols/tcp/GridTcpRestNioListener.java | 2 +- .../rest/protocols/tcp/GridTcpRestParser.java | 34 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 8 +- .../schedule/GridNoopScheduleProcessor.java | 6 +- .../GridServiceMethodNotFoundException.java | 4 +- .../service/GridServiceNotFoundException.java | 4 +- .../service/GridServiceProcessor.java | 57 +- .../processors/service/GridServiceProxy.java | 6 +- .../session/GridTaskSessionProcessor.java | 6 +- .../processors/spring/GridSpringProcessor.java | 8 +- .../streamer/GridStreamProcessor.java | 18 +- .../streamer/GridStreamerContextDelegate.java | 14 +- .../streamer/GridStreamerContextImpl.java | 14 +- .../GridStreamerRouteFailedException.java | 4 +- .../GridStreamerStageExecutionFuture.java | 4 +- .../processors/streamer/IgniteStreamerEx.java | 4 +- .../processors/streamer/IgniteStreamerImpl.java | 82 +- .../streamer/StreamerStageWrapper.java | 4 +- .../task/GridStreamerBroadcastTask.java | 8 +- .../streamer/task/GridStreamerQueryTask.java | 8 +- .../streamer/task/GridStreamerReduceTask.java | 8 +- .../processors/task/GridTaskProcessor.java | 51 +- .../kernal/processors/task/GridTaskWorker.java | 70 +- .../timeout/GridTimeoutProcessor.java | 5 +- .../gridgain/grid/kernal/visor/VisorJob.java | 4 +- .../grid/kernal/visor/VisorMultiNodeTask.java | 23 +- .../grid/kernal/visor/VisorOneNodeTask.java | 4 +- .../grid/kernal/visor/cache/VisorCache.java | 6 +- .../kernal/visor/cache/VisorCacheClearTask.java | 4 +- .../visor/cache/VisorCacheCompactTask.java | 4 +- .../kernal/visor/cache/VisorCacheLoadTask.java | 4 +- .../visor/cache/VisorCacheMetadataTask.java | 6 +- .../cache/VisorCacheMetricsCollectorTask.java | 6 +- .../visor/cache/VisorCachePreloadTask.java | 4 +- .../visor/cache/VisorCacheResetMetricsTask.java | 4 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 4 +- .../compute/VisorComputeCancelSessionsTask.java | 4 +- .../compute/VisorComputeResetMetricsTask.java | 4 +- .../VisorComputeToggleMonitoringTask.java | 8 +- .../kernal/visor/debug/VisorThreadDumpTask.java | 4 +- .../kernal/visor/file/VisorFileBlockTask.java | 4 +- .../visor/file/VisorLatestTextFilesTask.java | 4 +- .../grid/kernal/visor/ggfs/VisorGgfs.java | 4 +- .../kernal/visor/ggfs/VisorGgfsFormatTask.java | 6 +- .../visor/ggfs/VisorGgfsProfilerClearTask.java | 4 +- .../visor/ggfs/VisorGgfsProfilerTask.java | 6 +- .../visor/ggfs/VisorGgfsResetMetricsTask.java | 6 +- .../visor/ggfs/VisorGgfsSamplingStateTask.java | 6 +- .../kernal/visor/log/VisorLogSearchTask.java | 8 +- .../grid/kernal/visor/misc/VisorAckTask.java | 6 +- .../visor/misc/VisorLatestVersionTask.java | 4 +- .../grid/kernal/visor/misc/VisorNopTask.java | 10 +- .../visor/misc/VisorResolveHostNameTask.java | 6 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 +- .../visor/node/VisorNodeDataCollectorTask.java | 12 +- .../node/VisorNodeEventsCollectorTask.java | 6 +- .../grid/kernal/visor/node/VisorNodeGcTask.java | 6 +- .../kernal/visor/node/VisorNodePingTask.java | 6 +- .../kernal/visor/node/VisorNodeRestartTask.java | 4 +- .../kernal/visor/node/VisorNodeStopTask.java | 4 +- .../visor/node/VisorSpisConfiguration.java | 2 +- .../VisorPortableMetadataCollectorTask.java | 2 +- .../visor/query/VisorQueryCleanupTask.java | 94 + .../visor/query/VisorQueryNextPageTask.java | 8 +- .../grid/kernal/visor/query/VisorQueryTask.java | 26 +- .../kernal/visor/query/VisorQueryUtils.java | 6 +- .../streamer/VisorStreamerMetricsResetTask.java | 4 +- .../visor/streamer/VisorStreamerResetTask.java | 4 +- .../grid/kernal/visor/util/VisorTaskUtils.java | 39 +- .../grid/util/GridAtomicInitializer.java | 7 +- .../gridgain/grid/util/GridCircularBuffer.java | 14 +- .../grid/util/GridCloseableIteratorAdapter.java | 26 +- .../util/GridCloseableIteratorAdapterEx.java | 32 +- .../grid/util/GridEmptyCloseableIterator.java | 4 +- .../gridgain/grid/util/GridReflectionCache.java | 14 +- .../util/GridSpiCloseableIteratorWrapper.java | 8 +- .../java/org/gridgain/grid/util/GridUtils.java | 220 +- .../gridgain/grid/util/GridWeakIterator.java | 6 +- .../grid/util/future/GridCompoundFuture.java | 10 +- .../grid/util/future/GridEmbeddedFuture.java | 15 +- .../grid/util/future/GridFinishedFuture.java | 6 +- .../grid/util/future/GridFinishedFutureEx.java | 8 +- .../grid/util/future/GridFutureAdapter.java | 12 +- .../grid/util/future/GridFutureAdapterEx.java | 15 +- .../util/gridify/GridifyArgumentBuilder.java | 14 +- .../grid/util/gridify/GridifyJobAdapter.java | 18 +- .../gridgain/grid/util/ipc/GridIpcEndpoint.java | 10 +- .../util/ipc/GridIpcEndpointBindException.java | 4 +- .../grid/util/ipc/GridIpcEndpointFactory.java | 14 +- .../grid/util/ipc/GridIpcServerEndpoint.java | 10 +- .../ipc/GridIpcServerEndpointDeserializer.java | 12 +- .../grid/util/ipc/GridIpcToNioAdapter.java | 24 +- .../ipc/loopback/GridIpcClientTcpEndpoint.java | 18 +- .../ipc/loopback/GridIpcServerTcpEndpoint.java | 16 +- .../GridIpcOutOfSystemResourcesException.java | 4 +- .../GridIpcSharedMemoryClientEndpoint.java | 14 +- .../shmem/GridIpcSharedMemoryInputStream.java | 8 +- .../shmem/GridIpcSharedMemoryNativeLoader.java | 14 +- ...cSharedMemoryOperationTimedoutException.java | 4 +- .../shmem/GridIpcSharedMemoryOutputStream.java | 4 +- .../GridIpcSharedMemoryServerEndpoint.java | 18 +- .../ipc/shmem/GridIpcSharedMemorySpace.java | 38 +- .../ipc/shmem/GridIpcSharedMemoryUtils.java | 30 +- .../grid/util/lang/GridAbsClosureX.java | 12 +- .../grid/util/lang/GridAbsPredicateX.java | 12 +- .../grid/util/lang/GridCloseableIterator.java | 6 +- .../gridgain/grid/util/lang/GridClosure3X.java | 12 +- .../grid/util/lang/GridClosureException.java | 6 +- .../grid/util/lang/GridComputeJobWrapper.java | 3 +- .../org/gridgain/grid/util/lang/GridFunc.java | 49 +- .../grid/util/lang/GridInClosure3X.java | 12 +- .../grid/util/lang/GridIterableAdapter.java | 9 +- .../gridgain/grid/util/lang/GridIterator.java | 14 +- .../grid/util/lang/GridIteratorAdapter.java | 14 +- .../grid/util/lang/GridPlainAbsClosure.java | 6 +- .../grid/util/lang/GridPlainClosure.java | 6 +- .../grid/util/lang/GridPlainClosure2.java | 6 +- .../grid/util/lang/GridPlainFuture.java | 10 +- .../grid/util/lang/GridPlainFutureAdapter.java | 22 +- .../grid/util/lang/GridPlainInClosure.java | 6 +- .../grid/util/lang/GridPlainOutClosure.java | 6 +- .../grid/util/lang/GridPredicate3X.java | 12 +- .../grid/util/lang/IgniteClosure2X.java | 12 +- .../gridgain/grid/util/lang/IgniteClosureX.java | 12 +- .../grid/util/lang/IgniteInClosure2X.java | 12 +- .../grid/util/lang/IgniteInClosureX.java | 12 +- .../grid/util/lang/IgniteOutClosureX.java | 12 +- .../grid/util/lang/IgnitePredicate2X.java | 12 +- .../grid/util/lang/IgnitePredicateX.java | 12 +- .../grid/util/lang/IgniteReducer2X.java | 12 +- .../grid/util/lang/IgniteReducer3X.java | 12 +- .../gridgain/grid/util/lang/IgniteReducerX.java | 12 +- .../grid/util/nio/GridBufferedParser.java | 6 +- .../grid/util/nio/GridCommunicationClient.java | 20 +- .../nio/GridConnectionBytesVerifyFilter.java | 16 +- .../grid/util/nio/GridDirectParser.java | 6 +- .../grid/util/nio/GridNioAsyncNotifyFilter.java | 26 +- .../grid/util/nio/GridNioCodecFilter.java | 16 +- .../grid/util/nio/GridNioEmbeddedFuture.java | 4 +- .../grid/util/nio/GridNioException.java | 4 +- .../gridgain/grid/util/nio/GridNioFilter.java | 82 +- .../grid/util/nio/GridNioFilterAdapter.java | 26 +- .../grid/util/nio/GridNioFilterChain.java | 50 +- .../grid/util/nio/GridNioFinishedFuture.java | 10 +- .../gridgain/grid/util/nio/GridNioFuture.java | 33 +- .../grid/util/nio/GridNioFutureImpl.java | 15 +- .../gridgain/grid/util/nio/GridNioParser.java | 10 +- .../gridgain/grid/util/nio/GridNioServer.java | 74 +- .../grid/util/nio/GridNioServerBuffer.java | 8 +- .../grid/util/nio/GridNioSessionImpl.java | 10 +- .../util/nio/GridShmemCommunicationClient.java | 20 +- .../util/nio/GridTcpCommunicationClient.java | 30 +- .../util/nio/GridTcpNioCommunicationClient.java | 22 +- .../grid/util/nio/ssl/GridNioSslFilter.java | 22 +- .../grid/util/nio/ssl/GridNioSslHandler.java | 14 +- .../grid/util/nodestart/GridNodeStartUtils.java | 52 +- .../grid/util/offheap/unsafe/GridUnsafeMap.java | 18 +- .../unsafe/GridUnsafePartitionedMap.java | 17 +- .../grid/util/tostring/GridToStringBuilder.java | 4 +- .../java/org/gridgain/grid/util/typedef/X.java | 16 +- .../grid/util/worker/GridWorkerFuture.java | 4 +- .../grid/util/worker/GridWorkerPool.java | 6 +- .../org/gridgain/jdbc/util/GridJdbcUtils.java | 5 +- .../GridOptimizedMarshallerSelfTest.java | 14 +- .../optimized/GridOptimizedMarshallerTest.java | 52 +- .../GridOptimizedObjectStreamSelfTest.java | 6 +- ...heckpointSpiMultipleDirectoriesSelfTest.java | 5 +- .../collision/GridTestCollisionTaskSession.java | 14 +- .../GridAbstractCommunicationSelfTest.java | 4 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 20 +- .../tcp/GridTcpCommunicationSpiLanTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 11 +- .../local/GridLocalDeploymentSpiSelfTest.java | 10 +- ...GridTcpDiscoveryMarshallerCheckSelfTest.java | 4 +- .../discovery/tcp/GridTcpDiscoverySelfTest.java | 10 +- .../spi/failover/GridFailoverTestContext.java | 4 +- ...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 3 +- .../roundrobin/GridRoundRobinTestUtils.java | 9 +- .../index/GridStreamerIndexSelfTest.java | 31 +- .../window/GridStreamerWindowSelfTest.java | 33 +- .../grid/GridExceptionHelpLinksSelfTest.java | 37 +- .../grid/GridSuppressedExceptionSelfTest.java | 39 +- .../java/org/gridgain/grid/GridTestJob.java | 2 +- .../org/gridgain/grid/GridTestJobResult.java | 7 +- .../java/org/gridgain/grid/GridTestTask.java | 2 +- .../org/gridgain/grid/GridTestTaskSession.java | 11 +- .../store/GridCacheBalancingStoreSelfTest.java | 18 +- .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 4 +- .../cache/store/GridGeneratingTestStore.java | 20 +- .../ggfs/GridGgfsEventsAbstractSelfTest.java | 4 +- .../grid/ggfs/GridGgfsPathSelfTest.java | 6 +- .../grid/kernal/GridAffinityMappedTest.java | 4 +- .../grid/kernal/GridAffinitySelfTest.java | 4 +- .../GridAlwaysFailoverSpiFailSelfTest.java | 18 +- .../kernal/GridCacheProjectionRemoveTest.java | 6 +- .../kernal/GridCancelOnGridStopSelfTest.java | 10 +- .../kernal/GridCancelUnusedJobSelfTest.java | 4 +- .../GridCancelledJobsMetricsSelfTest.java | 10 +- .../grid/kernal/GridCommunicationSelfTest.java | 2 +- .../GridContinuousJobAnnotationSelfTest.java | 14 +- .../GridContinuousJobSiblingsSelfTest.java | 10 +- .../grid/kernal/GridContinuousTaskSelfTest.java | 24 +- .../GridDeploymentMultiThreadedSelfTest.java | 6 +- .../grid/kernal/GridDeploymentSelfTest.java | 14 +- .../grid/kernal/GridDiscoveryEventSelfTest.java | 4 +- .../GridEventStorageCheckAllEventsSelfTest.java | 10 +- ...ventStorageRuntimeConfigurationSelfTest.java | 6 +- .../grid/kernal/GridEventStorageSelfTest.java | 10 +- .../GridExplicitImplicitDeploymentSelfTest.java | 8 +- .../grid/kernal/GridFactoryVmShutdownTest.java | 4 +- .../GridFailoverCustomTopologySelfTest.java | 8 +- .../grid/kernal/GridFailoverSelfTest.java | 12 +- .../GridFailoverTaskWithPredicateSelfTest.java | 12 +- .../kernal/GridFailoverTopologySelfTest.java | 12 +- .../grid/kernal/GridHomePathSelfTest.java | 4 +- .../GridJobCheckpointCleanupSelfTest.java | 6 +- .../kernal/GridJobCollisionCancelSelfTest.java | 2 +- .../grid/kernal/GridJobContextSelfTest.java | 4 +- .../kernal/GridJobMasterLeaveAwareSelfTest.java | 42 +- .../grid/kernal/GridJobStealingSelfTest.java | 26 +- .../GridJobStealingZeroActiveJobsSelfTest.java | 12 +- .../grid/kernal/GridJobSubjectIdSelfTest.java | 6 +- .../grid/kernal/GridLifecycleAwareSelfTest.java | 16 +- .../grid/kernal/GridLifecycleBeanSelfTest.java | 14 +- .../grid/kernal/GridListenActorSelfTest.java | 6 +- .../grid/kernal/GridManagementJobSelfTest.java | 8 +- .../grid/kernal/GridMultipleJobsSelfTest.java | 6 +- .../grid/kernal/GridMultipleSpisSelfTest.java | 12 +- .../GridMultipleVersionsDeploymentSelfTest.java | 8 +- .../GridMultithreadedJobStealingSelfTest.java | 10 +- .../kernal/GridNonHistoryMetricsSelfTest.java | 2 +- .../grid/kernal/GridProjectionAbstractTest.java | 6 +- .../grid/kernal/GridReleaseTypeSelfTest.java | 6 +- .../kernal/GridRuntimeExceptionSelfTest.java | 14 +- .../grid/kernal/GridSpiExceptionSelfTest.java | 6 +- .../grid/kernal/GridStopWithCancelSelfTest.java | 8 +- .../grid/kernal/GridStopWithWaitSelfTest.java | 16 +- .../GridTaskCancelSingleNodeSelfTest.java | 2 +- .../GridTaskContinuousMapperSelfTest.java | 32 +- .../GridTaskExecutionContextSelfTest.java | 8 +- .../grid/kernal/GridTaskFailoverSelfTest.java | 2 +- .../GridTaskFutureImplStopGridSelfTest.java | 4 +- .../GridTaskInstanceExecutionSelfTest.java | 4 +- .../kernal/GridTaskInstantiationSelfTest.java | 6 +- .../grid/kernal/GridTaskJobRejectSelfTest.java | 2 +- .../grid/kernal/GridTaskListenerSelfTest.java | 2 +- .../grid/kernal/GridTaskMapAsyncSelfTest.java | 8 +- .../kernal/GridTaskNameAnnotationSelfTest.java | 8 +- .../kernal/GridTaskResultCacheSelfTest.java | 10 +- .../grid/kernal/GridTaskTimeoutSelfTest.java | 6 +- .../managers/GridManagerStopSelfTest.java | 26 +- .../managers/GridNoopManagerSelfTest.java | 6 +- .../GridCheckpointManagerAbstractSelfTest.java | 70 +- .../checkpoint/GridCheckpointTaskSelfTest.java | 12 +- ...idCommunicationManagerListenersSelfTest.java | 6 +- .../communication/GridIoManagerSelfTest.java | 10 +- .../GridDiscoveryManagerAttributesSelfTest.java | 4 +- .../GridCacheAbstractFailoverSelfTest.java | 24 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 28 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 32 +- .../GridCacheAbstractIteratorsSelfTest.java | 10 +- .../GridCacheAbstractProjectionSelfTest.java | 40 +- .../GridCacheAbstractRemoveFailureTest.java | 4 +- .../cache/GridCacheAbstractSelfTest.java | 14 +- .../cache/GridCacheAbstractTtlSelfTest.java | 4 +- .../cache/GridCacheAbstractTxReadTest.java | 30 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 10 +- .../cache/GridCacheBasicApiAbstractTest.java | 12 +- .../cache/GridCacheBasicStoreAbstractTest.java | 10 +- .../GridCacheConcurrentTxMultiNodeTest.java | 26 +- ...idCacheConfigurationConsistencySelfTest.java | 50 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 14 +- .../cache/GridCacheGenericTestStore.java | 24 +- .../GridCacheGroupLockAbstractSelfTest.java | 28 +- .../GridCacheGroupLockFailoverSelfTest.java | 16 +- .../cache/GridCacheGroupLockPutTask.java | 8 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 8 +- .../cache/GridCacheMemoryModeSelfTest.java | 6 +- .../cache/GridCacheNestedTxAbstractTest.java | 19 +- .../cache/GridCacheP2PUndeploySelfTest.java | 4 +- .../cache/GridCachePutAllFailoverSelfTest.java | 10 +- .../processors/cache/GridCachePutAllTask.java | 8 +- .../GridCacheQueryIndexingDisabledSelfTest.java | 26 +- .../GridCacheRefreshAheadAbstractSelfTest.java | 16 +- .../processors/cache/GridCacheStopSelfTest.java | 6 +- .../cache/GridCacheStorePutxSelfTest.java | 22 +- .../cache/GridCacheSwapReloadSelfTest.java | 16 +- .../processors/cache/GridCacheTestEntryEx.java | 38 +- .../processors/cache/GridCacheTestStore.java | 32 +- .../cache/GridCacheTtlManagerSelfTest.java | 8 +- .../cache/GridCacheTxAbstractTest.java | 8 +- .../GridCacheTxExceptionAbstractSelfTest.java | 66 +- .../cache/GridCacheTxMultiNodeAbstractTest.java | 52 +- .../GridCacheTxMultiThreadedAbstractTest.java | 24 +- .../GridCacheTxSingleThreadedAbstractTest.java | 24 +- ...idCacheTxStoreExceptionAbstractSelfTest.java | 32 +- .../GridCacheVariableTopologySelfTest.java | 6 +- ...idCacheWriteBehindStoreAbstractSelfTest.java | 4 +- .../GridCacheWriteBehindStoreAbstractTest.java | 6 +- .../GridCacheWriteBehindStoreSelfTest.java | 6 +- .../GridCacheAtomicLongApiSelfTest.java | 10 +- ...CacheAtomicReferenceApiSelfAbstractTest.java | 14 +- ...cheAtomicReferenceMultiNodeAbstractTest.java | 12 +- ...idCacheAtomicStampedApiSelfAbstractTest.java | 6 +- .../GridCacheMultiNodeDataStructureTest.java | 10 +- .../GridCacheQueueApiSelfAbstractTest.java | 16 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 4 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 8 +- ...CacheQueueRotativeMultiNodeAbstractTest.java | 14 +- .../GridCacheSequenceApiSelfAbstractTest.java | 10 +- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 6 +- .../GridCacheSetAbstractSelfTest.java | 6 +- .../GridCacheSetFailoverAbstractSelfTest.java | 6 +- ...titionedAtomicSequenceMultiThreadedTest.java | 30 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 6 +- .../GridCacheAbstractJobExecutionTest.java | 2 +- .../GridCacheAtomicTimeoutSelfTest.java | 4 +- .../GridCacheBasicOpAbstractTest.java | 4 +- .../distributed/GridCacheEventAbstractTest.java | 52 +- .../GridCacheMultiNodeLockAbstractTest.java | 4 +- ...dCacheMultithreadedFailoverAbstractTest.java | 4 +- .../GridCacheNodeFailureAbstractTest.java | 6 +- .../GridCacheTxTimeoutAbstractTest.java | 14 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 4 +- .../dht/GridCacheColocatedDebugTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../dht/GridCacheDhtEvictionSelfTest.java | 2 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 8 +- .../dht/GridCacheDhtMultiBackupTest.java | 2 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 6 +- .../GridCacheDhtPreloadDisabledSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadSelfTest.java | 8 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 8 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 6 +- .../distributed/dht/GridCacheDhtTestUtils.java | 6 +- ...cheGroupLockPartitionedAbstractSelfTest.java | 4 +- ...ockPartitionedMultiNodeAbstractSelfTest.java | 2 +- ...dCachePartitionedTopologyChangeSelfTest.java | 10 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 6 +- .../near/GridCacheGetStoreErrorSelfTest.java | 14 +- .../near/GridCacheNearMultiGetSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 6 +- .../near/GridCacheNearOneNodeSelfTest.java | 14 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 6 +- .../GridCacheNearReaderPreloadSelfTest.java | 2 +- ...rtitionedAffinityHashIdResolverSelfTest.java | 10 +- .../GridCachePartitionedAffinitySelfTest.java | 4 +- ...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 4 +- .../GridCachePartitionedLoadCacheSelfTest.java | 14 +- .../near/GridCachePartitionedLockSelfTest.java | 12 +- ...achePartitionedMultiNodeCounterSelfTest.java | 2 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 6 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 12 +- ...achePartitionedPreloadLifecycleSelfTest.java | 4 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 12 +- .../GridCachePartitionedStorePutSelfTest.java | 14 +- .../GridCachePartitionedTxSalvageSelfTest.java | 2 +- .../near/GridPartitionedBackupLoadSelfTest.java | 12 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +- .../GridCacheReplicatedPreloadSelfTest.java | 2 +- .../GridCacheBatchEvictUnswapSelfTest.java | 2 +- .../GridCacheDistributedEvictionsSelfTest.java | 2 +- .../cache/eviction/GridCacheMockEntry.java | 36 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 4 +- .../GridCacheRandomEvictionPolicySelfTest.java | 2 +- .../local/GridCacheDaemonNodeLocalSelfTest.java | 2 +- .../local/GridCacheLocalLoadAllSelfTest.java | 8 +- .../cache/local/GridCacheLocalLockSelfTest.java | 4 +- .../local/GridCacheLocalTxTimeoutSelfTest.java | 14 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 8 +- .../clock/GridTimeSyncProcessorSelfTest.java | 2 +- .../closure/GridClosureProcessorSelfTest.java | 28 +- .../continuous/GridEventConsumeSelfTest.java | 4 +- .../GridDataLoaderProcessorSelfTest.java | 2 +- ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 2 +- .../ggfs/GridGgfsAbstractSelfTest.java | 60 +- .../ggfs/GridGgfsDualAbstractSelfTest.java | 22 +- .../ggfs/GridGgfsFileInfoSelfTest.java | 12 +- .../processors/ggfs/GridGgfsModesSelfTest.java | 12 +- .../ggfs/GridGgfsProcessorSelfTest.java | 12 +- .../GridGgfsProcessorValidationSelfTest.java | 14 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 12 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 6 +- .../ggfs/GridGgfsStreamsSelfTest.java | 4 +- .../processors/ggfs/GridGgfsTaskSelfTest.java | 6 +- .../cache/GridCacheCommandHandlerSelfTest.java | 22 +- .../GridServiceProcessorAbstractSelfTest.java | 6 +- .../GridServiceProcessorSingleNodeSelfTest.java | 2 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../streamer/GridStreamerEvictionSelfTest.java | 8 +- .../streamer/GridStreamerSelfTest.java | 8 +- .../processors/streamer/GridTestStage.java | 4 +- .../gridgain/grid/lang/GridFuncSelfTest.java | 4 +- .../lang/GridFutureListenPerformanceTest.java | 4 +- .../org/gridgain/grid/lang/GridXSelfTest.java | 4 +- .../grid/loadtest/GridSingleExecutionTest.java | 36 +- ...idFileSwapSpaceSpiMultithreadedLoadTest.java | 6 +- .../marshaller/GridMarshallerAbstractTest.java | 12 +- .../GridMarshallerPerformanceTest.java | 16 +- .../p2p/GridAbstractMultinodeRedeployTest.java | 2 +- .../grid/p2p/GridP2PJobClassLoaderSelfTest.java | 6 +- .../p2p/GridP2PLocalDeploymentSelfTest.java | 8 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 8 +- .../grid/p2p/GridP2PRecursionTaskSelfTest.java | 6 +- .../p2p/GridP2PRemoteClassLoadersSelfTest.java | 6 +- .../org/gridgain/grid/p2p/GridP2PTestJob.java | 2 +- .../org/gridgain/grid/p2p/GridP2PTestTask.java | 4 +- .../grid/p2p/GridP2PTestTaskExecutionTest.java | 4 +- .../grid/p2p/GridP2PTimeoutSelfTest.java | 4 +- ...SessionCancelSiblingsFromFutureSelfTest.java | 10 +- ...ridSessionCancelSiblingsFromJobSelfTest.java | 12 +- ...idSessionCancelSiblingsFromTaskSelfTest.java | 10 +- .../GridSessionCheckpointAbstractSelfTest.java | 10 +- .../GridSessionCollisionSpiSelfTest.java | 6 +- ...idSessionFutureWaitJobAttributeSelfTest.java | 12 +- ...dSessionFutureWaitTaskAttributeSelfTest.java | 10 +- .../session/GridSessionJobFailoverSelfTest.java | 14 +- ...GridSessionJobWaitTaskAttributeSelfTest.java | 14 +- .../grid/session/GridSessionLoadSelfTest.java | 6 +- .../GridSessionSetFutureAttributeSelfTest.java | 14 +- ...nSetFutureAttributeWaitListenerSelfTest.java | 10 +- .../GridSessionSetJobAttribute2SelfTest.java | 8 +- ...GridSessionSetJobAttributeOrderSelfTest.java | 10 +- .../GridSessionSetJobAttributeSelfTest.java | 14 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 10 +- .../GridSessionSetTaskAttributeSelfTest.java | 14 +- ...GridSessionTaskWaitJobAttributeSelfTest.java | 14 +- .../GridSessionWaitAttributeSelfTest.java | 14 +- .../grid/spi/GridSpiLocalHostInjectionTest.java | 44 +- .../grid/spi/GridTcpSpiForwardingSelfTest.java | 2 +- .../grid/util/GridSnapshotLockSelfTest.java | 6 +- .../util/future/GridCompoundFutureSelfTest.java | 6 +- .../util/future/GridEmbeddedFutureSelfTest.java | 4 +- .../util/future/GridFinishedFutureSelfTest.java | 4 +- .../util/future/GridFutureAdapterSelfTest.java | 14 +- .../future/GridFutureListenPerformanceTest.java | 4 +- .../util/future/nio/GridNioFutureSelfTest.java | 12 +- ...idIpcServerEndpointDeserializerSelfTest.java | 8 +- .../shmem/GridGgfsSharedMemoryTestServer.java | 8 +- ...idIpcSharedMemoryCrashDetectionSelfTest.java | 14 +- .../shmem/GridIpcSharedMemorySpaceSelfTest.java | 2 +- .../GridIpcSharedMemoryBenchmarkReader.java | 10 +- .../GridIpcSharedMemoryBenchmarkWriter.java | 8 +- .../gridgain/grid/util/nio/GridNioSelfTest.java | 32 +- .../grid/util/nio/GridNioSslSelfTest.java | 8 +- .../nio/impl/GridNioFilterChainSelfTest.java | 30 +- .../offheap/GridOffHeapMapAbstractSelfTest.java | 11 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +- .../loadtests/GridCacheLoadPopulationTask.java | 6 +- .../cache/GridCacheAbstractLoadTest.java | 24 +- ...ridCacheAffinityTransactionsOffHeapTest.java | 4 +- .../cache/GridCacheDataStructuresLoadTest.java | 28 +- .../loadtests/cache/GridCacheLoadTest.java | 4 +- .../loadtests/cache/GridCacheSwapLoadTest.java | 8 +- .../GridCacheWriteBehindStoreLoadTest.java | 8 +- .../colocation/GridTestCacheStore.java | 12 +- .../colocation/GridTestLifecycleBean.java | 2 +- .../loadtests/colocation/GridTestMain.java | 6 +- .../loadtests/colocation/spring-colocation.xml | 13 - .../communication/GridIoManagerBenchmark.java | 9 +- .../communication/GridIoManagerBenchmark0.java | 13 +- .../GridTcpCommunicationBenchmark.java | 10 +- .../GridContinuousOperationsLoadTest.java | 4 +- .../direct/multisplit/GridLoadTestJob.java | 2 +- .../direct/multisplit/GridLoadTestTask.java | 4 +- .../multisplit/GridMultiSplitsLoadTest.java | 2 +- .../GridMultiSplitsRedeployLoadTest.java | 8 +- .../GridSingleSplitNewNodesTestJobTarget.java | 8 +- .../GridSingleSplitNewNodesTestTask.java | 8 +- .../GridSingleSplitsRedeployLoadTest.java | 2 +- .../direct/session/GridSessionLoadTestJob.java | 2 +- .../direct/session/GridSessionLoadTestTask.java | 6 +- .../stealing/GridStealingLoadTestJob.java | 2 +- .../stealing/GridStealingLoadTestTask.java | 6 +- .../loadtests/discovery/GridGcTimeoutTest.java | 4 +- .../gridgain/loadtests/dsi/GridDsiClient.java | 2 +- .../loadtests/dsi/GridDsiLifecycleBean.java | 8 +- .../gridgain/loadtests/dsi/GridDsiPerfJob.java | 16 +- .../loadtests/dsi/GridDsiRequestTask.java | 6 +- .../loadtests/dsi/GridDsiResponseTask.java | 6 +- .../job/GridJobExecutionLoadTestClient.java | 6 +- ...GridJobExecutionLoadTestClientSemaphore.java | 4 +- .../job/GridJobExecutionLoadTestJob.java | 4 +- .../job/GridJobExecutionLoadTestTask.java | 8 +- .../job/GridJobExecutionSingleNodeLoadTest.java | 12 +- ...JobExecutionSingleNodeSemaphoreLoadTest.java | 8 +- .../loadtests/job/GridJobLoadTestJob.java | 4 +- .../loadtests/job/GridJobLoadTestSubmitter.java | 8 +- .../loadtests/job/GridJobLoadTestTask.java | 8 +- .../mapper/GridContinuousMapperLoadTest1.java | 4 +- .../mapper/GridContinuousMapperTask1.java | 16 +- .../mapper/GridContinuousMapperTask2.java | 6 +- .../loadtests/mapper/GridNodeStartup.java | 4 +- .../mergesort/GridMergeSortLoadTask.java | 2 +- .../mergesort/GridMergeSortLoadTest.java | 8 +- .../loadtests/nio/GridNioBenchmarkTest.java | 8 +- .../loadtests/streamer/EventClosure.java | 2 +- .../streamer/GridStreamerIndexLoadTest.java | 5 +- .../loadtests/streamer/average/TestStage.java | 4 +- .../swap/GridSwapEvictAllBenchmark.java | 4 +- .../loadtests/util/GridLoadTestArgs.java | 8 +- .../startup/GridRandomCommandLineLoader.java | 20 +- .../gridgain/startup/GridVmNodesStarter.java | 24 +- .../gridgain/testframework/GridFileLock.java | 16 +- .../testframework/GridGgfsTestUtils.java | 8 +- .../testframework/GridSpiTestContext.java | 36 +- .../gridgain/testframework/GridTestUtils.java | 22 +- .../testframework/junits/GridAbstractTest.java | 24 +- .../junits/GridTestKernalContext.java | 8 +- .../testframework/junits/GridTestResources.java | 10 +- .../cache/GridAbstractCacheStoreSelfTest.java | 30 +- .../junits/common/GridCommonAbstractTest.java | 58 +- .../junits/logger/GridTestLog4jLogger.java | 22 +- .../core/src/test/webapp/META-INF/gg-config.xml | 53 +- .../processors/email/GridEmailProcessor.java | 20 +- .../tests/p2p/GridCacheDeploymentTestTask1.java | 6 +- .../tests/p2p/GridCacheDeploymentTestTask2.java | 4 +- .../tests/p2p/GridCacheDeploymentTestTask3.java | 6 +- .../p2p/GridP2PContinuousDeploymentTask1.java | 6 +- .../p2p/GridP2PContinuousDeploymentTask2.java | 5 +- .../p2p/GridP2PEventFilterExternalPath1.java | 2 +- .../p2p/GridP2PEventFilterExternalPath2.java | 2 +- .../tests/p2p/GridP2PTestTaskExternalPath1.java | 8 +- .../tests/p2p/GridP2PTestTaskExternalPath2.java | 8 +- .../grid/tests/p2p/GridSingleSplitTestTask.java | 5 +- .../grid/tests/p2p/JobStealingTask.java | 8 +- .../GridUriDeploymentAbstractTestTask.java | 5 +- .../tasks/GridUriDeploymentInnerTestTask.java | 5 +- .../GridUriDeploymentNonePublicTestTask.java | 5 +- .../uri/tasks/GridUriDeploymentTestTask0.java | 5 +- .../uri/tasks/GridUriDeploymentTestTask1.java | 5 +- .../uri/tasks/GridUriDeploymentTestTask2.java | 5 +- .../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 +- .../client/hadoop/GridHadoopClientProtocol.java | 3 +- .../GridHadoopClientProtocolProvider.java | 3 +- .../hadoop/v1/GridGgfsHadoopFileSystem.java | 3 +- .../hadoop/v2/GridGgfsHadoopFileSystem.java | 3 +- .../grid/hadoop/GridHadoopDefaultJobInfo.java | 4 +- .../grid/kernal/ggfs/hadoop/GridGgfsHadoop.java | 65 +- .../GridGgfsHadoopCommunicationException.java | 3 +- .../ggfs/hadoop/GridGgfsHadoopEndpoint.java | 20 +- .../ggfs/hadoop/GridGgfsHadoopFSProperties.java | 7 +- .../hadoop/GridGgfsHadoopFileSystemWrapper.java | 41 +- .../ggfs/hadoop/GridGgfsHadoopInProc.java | 33 +- .../ggfs/hadoop/GridGgfsHadoopInputStream.java | 19 +- .../kernal/ggfs/hadoop/GridGgfsHadoopIo.java | 13 +- .../kernal/ggfs/hadoop/GridGgfsHadoopIpcIo.java | 31 +- .../ggfs/hadoop/GridGgfsHadoopOutProc.java | 43 +- .../ggfs/hadoop/GridGgfsHadoopOutputStream.java | 3 +- .../GridGgfsHadoopStreamEventListener.java | 5 +- .../kernal/ggfs/hadoop/GridGgfsHadoopUtils.java | 5 +- .../ggfs/hadoop/GridGgfsHadoopWrapper.java | 48 +- .../hadoop/GridHadoopClassLoader.java | 11 +- .../processors/hadoop/GridHadoopComponent.java | 4 +- .../processors/hadoop/GridHadoopImpl.java | 9 +- .../processors/hadoop/GridHadoopProcessor.java | 23 +- .../GridHadoopTaskCancelledException.java | 3 +- .../processors/hadoop/GridHadoopUtils.java | 27 +- .../hadoop/counter/GridHadoopCountersImpl.java | 3 +- .../counter/GridHadoopFSCounterWriter.java | 5 +- .../hadoop/jobtracker/GridHadoopJobTracker.java | 65 +- .../GridHadoopDefaultMapReducePlanner.java | 14 +- .../GridHadoopProtocolJobCountersTask.java | 3 +- .../proto/GridHadoopProtocolJobStatusTask.java | 3 +- .../proto/GridHadoopProtocolKillJobTask.java | 3 +- .../proto/GridHadoopProtocolNextTaskIdTask.java | 3 +- .../proto/GridHadoopProtocolSubmitJobTask.java | 3 +- .../proto/GridHadoopProtocolTaskAdapter.java | 12 +- .../hadoop/shuffle/GridHadoopShuffle.java | 31 +- .../hadoop/shuffle/GridHadoopShuffleJob.java | 36 +- .../shuffle/GridHadoopShuffleMessage.java | 7 +- .../GridHadoopConcurrentHashMultimap.java | 25 +- .../collections/GridHadoopHashMultimap.java | 9 +- .../collections/GridHadoopHashMultimapBase.java | 15 +- .../shuffle/collections/GridHadoopMultimap.java | 19 +- .../collections/GridHadoopMultimapBase.java | 21 +- .../shuffle/collections/GridHadoopSkipList.java | 35 +- .../GridHadoopEmbeddedTaskExecutor.java | 11 +- .../taskexecutor/GridHadoopRunnableTask.java | 22 +- .../GridHadoopTaskExecutorAdapter.java | 9 +- .../GridHadoopExternalTaskExecutor.java | 40 +- .../child/GridHadoopChildProcessRunner.java | 22 +- .../child/GridHadoopExternalProcessStarter.java | 2 +- .../GridHadoopCommunicationClient.java | 5 +- .../GridHadoopExternalCommunication.java | 86 +- .../GridHadoopHandshakeTimeoutException.java | 3 +- .../GridHadoopIpcToNioAdapter.java | 20 +- .../GridHadoopMarshallerFilter.java | 17 +- .../GridHadoopTcpNioCommunicationClient.java | 7 +- .../hadoop/v1/GridHadoopV1CleanupTask.java | 5 +- .../hadoop/v1/GridHadoopV1MapTask.java | 5 +- .../hadoop/v1/GridHadoopV1OutputCollector.java | 3 +- .../hadoop/v1/GridHadoopV1ReduceTask.java | 5 +- .../hadoop/v1/GridHadoopV1SetupTask.java | 5 +- .../hadoop/v1/GridHadoopV1Splitter.java | 13 +- .../v2/GridHadoopSerializationWrapper.java | 17 +- .../hadoop/v2/GridHadoopV2CleanupTask.java | 5 +- .../hadoop/v2/GridHadoopV2Context.java | 3 +- .../processors/hadoop/v2/GridHadoopV2Job.java | 16 +- .../v2/GridHadoopV2JobResourceManager.java | 20 +- .../hadoop/v2/GridHadoopV2MapTask.java | 5 +- .../hadoop/v2/GridHadoopV2ReduceTask.java | 5 +- .../hadoop/v2/GridHadoopV2SetupTask.java | 5 +- .../hadoop/v2/GridHadoopV2Splitter.java | 13 +- .../processors/hadoop/v2/GridHadoopV2Task.java | 17 +- .../hadoop/v2/GridHadoopV2TaskContext.java | 42 +- .../v2/GridHadoopWritableSerialization.java | 9 +- .../grid/ggfs/GridGgfsEventsTestSuite.java | 20 +- ...dGgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 2 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 2 +- ...fsHadoopFileSystemShmemAbstractSelfTest.java | 5 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 116 +- .../hadoop/GridHadoopMapReduceTest.java | 9 +- .../processors/hadoop/GridHadoopStartup.java | 3 +- .../hadoop/GridHadoopTaskExecutionSelfTest.java | 6 +- .../hadoop/GridHadoopTasksAllVersionsTest.java | 9 +- .../GridHadoopTestRoundRobinMrPlanner.java | 3 +- .../hadoop/GridHadoopTestTaskContext.java | 9 +- .../hadoop/GridHadoopV2JobSelfTest.java | 5 +- .../collections/GridHadoopAbstractMapTest.java | 14 +- ...GridHadoopExternalTaskExecutionSelfTest.java | 2 +- .../loadtests/ggfs/GridGgfsNodeStartup.java | 4 +- .../GridHibernateAccessStrategyAdapter.java | 10 +- .../GridHibernateGeneralDataRegion.java | 4 +- .../GridHibernateNonStrictAccessStrategy.java | 8 +- .../GridHibernateReadOnlyAccessStrategy.java | 2 +- .../GridHibernateReadWriteAccessStrategy.java | 24 +- .../hibernate/GridHibernateRegionFactory.java | 2 +- ...ridHibernateTransactionalAccessStrategy.java | 10 +- .../hibernate/GridCacheHibernateBlobStore.java | 32 +- ...idHibernateL2CacheTransactionalSelfTest.java | 6 +- .../processors/query/h2/GridH2Indexing.java | 1998 +++++++++++++++ .../query/h2/GridH2ResultSetIterator.java | 122 + .../query/h2/opt/GridH2AbstractKeyValueRow.java | 447 ++++ .../processors/query/h2/opt/GridH2Cursor.java | 62 + .../query/h2/opt/GridH2IndexBase.java | 198 ++ .../query/h2/opt/GridH2KeyValueRowOffheap.java | 346 +++ .../query/h2/opt/GridH2KeyValueRowOnheap.java | 46 + .../processors/query/h2/opt/GridH2Row.java | 40 + .../query/h2/opt/GridH2RowDescriptor.java | 102 + .../query/h2/opt/GridH2SpatialIndex.java | 318 +++ .../processors/query/h2/opt/GridH2Table.java | 888 +++++++ .../query/h2/opt/GridH2TreeIndex.java | 469 ++++ .../processors/query/h2/opt/GridH2Utils.java | 125 + .../query/h2/opt/GridLuceneDirectory.java | 189 ++ .../processors/query/h2/opt/GridLuceneFile.java | 186 ++ .../query/h2/opt/GridLuceneIndex.java | 384 +++ .../query/h2/opt/GridLuceneInputStream.java | 220 ++ .../query/h2/opt/GridLuceneLockFactory.java | 64 + .../query/h2/opt/GridLuceneOutputStream.java | 230 ++ .../query/h2/opt/GridSearchRowPointer.java | 20 + .../kernal/processors/query/h2/package.html | 15 + .../h2/GridH2IndexingSpaceConfiguration.java | 156 -- .../grid/spi/indexing/h2/GridH2IndexingSpi.java | 2398 ------------------ .../spi/indexing/h2/GridH2IndexingSpiMBean.java | 222 -- .../indexing/h2/GridH2ResultSetIterator.java | 122 - .../h2/opt/GridH2AbstractKeyValueRow.java | 446 ---- .../grid/spi/indexing/h2/opt/GridH2Cursor.java | 62 - .../spi/indexing/h2/opt/GridH2IndexBase.java | 204 -- .../h2/opt/GridH2KeyValueRowOffheap.java | 346 --- .../h2/opt/GridH2KeyValueRowOnheap.java | 46 - .../grid/spi/indexing/h2/opt/GridH2Row.java | 40 - .../indexing/h2/opt/GridH2RowDescriptor.java | 103 - .../spi/indexing/h2/opt/GridH2SpatialIndex.java | 318 --- .../grid/spi/indexing/h2/opt/GridH2Table.java | 893 ------- .../spi/indexing/h2/opt/GridH2TreeIndex.java | 480 ---- .../grid/spi/indexing/h2/opt/GridH2Utils.java | 125 - .../indexing/h2/opt/GridLuceneDirectory.java | 189 -- .../spi/indexing/h2/opt/GridLuceneFile.java | 186 -- .../spi/indexing/h2/opt/GridLuceneIndex.java | 391 --- .../indexing/h2/opt/GridLuceneInputStream.java | 220 -- .../indexing/h2/opt/GridLuceneLockFactory.java | 64 - .../indexing/h2/opt/GridLuceneOutputStream.java | 230 -- .../indexing/h2/opt/GridSearchRowPointer.java | 20 - .../gridgain/grid/spi/indexing/h2/package.html | 15 - .../GridCacheAbstractFieldsQuerySelfTest.java | 82 +- .../cache/GridCacheAbstractQuerySelfTest.java | 51 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 9 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 32 +- .../cache/GridCacheQueryLoadSelfTest.java | 20 +- .../cache/GridCacheQueryMetricsSelfTest.java | 17 +- .../GridCacheQueryMultiThreadedSelfTest.java | 73 +- .../GridCacheQueryUserResourceSelfTest.java | 4 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 13 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 9 +- .../processors/cache/GridCacheSwapSelfTest.java | 6 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 21 +- .../GridCacheAtomicFieldsQuerySelfTest.java | 4 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 2 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 26 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 21 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 10 +- .../GridCacheReplicatedQuerySelfTest.java | 22 +- .../local/GridCacheLocalQuerySelfTest.java | 2 +- .../query/h2/GridH2IndexRebuildTest.java | 241 ++ .../query/h2/GridH2IndexingGeoSelfTest.java | 240 ++ .../query/h2/GridH2IndexingInMemSelfTest.java | 17 + .../query/h2/GridH2IndexingOffheapSelfTest.java | 36 + .../h2/GridIndexingSpiAbstractSelfTest.java | 553 ++++ .../query/h2/opt/GridH2TableSelfTest.java | 613 +++++ .../GridIndexingSpiAbstractSelfTest.java | 594 ----- .../spi/indexing/h2/GridH2IndexRebuildTest.java | 236 -- .../h2/GridH2IndexingSpiGeoSelfTest.java | 240 -- .../h2/GridH2IndexingSpiInMemSelfTest.java | 21 - ...GridH2IndexingSpiInMemStartStopSelfTest.java | 21 - .../h2/GridH2IndexingSpiOffheapSelfTest.java | 40 - ...idH2IndexingSpiOffheapStartStopSelfTest.java | 40 - .../indexing/h2/opt/GridH2TableSelfTest.java | 613 ----- .../h2/opt/GridLuceneIndexLoadTest.java | 162 -- .../h2indexing/GridH2IndexingSpiLoadTest.java | 288 --- .../bamboo/GridH2IndexingSpiTestSuite.java | 12 +- .../grid/cache/jta/GridCacheTmLookup.java | 6 +- .../cache/jta/jndi/GridCacheJndiTmLookup.java | 6 +- .../reflect/GridCacheReflectionTmLookup.java | 11 +- .../cache/jta/GridCacheJtaManager.java | 14 +- .../cache/jta/GridCacheXAResource.java | 8 +- ...CacheJtaConfigurationValidationSelfTest.java | 7 +- .../processors/cache/GridCacheJtaSelfTest.java | 4 +- .../GridTmLookupLifecycleAwareSelfTest.java | 2 +- .../ignite/logger/log4j/IgniteLog4jLogger.java | 22 +- .../http/jetty/GridJettyRestHandler.java | 26 +- .../http/jetty/GridJettyRestProtocol.java | 30 +- .../test/resources/spring-ping-pong-partner.xml | 21 - .../schedule/GridScheduleProcessor.java | 6 +- .../processors/schedule/ScheduleFutureImpl.java | 40 +- .../grid/kernal/GridScheduleSelfTest.java | 32 +- .../java/org/gridgain/grid/GridGainSpring.java | 16 +- .../java/org/gridgain/grid/GridSpringBean.java | 2 +- .../cache/spring/GridSpringCacheManager.java | 26 +- .../GridResourceSpringBeanInjector.java | 11 +- .../resource/GridSpringResourceContextImpl.java | 6 +- .../spring/GridSpringProcessorImpl.java | 16 +- .../resource/GridUserExternalResourceTask1.java | 6 +- .../resource/GridUserExternalResourceTask2.java | 4 +- .../grid/kernal/GridFactorySelfTest.java | 14 +- .../GridResourceConcurrentUndeploySelfTest.java | 6 +- .../GridResourceEventFilterSelfTest.java | 4 +- .../GridResourceFieldInjectionSelfTest.java | 28 +- ...dResourceFieldOverrideInjectionSelfTest.java | 4 +- .../resource/GridResourceIocSelfTest.java | 10 +- ...GridResourceIsolatedClassLoaderSelfTest.java | 18 +- .../GridResourceIsolatedTaskSelfTest.java | 18 +- .../GridResourceMethodInjectionSelfTest.java | 8 +- ...ResourceMethodOverrideInjectionSelfTest.java | 4 +- .../resource/GridResourceProcessorSelfTest.java | 6 +- .../GridResourceSharedUndeploySelfTest.java | 10 +- .../resource/GridServiceInjectionSelfTest.java | 6 +- .../GridP2PContinuousLocalDeploySelfTest.java | 8 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 4 +- .../GridProjectionStartStopRestartSelfTest.java | 48 +- .../uri/GridUriDeploymentFileProcessor.java | 2 +- .../deployment/uri/GridUriDeploymentSpi.java | 2 +- .../ftp/GridUriDeploymentFtpException.java | 4 +- .../ftp/GridUriDeploymentFtpScanner.java | 4 +- ...riDeploymentClassloaderRegisterSelfTest.java | 6 +- .../uri/GridUriDeploymentSimpleSelfTest.java | 10 +- .../grid/p2p/GridP2PDisabledSelfTest.java | 2 +- .../cache/websession/GridWebSessionFilter.java | 22 +- .../websession/GridWebSessionListener.java | 4 +- .../GridServletContextListenerStartup.java | 12 +- .../startup/servlet/GridServletStartup.java | 2 +- 1424 files changed, 21850 insertions(+), 22982 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73528bb4/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java index 3bebe9f,73dde4c..4bf2fc0 --- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java @@@ -9,8 -9,8 +9,9 @@@ package org.gridgain.grid.cache.store; + import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.portables.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.store.jdbc.*; @@@ -63,9 -63,9 +64,9 @@@ import java.util.Date * cast exceptions, store must have signature compatible with portables. E.g., if you use {@link Integer} * as a key and {@code Value} class as a value (which will be converted to portable format), cache store * signature should be the following: - * <pre> + * <pre name="code" class="java"> * public class PortableCacheStore implements GridCacheStore<Integer, GridPortableObject> { - * public void put(@Nullable GridCacheTx tx, Integer key, GridPortableObject val) throws GridException { + * public void put(@Nullable GridCacheTx tx, Integer key, GridPortableObject val) throws IgniteCheckedException { * ... * } * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73528bb4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73528bb4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73528bb4/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java index fd25eac,3e557ff..bf56167 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java @@@ -299,11 -299,13 +299,11 @@@ public class GridCacheProcessor extend " 'true' [cacheName=" + cc.getName() + ']'); } - IgniteConfiguration cfg = ctx.config(); + IgniteDeploymentMode depMode = c.getDeploymentMode(); - IgniteDeploymentMode depMode = cfg.getDeploymentMode(); - - if (cfg.isPeerClassLoadingEnabled() && (depMode == PRIVATE || depMode == ISOLATED) && + if (c.isPeerClassLoadingEnabled() && (depMode == PRIVATE || depMode == ISOLATED) && !CU.isSystemCache(cc.getName())) - throw new GridException("Cannot start cache in PRIVATE or ISOLATED deployment mode: " + + throw new IgniteCheckedException("Cannot start cache in PRIVATE or ISOLATED deployment mode: " + ctx.config().getDeploymentMode()); if (!c.getTransactionsConfiguration().isTxSerializableEnabled() &&