Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-446
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/37d10683 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/37d10683 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/37d10683 Branch: refs/heads/ignite-446 Commit: 37d1068357abdc80ec9a5ebedc87f5f9620196ce Parents: fdad1e7 4649f85 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Apr 14 12:16:08 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Apr 14 12:16:08 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 4 +- RELEASE_NOTES.txt | 13 + assembly/release-hadoop.xml | 4 - bin/ignitevisorcmd.bat | 39 +- examples/pom.xml | 2 +- .../examples/datagrid/CacheAffinityExample.java | 9 +- .../examples/datagrid/CacheApiExample.java | 9 +- .../examples/datagrid/CacheAsyncApiExample.java | 9 +- .../datagrid/CacheContinuousQueryExample.java | 8 +- .../datagrid/CacheDataStreamerExample.java | 9 +- .../examples/datagrid/CacheEventsExample.java | 9 +- .../examples/datagrid/CachePutGetExample.java | 10 +- .../datagrid/CacheTransactionExample.java | 8 +- .../hibernate/HibernateL2CacheExample.java | 5 +- .../starschema/CacheStarSchemaExample.java | 10 +- .../store/auto/CacheAutoStoreExample.java | 8 +- .../auto/CacheAutoStoreLoadDataExample.java | 5 +- .../datagrid/store/auto/CacheConfig.java | 4 +- .../store/dummy/CacheDummyStoreExample.java | 5 +- .../hibernate/CacheHibernateStoreExample.java | 5 +- .../store/jdbc/CacheJdbcStoreExample.java | 5 +- .../datastructures/IgniteQueueExample.java | 28 +- .../datastructures/IgniteSetExample.java | 30 +- .../streaming/StreamVisitorExample.java | 5 +- .../streaming/wordcount/CacheConfig.java | 5 + .../streaming/wordcount/QueryWords.java | 4 +- .../examples/MessagingExamplesSelfTest.java | 2 +- .../java8/examples/BasicExamplesSelfTest.java | 3 + .../java8/examples/CacheExamplesSelfTest.java | 4 + .../examples/CheckpointExamplesSelfTest.java | 3 + .../examples/ClusterGroupExampleSelfTest.java | 3 +- .../examples/ContinuationExamplesSelfTest.java | 3 + .../ContinuousMapperExamplesSelfTest.java | 4 +- .../DeploymentExamplesMultiNodeSelfTest.java | 2 + .../examples/DeploymentExamplesSelfTest.java | 2 + .../HibernateL2CacheExampleSelfTest.java | 3 + .../java8/examples/IgfsExamplesSelfTest.java | 3 + .../examples/LifecycleExamplesSelfTest.java | 3 + .../MemcacheRestExamplesMultiNodeSelfTest.java | 2 + .../examples/MemcacheRestExamplesSelfTest.java | 2 + .../examples/MessagingExamplesSelfTest.java | 4 +- .../examples/MonteCarloExamplesSelfTest.java | 3 + .../examples/SpringBeanExamplesSelfTest.java | 3 + .../java8/examples/TaskExamplesSelfTest.java | 2 + modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../client/ClientReconnectionSelfTest.java | 69 +- modules/codegen/pom.xml | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 1 - modules/core/pom.xml | 4 +- .../src/main/java/org/apache/ignite/Ignite.java | 11 + .../java/org/apache/ignite/IgniteCache.java | 26 +- .../java/org/apache/ignite/IgniteCluster.java | 11 +- .../java/org/apache/ignite/IgniteState.java | 2 +- .../apache/ignite/IgniteSystemProperties.java | 7 + .../apache/ignite/cache/query/ScanQuery.java | 2 +- .../ignite/cache/query/SqlFieldsQuery.java | 55 +- .../ignite/cluster/ClusterStartNodeResult.java | 46 + .../configuration/CacheConfiguration.java | 58 +- .../configuration/CollectionConfiguration.java | 114 ++- .../configuration/IgniteConfiguration.java | 35 +- .../ignite/internal/ClusterMetricsSnapshot.java | 385 +++------ .../internal/ComputeTaskInternalFuture.java | 2 +- .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridJobExecuteRequest.java | 10 +- .../ignite/internal/GridJobExecuteResponse.java | 4 +- .../ignite/internal/GridPluginComponent.java | 5 +- .../ignite/internal/GridPluginContext.java | 15 +- .../apache/ignite/internal/GridTaskMessage.java | 30 - .../ignite/internal/GridTaskSessionRequest.java | 6 +- .../apache/ignite/internal/IgniteKernal.java | 33 +- .../org/apache/ignite/internal/IgnitionEx.java | 175 ++-- .../ignite/internal/MarshallerContextImpl.java | 3 + .../client/GridClientConfiguration.java | 14 +- .../GridClientConnectionManagerAdapter.java | 2 +- .../router/GridTcpRouterConfiguration.java | 6 +- .../internal/cluster/ClusterGroupAdapter.java | 150 +++- .../cluster/ClusterStartNodeResultImpl.java | 87 ++ .../cluster/IgniteClusterAsyncImpl.java | 5 +- .../internal/cluster/IgniteClusterImpl.java | 37 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 42 +- .../eventstorage/GridEventStorageManager.java | 4 +- .../processors/GridProcessorAdapter.java | 5 +- .../affinity/GridAffinityProcessor.java | 5 +- .../processors/cache/CacheMetricsImpl.java | 7 +- .../processors/cache/CacheMetricsSnapshot.java | 223 ++++- .../processors/cache/CacheProjection.java | 298 +------ .../cache/DynamicCacheChangeRequest.java | 2 +- .../internal/processors/cache/GridCache.java | 1 - .../processors/cache/GridCacheAdapter.java | 640 +++++--------- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 64 +- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheExplicitLockSpan.java | 2 +- .../processors/cache/GridCacheIoManager.java | 87 +- .../processors/cache/GridCacheMapAdapter.java | 238 ----- .../processors/cache/GridCacheMapEntry.java | 6 +- .../processors/cache/GridCacheMessage.java | 7 + .../processors/cache/GridCacheMvcc.java | 2 +- .../cache/GridCacheMvccCandidate.java | 50 +- .../processors/cache/GridCacheMvccManager.java | 44 +- .../GridCachePartitionExchangeManager.java | 136 ++- .../processors/cache/GridCacheProcessor.java | 229 +++-- .../processors/cache/GridCacheProjectionEx.java | 129 --- .../cache/GridCacheProjectionImpl.java | 274 ++---- .../processors/cache/GridCacheProxyImpl.java | 451 ++-------- .../processors/cache/GridCacheSwapManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 28 - .../cache/GridLoadCacheCloseablePredicate.java | 30 + .../processors/cache/IgniteCacheProxy.java | 58 +- .../CacheDataStructuresManager.java | 4 +- .../GridDistributedCacheAdapter.java | 15 +- .../distributed/GridDistributedCacheEntry.java | 12 +- .../dht/GridDhtAffinityAssignmentRequest.java | 5 + .../dht/GridDhtAffinityAssignmentResponse.java | 5 + .../distributed/dht/GridDhtCacheAdapter.java | 45 +- .../distributed/dht/GridDhtCacheEntry.java | 36 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../dht/GridDhtTransactionalCacheAdapter.java | 19 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 +- .../cache/distributed/dht/GridDhtTxLocal.java | 2 + .../distributed/dht/GridDhtTxLocalAdapter.java | 30 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 28 +- .../dht/atomic/GridDhtAtomicCache.java | 123 +-- .../dht/colocated/GridDhtColocatedCache.java | 56 +- .../colocated/GridDhtColocatedLockFuture.java | 46 +- .../GridDhtPartitionsAbstractMessage.java | 15 +- .../GridDhtPartitionsExchangeFuture.java | 42 +- .../distributed/near/GridNearAtomicCache.java | 132 +-- .../distributed/near/GridNearCacheAdapter.java | 57 +- .../distributed/near/GridNearCacheEntry.java | 26 +- .../distributed/near/GridNearLockFuture.java | 13 +- .../near/GridNearTransactionalCache.java | 11 +- .../near/GridNearTxFinishFuture.java | 8 +- .../cache/distributed/near/GridNearTxLocal.java | 7 + .../near/GridNearTxPrepareFuture.java | 122 ++- .../near/GridNearTxPrepareRequest.java | 64 +- .../processors/cache/local/GridLocalCache.java | 16 +- .../cache/local/GridLocalLockFuture.java | 2 + .../local/atomic/GridLocalAtomicCache.java | 137 +-- .../CacheQueryCloseableScanBiPredicate.java | 30 + .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheQueryAdapter.java | 2 +- .../cache/query/GridCacheQueryManager.java | 8 +- .../continuous/CacheContinuousQueryManager.java | 30 +- .../cache/transactions/IgniteTxAdapter.java | 3 +- .../cache/transactions/IgniteTxHandler.java | 120 ++- .../transactions/IgniteTxLocalAdapter.java | 94 +- .../cache/transactions/IgniteTxManager.java | 7 + .../cache/version/GridCacheVersionEx.java | 2 +- .../cacheobject/IgniteCacheObjectProcessor.java | 5 +- .../IgniteCacheObjectProcessorImpl.java | 36 +- .../continuous/GridContinuousProcessor.java | 4 +- .../datastreamer/DataStreamerImpl.java | 8 +- .../CacheDataStructuresCacheKey.java | 62 ++ .../CacheDataStructuresConfigurationKey.java | 2 +- .../datastructures/DataStructuresProcessor.java | 238 ++++- .../GridAtomicCacheQueueImpl.java | 12 +- .../datastructures/GridCacheAtomicLongImpl.java | 16 +- .../GridCacheAtomicReferenceImpl.java | 4 +- .../GridCacheAtomicSequenceImpl.java | 2 +- .../GridCacheAtomicStampedImpl.java | 4 +- .../GridCacheCountDownLatchImpl.java | 2 +- .../datastructures/GridCacheQueueAdapter.java | 2 +- .../datastructures/GridCacheSetImpl.java | 4 +- .../GridTransactionalCacheQueueImpl.java | 8 +- .../internal/processors/igfs/IgfsAsyncImpl.java | 4 +- .../processors/igfs/IgfsDataManager.java | 6 +- .../ignite/internal/processors/igfs/IgfsEx.java | 4 +- .../processors/igfs/IgfsFileWorker.java | 180 ---- .../processors/igfs/IgfsFileWorkerBatch.java | 225 ++--- .../processors/igfs/IgfsFileWorkerTask.java | 32 - .../internal/processors/igfs/IgfsImpl.java | 150 ++-- .../processors/igfs/IgfsInputStreamImpl.java | 2 +- .../processors/igfs/IgfsMetaManager.java | 39 +- .../processors/igfs/IgfsOutputStreamImpl.java | 6 +- .../internal/processors/igfs/IgfsProcessor.java | 2 +- .../plugin/IgnitePluginProcessor.java | 71 +- .../query/GridQueryFieldMetadata.java | 2 +- .../processors/query/GridQueryProcessor.java | 89 +- .../processors/rest/GridRestProcessor.java | 33 +- .../handlers/cache/GridCacheCommandHandler.java | 14 +- .../security/GridSecurityProcessor.java | 13 +- .../processors/security/SecurityContext.java | 8 +- .../security/os/GridOsSecurityProcessor.java | 11 +- .../service/GridServiceProcessor.java | 13 +- .../processors/task/GridTaskProcessor.java | 11 +- .../ignite/internal/util/GridJavaProcess.java | 38 +- .../util/future/GridCompoundFuture.java | 9 +- .../internal/util/future/GridFutureAdapter.java | 20 +- .../ignite/internal/util/lang/GridFunc.java | 33 + .../util/lang/GridMetadataAwareAdapter.java | 2 +- .../util/nodestart/IgniteNodeCallable.java | 30 - .../util/nodestart/IgniteSshHelper.java | 2 +- .../util/nodestart/StartNodeCallable.java | 30 + .../ignite/internal/util/worker/GridWorker.java | 6 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../cache/VisorCacheAggregatedMetrics.java | 38 +- .../visor/cache/VisorCacheClearTask.java | 3 + .../visor/cache/VisorCacheConfiguration.java | 15 +- .../internal/visor/cache/VisorCacheMetrics.java | 53 +- .../cache/VisorCacheMetricsCollectorTask.java | 59 +- .../cache/VisorCacheQueryConfiguration.java | 9 - .../visor/cache/VisorCacheStopTask.java | 69 ++ .../internal/visor/log/VisorLogSearchTask.java | 12 +- .../visor/node/VisorNodeDataCollectorTask.java | 1 + .../node/VisorNodeEventsCollectorTask.java | 3 + .../node/VisorSegmentationConfiguration.java | 4 +- .../internal/visor/query/VisorQueryArg.java | 82 ++ .../visor/query/VisorQueryCleanupTask.java | 10 +- .../internal/visor/query/VisorQueryCursor.java | 96 +++ .../internal/visor/query/VisorQueryField.java | 66 +- .../internal/visor/query/VisorQueryJob.java | 174 ++++ .../visor/query/VisorQueryNextPageTask.java | 75 +- .../internal/visor/query/VisorQueryResult.java | 6 +- .../visor/query/VisorQueryResultEx.java | 16 +- .../internal/visor/query/VisorQueryTask.java | 283 +----- .../internal/visor/query/VisorQueryUtils.java | 55 +- .../internal/visor/util/VisorTaskUtils.java | 3 + .../ignite/plugin/CachePluginConfiguration.java | 2 +- .../org/apache/ignite/plugin/IgnitePlugin.java | 3 - .../ignite/plugin/PluginConfiguration.java | 10 +- .../org/apache/ignite/plugin/PluginContext.java | 7 +- .../apache/ignite/plugin/PluginProvider.java | 9 +- .../plugin/security/AuthenticationContext.java | 12 +- .../security/GridSecurityCredentials.java | 184 ---- .../GridSecurityCredentialsBasicProvider.java | 44 - .../GridSecurityCredentialsProvider.java | 44 - .../plugin/security/GridSecurityException.java | 58 -- .../plugin/security/GridSecurityPermission.java | 69 -- .../security/GridSecurityPermissionSet.java | 66 -- .../plugin/security/GridSecuritySubject.java | 62 -- .../security/GridSecuritySubjectType.java | 48 -- .../plugin/security/SecurityCredentials.java | 191 ++++ .../SecurityCredentialsBasicProvider.java | 44 + .../security/SecurityCredentialsProvider.java | 44 + .../plugin/security/SecurityException.java | 61 ++ .../plugin/security/SecurityPermission.java | 69 ++ .../plugin/security/SecurityPermissionSet.java | 66 ++ .../ignite/plugin/security/SecuritySubject.java | 62 ++ .../plugin/security/SecuritySubjectType.java | 48 ++ .../segmentation/GridSegmentationPolicy.java | 47 - .../segmentation/GridSegmentationResolver.java | 64 -- .../plugin/segmentation/SegmentationPolicy.java | 49 ++ .../segmentation/SegmentationResolver.java | 65 ++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../spi/discovery/DiscoveryMetricsProvider.java | 10 + .../spi/discovery/DiscoverySpiDataExchange.java | 5 +- .../DiscoverySpiNodeAuthenticator.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 45 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 147 +++- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 29 +- .../tcp/internal/TcpDiscoveryNode.java | 82 +- .../messages/TcpDiscoveryAbstractMessage.java | 24 +- .../messages/TcpDiscoveryAuthFailedMessage.java | 25 +- .../TcpDiscoveryCheckFailedMessage.java | 24 +- .../TcpDiscoveryClientReconnectMessage.java | 30 +- .../TcpDiscoveryCustomEventMessage.java | 32 +- .../messages/TcpDiscoveryDiscardMessage.java | 24 +- .../TcpDiscoveryDuplicateIdMessage.java | 24 +- .../messages/TcpDiscoveryHandshakeRequest.java | 8 - .../messages/TcpDiscoveryHandshakeResponse.java | 22 - .../messages/TcpDiscoveryHeartbeatMessage.java | 95 +- .../TcpDiscoveryJoinRequestMessage.java | 32 +- .../TcpDiscoveryLoopbackProblemMessage.java | 28 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 24 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 76 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 28 +- .../messages/TcpDiscoveryNodeLeftMessage.java | 8 - .../tcp/messages/TcpDiscoveryPingRequest.java | 25 +- .../tcp/messages/TcpDiscoveryPingResponse.java | 14 - .../TcpDiscoveryStatusCheckMessage.java | 30 +- .../ignite/startup/BasicWarmupClosure.java | 21 +- .../startup/cmdline/CommandLineStartup.java | 7 +- .../resources/META-INF/classnames.properties | 36 +- .../GridCacheAffinityBackupsSelfTest.java | 15 +- .../cache/IgniteWarmupClosureSelfTest.java | 82 ++ .../fair/GridFairAffinityFunctionSelfTest.java | 2 - .../IgniteFairAffinityDynamicCacheSelfTest.java | 97 +++ .../internal/GridLifecycleAwareSelfTest.java | 2 +- .../ignite/internal/GridProjectionSelfTest.java | 82 ++ .../ignite/internal/GridStartStopSelfTest.java | 8 +- .../CacheMetricsForClusterGroupSelfTest.java | 252 ++++++ .../GridCacheAbstractFailoverSelfTest.java | 10 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 61 +- .../GridCacheAbstractIteratorsSelfTest.java | 3 +- .../cache/GridCacheAbstractSelfTest.java | 10 +- .../cache/GridCacheBasicApiAbstractTest.java | 4 +- .../cache/GridCacheClearAllSelfTest.java | 2 +- .../cache/GridCacheDeploymentSelfTest.java | 9 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- ...CacheOffHeapMultiThreadedUpdateSelfTest.java | 47 +- .../processors/cache/GridCacheOffHeapTest.java | 4 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 23 +- .../cache/GridCachePutAllFailoverSelfTest.java | 12 +- .../processors/cache/GridCachePutAllTask.java | 23 +- .../cache/GridCacheReloadSelfTest.java | 3 +- .../GridCacheReturnValueTransferSelfTest.java | 15 +- .../cache/GridCacheSwapPreloadSelfTest.java | 5 +- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 32 + ...teCacheConfigurationDefaultTemplateTest.java | 111 +++ ...eCacheConfigurationTemplateNotFoundTest.java | 114 --- .../IgniteCacheConfigurationTemplateTest.java | 86 +- .../cache/IgniteCachePeekModesAbstractTest.java | 40 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 4 +- .../IgniteTxMultiThreadedAbstractTest.java | 5 +- ...actQueueFailoverDataConsistencySelfTest.java | 4 +- .../GridCacheQueueApiSelfAbstractTest.java | 80 ++ .../GridCacheQueueCleanupSelfTest.java | 11 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +- .../GridCacheSequenceApiSelfAbstractTest.java | 2 +- .../GridCacheSetAbstractSelfTest.java | 15 +- .../GridCacheSetFailoverAbstractSelfTest.java | 8 +- .../IgniteCollectionAbstractTest.java | 160 +--- .../IgniteDataStructureUniqueNameTest.java | 47 +- .../GridCacheLocalAtomicOffheapSetSelfTest.java | 32 + .../GridCacheLocalAtomicQueueApiSelfTest.java | 6 + .../local/GridCacheLocalAtomicSetSelfTest.java | 6 + .../GridCacheLocalOffheapQueueApiSelfTest.java | 31 + .../local/GridCacheLocalQueueApiSelfTest.java | 6 + .../local/GridCacheLocalSetSelfTest.java | 6 + ...artitionedAtomicOffheapQueueApiSelfTest.java | 32 + ...omicOffheapQueueCreateMultiNodeSelfTest.java | 32 + ...onedAtomicOffheapQueueMultiNodeSelfTest.java | 32 + ...dCachePartitionedAtomicQueueApiSelfTest.java | 6 + ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 + ...micQueueFailoverDataConsistencySelfTest.java | 6 + ...PartitionedAtomicQueueMultiNodeSelfTest.java | 6 + ...itionedAtomicQueueRotativeMultiNodeTest.java | 6 + ...chePartitionedAtomicSetFailoverSelfTest.java | 6 + ...rtitionedDataStructuresFailoverSelfTest.java | 6 + ...GridCachePartitionedNodeRestartSelfTest.java | 67 -- ...artitionedOffHeapValuesQueueApiSelfTest.java | 31 + ...achePartitionedOffHeapValuesSetSelfTest.java | 32 + ...edOffheapDataStructuresFailoverSelfTest.java | 34 + ...hePartitionedOffheapSetFailoverSelfTest.java | 32 + .../GridCachePartitionedQueueApiSelfTest.java | 6 + ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 10 +- ...nedQueueFailoverDataConsistencySelfTest.java | 6 + ...CachePartitionedQueueJoinedNodeSelfTest.java | 6 + ...dCachePartitionedQueueMultiNodeSelfTest.java | 6 + ...hePartitionedQueueRotativeMultiNodeTest.java | 6 + ...GridCachePartitionedSetFailoverSelfTest.java | 6 + .../GridCachePartitionedSetSelfTest.java | 6 + .../IgnitePartitionedSetNoBackupsSelfTest.java | 5 +- ...eplicatedDataStructuresFailoverSelfTest.java | 6 + .../GridCacheReplicatedQueueApiSelfTest.java | 11 + ...idCacheReplicatedQueueMultiNodeSelfTest.java | 6 + ...cheReplicatedQueueRotativeMultiNodeTest.java | 6 + .../GridCacheReplicatedSetSelfTest.java | 6 + .../GridCacheAbstractNodeRestartSelfTest.java | 23 +- .../distributed/GridCacheEventAbstractTest.java | 16 +- .../GridCacheMultiNodeAbstractTest.java | 13 +- .../GridCacheMultiNodeLockAbstractTest.java | 14 +- .../GridCacheNodeFailureAbstractTest.java | 15 +- .../IgniteCacheAtomicNodeJoinTest.java | 44 + .../IgniteCacheAtomicNodeRestartTest.java | 33 + .../IgniteCacheNodeJoinAbstractTest.java | 109 +++ .../IgniteCacheSystemTransactionsSelfTest.java | 4 +- .../distributed/IgniteCacheTxNodeJoinTest.java | 38 + .../dht/GridCacheDhtEntrySelfTest.java | 12 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 8 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +- .../dht/IgniteCacheLockFailoverSelfTest.java | 156 ++++ .../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +++++ .../near/GridCacheNearMultiNodeSelfTest.java | 26 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../GridCachePartitionedFullApiSelfTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 6 +- .../GridCachePartitionedNodeRestartTest.java | 1 + .../GridCachePartitionedTxSalvageSelfTest.java | 4 + .../near/IgniteCacheNearReadCommittedTest.java | 4 +- ...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 2 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 32 + ...CacheReplicatedPreloadLifecycleSelfTest.java | 5 +- .../GridCacheReplicatedPreloadSelfTest.java | 27 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 12 +- .../continuous/GridEventConsumeSelfTest.java | 10 +- .../processors/igfs/IgfsAbstractSelfTest.java | 24 +- .../tostring/GridToStringBuilderSelfTest.java | 5 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java | 4 +- ...ClusterMetricsSnapshotSerializeSelfTest.java | 28 + .../tcp/TcpClientDiscoverySelfTest.java | 5 +- .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 5 +- .../testframework/GridSpiTestContext.java | 4 +- .../testframework/junits/GridAbstractTest.java | 6 +- .../ignite/testframework/junits/IgniteMock.java | 5 + .../junits/common/GridCommonAbstractTest.java | 49 +- .../junits/spi/GridSpiAbstractTest.java | 76 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 10 + .../IgniteCacheFailoverTestSuite.java | 6 +- .../IgniteCacheMetricsSelfTestSuite.java | 4 + .../testsuites/IgniteCacheRestartTestSuite.java | 20 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 11 +- .../IgniteSpiDiscoverySelfTestSuite.java | 2 + ...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +- modules/extdata/p2p/pom.xml | 2 +- .../p2p/startcache/CacheAllNodesFilter.java | 31 + .../CacheConfigurationP2PTestClient.java | 118 +++ .../tests/p2p/startcache/Organization1.java | 52 ++ .../tests/p2p/startcache/Organization2.java | 52 ++ modules/extdata/uri/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 18 +- modules/hadoop/docs/hadoop_readme.pdf | Bin 82297 -> 82219 bytes modules/hadoop/pom.xml | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 2 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 2 +- modules/hibernate/pom.xml | 2 +- .../HibernateAccessStrategyAdapter.java | 4 +- .../hibernate/HibernateGeneralDataRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 2 +- .../HibernateReadWriteAccessStrategy.java | 8 +- .../ignite/cache/hibernate/HibernateRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 8 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +- .../processors/query/h2/sql/GridSqlElement.java | 8 - .../processors/query/h2/sql/GridSqlQuery.java | 183 ++++ .../query/h2/sql/GridSqlQueryParser.java | 121 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 129 ++- .../processors/query/h2/sql/GridSqlSelect.java | 209 ++--- .../query/h2/sql/GridSqlSubquery.java | 8 +- .../processors/query/h2/sql/GridSqlUnion.java | 134 +++ .../query/h2/twostep/GridMergeIndex.java | 17 +- .../h2/twostep/GridReduceQueryExecutor.java | 4 +- .../cache/CacheConfigurationP2PTest.java | 179 ++++ .../cache/CacheConfigurationP2PTestServer.java | 49 ++ .../GridCacheAbstractFieldsQuerySelfTest.java | 20 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 6 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 2 +- .../processors/cache/GridCacheSwapSelfTest.java | 5 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +- .../IgniteCacheCollocatedQuerySelfTest.java | 209 +++++ .../cache/IgniteCacheLargeResultSelfTest.java | 104 +++ ...CacheOffheapTieredMultithreadedSelfTest.java | 4 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../cache/IgniteCacheQueryIndexSelfTest.java | 3 +- .../IgniteCachePartitionedQuerySelfTest.java | 5 +- .../IgniteCacheReplicatedQuerySelfTest.java | 18 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 14 +- .../h2/sql/AbstractH2CompareQueryTest.java | 352 ++++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 856 ++++++++++++++++++ .../query/h2/sql/GridQueryParsingTest.java | 26 +- .../query/h2/sql/H2CompareBigQueryTest.java | 677 +++++++++++++++ .../query/h2/sql/IgniteVsH2QueryTest.java | 860 ------------------- .../IgniteCacheQuerySelfTestSuite.java | 8 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + .../processors/query/h2/sql/bigQuery.sql | 55 ++ modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- .../processors/cache/GridCacheJtaSelfTest.java | 6 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- .../http/jetty/GridJettyRestHandler.java | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- .../org/apache/ignite/IgniteSpringBean.java | 7 + .../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +- modules/ssh/pom.xml | 2 +- .../util/nodestart/IgniteNodeCallableImpl.java | 308 ------- .../util/nodestart/IgniteSshHelperImpl.java | 4 +- .../util/nodestart/StartNodeCallableImpl.java | 309 +++++++ ...gniteProjectionStartStopRestartSelfTest.java | 261 +++--- .../IgniteStartStopRestartTestSuite.java | 1 + modules/tools/pom.xml | 2 +- .../ignite/tools/classgen/ClassesGenerator.java | 2 +- .../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 +- modules/urideploy/README.txt | 2 +- modules/urideploy/licenses/edtftp-license.pdf | Bin 58355 -> 0 bytes modules/urideploy/licenses/jtidy-license.txt | 50 -- .../urideploy/licenses/jtidy-mit-license.txt | 50 ++ modules/urideploy/pom.xml | 8 +- .../spi/deployment/uri/UriDeploymentSpi.java | 182 ++-- .../uri/scanners/GridUriDeploymentScanner.java | 286 ------ .../GridUriDeploymentScannerListener.java | 2 +- .../uri/scanners/UriDeploymentScanner.java | 47 + .../scanners/UriDeploymentScannerContext.java | 92 ++ .../scanners/UriDeploymentScannerManager.java | 221 +++++ .../file/GridUriDeploymentFileScanner.java | 311 ------- .../scanners/file/UriDeploymentFileScanner.java | 327 +++++++ .../ftp/GridUriDeploymentFtpClient.java | 199 ----- .../ftp/GridUriDeploymentFtpConfiguration.java | 115 --- .../ftp/GridUriDeploymentFtpException.java | 43 - .../scanners/ftp/GridUriDeploymentFtpFile.java | 119 --- .../ftp/GridUriDeploymentFtpScanner.java | 234 ----- .../uri/scanners/ftp/package-info.java | 22 - .../http/GridUriDeploymentHttpScanner.java | 423 --------- .../scanners/http/UriDeploymentHttpScanner.java | 478 +++++++++++ ...loymentMultiScannersErrorThrottlingTest.java | 3 - .../GridUriDeploymentMultiScannersSelfTest.java | 3 +- .../GridFileDeploymentUndeploySelfTest.java | 4 +- .../uri/scanners/ftp/GridFtpDeploymentTest.java | 46 - .../uri/scanners/ftp/package-info.java | 22 - modules/visor-console/pom.xml | 2 +- .../ignite/visor/commands/VisorConsole.scala | 19 + .../commands/cache/VisorCacheCommand.scala | 423 +++++---- .../commands/cache/VisorCacheScanCommand.scala | 13 +- .../commands/cache/VisorCacheStopCommand.scala | 145 ++++ .../commands/start/VisorStartCommand.scala | 4 +- .../scala/org/apache/ignite/visor/visor.scala | 3 + modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 51 +- 520 files changed, 13718 insertions(+), 10189 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37d10683/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37d10683/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ----------------------------------------------------------------------
