Merge branch 'sprint-1' into ignite-160
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/007fdb9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/007fdb9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/007fdb9c Branch: refs/heads/ignite-160 Commit: 007fdb9c0af517e32ce707a4768a7dcdd011a2c1 Parents: 6416777 bb8b07d Author: nikolay_tikhonov <[email protected]> Authored: Thu Feb 5 19:20:31 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Thu Feb 5 19:20:31 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 2 +- .../datagrid/CacheContinuousQueryExample.java | 2 +- .../datastructures/CacheAtomicLongExample.java | 78 - .../CacheAtomicReferenceExample.java | 126 -- .../CacheAtomicSequenceExample.java | 112 -- .../CacheAtomicStampedExample.java | 132 -- .../CacheCountDownLatchExample.java | 112 -- .../datastructures/CacheQueueExample.java | 214 --- .../datastructures/CacheSetExample.java | 193 -- .../datastructures/IgniteAtomicLongExample.java | 74 + .../IgniteAtomicReferenceExample.java | 110 ++ .../IgniteAtomicSequenceExample.java | 96 + .../IgniteAtomicStampedExample.java | 117 ++ .../IgniteCountDownLatchExample.java | 96 + .../datastructures/IgniteQueueExample.java | 206 +++ .../datastructures/IgniteSetExample.java | 186 ++ .../client/memcache/MemcacheRestExample.java | 3 +- .../examples/ScalarCacheAffinityExample1.scala | 2 +- .../examples/ScalarCacheAffinityExample2.scala | 2 +- .../ScalarCacheAffinitySimpleExample.scala | 2 +- .../scalar/examples/ScalarCacheExample.scala | 2 +- .../ScalarCachePopularNumbersExample.scala | 4 +- .../examples/ScalarCacheQueryExample.scala | 2 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- .../ignite/examples/CacheExamplesSelfTest.java | 14 +- .../ClientAbstractMultiThreadedSelfTest.java | 2 +- .../integration/ClientAbstractSelfTest.java | 4 +- .../ClientTcpUnreachableMultiNodeSelfTest.java | 12 - .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../rest/ClientMemcachedProtocolSelfTest.java | 8 +- .../JettyRestProcessorAbstractSelfTest.java | 21 +- .../rest/RestBinaryProtocolSelfTest.java | 6 +- .../rest/RestMemcacheProtocolSelfTest.java | 66 +- .../processors/rest/TestMemcacheClient.java | 11 +- .../loadtests/client/ClientTcpSslLoadTest.java | 7 +- .../src/main/java/org/apache/ignite/Ignite.java | 101 ++ .../org/apache/ignite/IgniteAtomicLong.java | 163 ++ .../apache/ignite/IgniteAtomicReference.java | 99 ++ .../org/apache/ignite/IgniteAtomicSequence.java | 136 ++ .../org/apache/ignite/IgniteAtomicStamped.java | 128 ++ .../java/org/apache/ignite/IgniteCache.java | 16 +- .../org/apache/ignite/IgniteCountDownLatch.java | 232 +++ .../java/org/apache/ignite/IgniteQueue.java | 185 ++ .../main/java/org/apache/ignite/IgniteSet.java | 107 ++ .../apache/ignite/cache/CacheConfiguration.java | 95 - .../org/apache/ignite/cache/CacheEntry.java | 5 +- .../apache/ignite/cache/CacheEntryEvent.java | 75 - .../org/apache/ignite/cache/CachePeekMode.java | 12 +- .../apache/ignite/cache/CacheProjection.java | 52 +- .../java/org/apache/ignite/cache/GridCache.java | 14 - .../apache/ignite/cache/GridCachePeekMode.java | 85 - .../cache/datastructures/CacheAtomicLong.java | 157 -- .../datastructures/CacheAtomicReference.java | 93 - .../datastructures/CacheAtomicSequence.java | 130 -- .../datastructures/CacheAtomicStamped.java | 121 -- .../datastructures/CacheCountDownLatch.java | 226 --- .../CacheDataStructureInvalidException.java | 66 - ...cheDataStructureInvalidRuntimeException.java | 66 - .../CacheDataStructureRemovedException.java | 61 - ...cheDataStructureRemovedRuntimeException.java | 61 - .../datastructures/CacheDataStructures.java | 220 --- .../ignite/cache/datastructures/CacheQueue.java | 182 -- .../ignite/cache/datastructures/CacheSet.java | 61 - .../ignite/cache/datastructures/package.html | 24 - .../eviction/fifo/CacheFifoEvictionPolicy.java | 1 + .../random/CacheRandomEvictionPolicy.java | 1 + .../cache/query/CacheContinuousQuery.java | 61 +- .../cache/query/CacheQueryGroupIndex.java | 9 - .../ignite/cache/query/CacheQuerySqlField.java | 10 - .../query/annotations/QueryGroupIndex.java | 9 - .../cache/query/annotations/QuerySqlField.java | 10 - .../ignite/cache/store/CacheLocalStore.java | 31 - .../cache/store/CacheStoreBalancingWrapper.java | 296 ---- .../cache/store/jdbc/dialect/package.html | 2 +- .../apache/ignite/client/GridClientNode.java | 24 - .../ignite/client/GridClientProtocol.java | 4 - .../ignite/client/impl/GridClientNodeImpl.java | 15 - .../IgniteAtomicConfiguration.java | 105 ++ .../IgniteCollectionConfiguration.java | 67 + .../configuration/IgniteConfiguration.java | 18 + .../DataStructureRemovedException.java | 61 + .../apache/ignite/events/IgniteEventType.java | 120 -- .../apache/ignite/internal/GridComponent.java | 19 + .../ignite/internal/GridJobExecuteRequest.java | 95 +- .../ignite/internal/GridKernalContext.java | 8 + .../ignite/internal/GridKernalContextImpl.java | 12 + .../ignite/internal/GridNodeAttributes.java | 4 - .../ignite/internal/GridPluginComponent.java | 9 +- .../apache/ignite/internal/IgniteKernal.java | 144 +- .../org/apache/ignite/internal/IgnitionEx.java | 80 +- .../internal/managers/GridManagerAdapter.java | 7 +- .../managers/GridNoopManagerAdapter.java | 5 + .../discovery/GridDiscoveryManager.java | 90 +- .../processors/GridProcessorAdapter.java | 5 + .../affinity/GridAffinityAssignmentCache.java | 23 +- .../processors/cache/CacheEntryEvent.java | 75 + .../processors/cache/CacheInvokeEntry.java | 12 +- .../cache/CacheStoreBalancingWrapper.java | 297 ++++ .../processors/cache/GridCacheAdapter.java | 307 +++- .../processors/cache/GridCacheAttributes.java | 42 +- .../cache/GridCacheClearAllRunnable.java | 12 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 6 +- .../cache/GridCacheDeploymentManager.java | 4 +- .../processors/cache/GridCacheEntryEx.java | 14 + .../processors/cache/GridCacheEntryImpl.java | 4 +- .../processors/cache/GridCacheEntrySet.java | 2 +- .../processors/cache/GridCacheEventManager.java | 4 +- .../cache/GridCacheEvictionEntry.java | 2 +- .../cache/GridCacheFilterEvaluationEntry.java | 2 +- .../processors/cache/GridCacheKeySet.java | 2 +- .../processors/cache/GridCacheMapAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 50 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCachePeekMode.java | 85 + .../processors/cache/GridCacheProcessor.java | 31 +- .../cache/GridCacheProjectionImpl.java | 30 +- .../processors/cache/GridCacheProxyImpl.java | 56 +- .../processors/cache/GridCacheStoreManager.java | 1 + .../processors/cache/GridCacheSwapManager.java | 48 +- .../processors/cache/GridCacheUtils.java | 19 +- .../cache/GridCacheValueCollection.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 51 +- .../CacheDataStructuresManager.java | 719 ++++++++ .../GridAtomicCacheQueueImpl.java | 255 --- .../GridCacheAnnotationHelper.java | 240 --- .../datastructures/GridCacheAtomicLongEx.java | 32 - .../datastructures/GridCacheAtomicLongImpl.java | 527 ------ .../GridCacheAtomicLongValue.java | 84 - .../GridCacheAtomicReferenceEx.java | 32 - .../GridCacheAtomicReferenceImpl.java | 319 ---- .../GridCacheAtomicReferenceValue.java | 106 -- .../GridCacheAtomicSequenceEx.java | 32 - .../GridCacheAtomicSequenceImpl.java | 517 ------ .../GridCacheAtomicSequenceValue.java | 84 - .../GridCacheAtomicStampedEx.java | 32 - .../GridCacheAtomicStampedImpl.java | 349 ---- .../GridCacheAtomicStampedValue.java | 135 -- .../GridCacheCountDownLatchEx.java | 39 - .../GridCacheCountDownLatchImpl.java | 359 ---- .../GridCacheCountDownLatchValue.java | 115 -- .../GridCacheDataStructuresImpl.java | 119 -- .../GridCacheDataStructuresManager.java | 1592 ----------------- .../GridCacheDataStructuresProxy.java | 267 --- .../datastructures/GridCacheInternalKey.java | 31 - .../GridCacheInternalKeyImpl.java | 89 - .../datastructures/GridCacheQueueAdapter.java | 1022 ----------- .../datastructures/GridCacheQueueHeader.java | 199 --- .../datastructures/GridCacheQueueHeaderKey.java | 88 - .../datastructures/GridCacheQueueItemKey.java | 121 -- .../datastructures/GridCacheQueueProxy.java | 746 -------- .../datastructures/GridCacheRemovable.java | 37 - .../datastructures/GridCacheSetHeader.java | 85 - .../datastructures/GridCacheSetHeaderKey.java | 88 - .../cache/datastructures/GridCacheSetImpl.java | 576 ------ .../datastructures/GridCacheSetItemKey.java | 109 -- .../cache/datastructures/GridCacheSetProxy.java | 537 ------ .../datastructures/GridSetQueryPredicate.java | 115 -- .../GridTransactionalCacheQueueImpl.java | 240 --- .../GridDistributedCacheAdapter.java | 134 ++ .../GridPartitionedCacheEntryImpl.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../distributed/dht/GridDhtCacheEntryImpl.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 10 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 18 +- .../near/GridNearCacheClearAllRunnable.java | 2 +- .../distributed/near/GridNearTxRemote.java | 2 +- .../processors/cache/local/GridLocalCache.java | 6 + .../local/atomic/GridLocalAtomicCache.java | 6 +- .../query/GridCacheDistributedQueryManager.java | 2 - .../cache/query/GridCacheQueryAdapter.java | 2 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../GridCacheContinuousQueryAdapter.java | 125 +- .../GridCacheContinuousQueryHandler.java | 15 +- .../GridCacheContinuousQueryManager.java | 19 +- .../processors/cache/store/CacheLocalStore.java | 31 + .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxEntry.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 3 +- .../continuous/GridContinuousProcessor.java | 20 +- .../dataload/GridDataLoadCacheUpdaters.java | 12 +- .../dataload/IgniteDataLoaderImpl.java | 27 +- .../CacheDataStructuresConfigurationKey.java | 62 + .../datastructures/DataStructuresProcessor.java | 1662 ++++++++++++++++++ .../GridAtomicCacheQueueImpl.java | 255 +++ .../GridCacheAnnotationHelper.java | 240 +++ .../datastructures/GridCacheAtomicLongEx.java | 32 + .../datastructures/GridCacheAtomicLongImpl.java | 554 ++++++ .../GridCacheAtomicLongValue.java | 84 + .../GridCacheAtomicReferenceEx.java | 32 + .../GridCacheAtomicReferenceImpl.java | 340 ++++ .../GridCacheAtomicReferenceValue.java | 106 ++ .../GridCacheAtomicSequenceEx.java | 32 + .../GridCacheAtomicSequenceImpl.java | 556 ++++++ .../GridCacheAtomicSequenceValue.java | 84 + .../GridCacheAtomicStampedEx.java | 32 + .../GridCacheAtomicStampedImpl.java | 380 ++++ .../GridCacheAtomicStampedValue.java | 135 ++ .../GridCacheCountDownLatchEx.java | 39 + .../GridCacheCountDownLatchImpl.java | 394 +++++ .../GridCacheCountDownLatchValue.java | 115 ++ .../datastructures/GridCacheInternalKey.java | 31 + .../GridCacheInternalKeyImpl.java | 89 + .../datastructures/GridCacheQueueAdapter.java | 1038 +++++++++++ .../datastructures/GridCacheQueueHeader.java | 199 +++ .../datastructures/GridCacheQueueHeaderKey.java | 88 + .../datastructures/GridCacheQueueItemKey.java | 121 ++ .../datastructures/GridCacheQueueProxy.java | 771 ++++++++ .../datastructures/GridCacheRemovable.java | 37 + .../datastructures/GridCacheSetHeader.java | 85 + .../datastructures/GridCacheSetHeaderKey.java | 88 + .../datastructures/GridCacheSetImpl.java | 595 +++++++ .../datastructures/GridCacheSetItemKey.java | 109 ++ .../datastructures/GridCacheSetProxy.java | 563 ++++++ .../datastructures/GridSetQueryPredicate.java | 116 ++ .../GridTransactionalCacheQueueImpl.java | 240 +++ .../processors/fs/GridGgfsAttributes.java | 8 +- .../internal/processors/fs/GridGgfsPaths.java | 8 +- .../plugin/IgnitePluginProcessor.java | 40 + .../portable/GridPortableInputStream.java | 7 + .../processors/query/GridQueryProcessor.java | 2 +- .../processors/rest/GridRestCommand.java | 12 +- .../processors/rest/GridRestProcessor.java | 10 +- .../client/message/GridClientCacheRequest.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 107 +- .../DataStructuresCommandHandler.java | 110 ++ .../tcp/GridTcpMemcachedNioListener.java | 64 +- .../rest/request/DataStructuresRequest.java | 74 + .../rest/request/GridRestCacheRequest.java | 37 +- .../internal/util/GridConfigurationFinder.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 37 +- .../apache/ignite/internal/util/typedef/X.java | 19 - .../visor/cache/VisorCacheClearTask.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 2 - .../segmentation/GridSegmentationPolicy.java | 1 - .../apache/ignite/portables/PortableObject.java | 14 - .../ignite/spi/discovery/DiscoverySpi.java | 4 +- .../spi/discovery/DiscoverySpiDataExchange.java | 4 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 31 +- .../TcpDiscoveryJoinRequestMessage.java | 10 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 24 +- .../store/GridCacheBalancingStoreSelfTest.java | 1 + .../ignite/internal/GridAffinitySelfTest.java | 2 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 22 - .../cache/GridCacheAbstractFullApiSelfTest.java | 184 +- .../GridCacheAbstractProjectionSelfTest.java | 31 +- .../cache/GridCacheAbstractSelfTest.java | 12 +- .../cache/GridCacheAbstractTxReadTest.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 8 +- ...acheBasicStoreMultithreadedAbstractTest.java | 2 +- .../cache/GridCacheClearAllSelfTest.java | 32 +- .../GridCacheConcurrentTxMultiNodeTest.java | 22 +- ...idCacheConfigurationConsistencySelfTest.java | 5 +- ...idCacheGetAndTransformStoreAbstractTest.java | 4 +- .../cache/GridCacheGlobalClearAllSelfTest.java | 6 +- .../cache/GridCacheOffHeapSelfTest.java | 2 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- .../GridCacheQueryInternalKeysSelfTest.java | 4 +- .../GridCacheReferenceCleanupSelfTest.java | 2 +- .../processors/cache/GridCacheTestEntryEx.java | 6 + .../processors/cache/GridCacheTestValue.java | 2 +- .../GridCacheWriteBehindStoreAbstractTest.java | 6 +- .../cache/IgniteCacheAtomicLocalPeekTest.java | 43 + .../cache/IgniteCacheAtomicPeekTest.java | 49 + .../IgniteCacheAtomicReplicatedPeekTest.java | 32 + .../cache/IgniteCachePeekAbstractTest.java | 333 ++++ .../cache/IgniteCacheTxLocalPeekTest.java | 43 + .../processors/cache/IgniteCacheTxPeekTest.java | 49 + .../cache/IgniteCacheTxReplicatedPeekTest.java | 32 + ...eAbstractDataStructuresFailoverSelfTest.java | 424 ++--- ...actQueueFailoverDataConsistencySelfTest.java | 79 +- .../GridCacheAtomicLongApiSelfTest.java | 484 ----- ...CacheAtomicReferenceApiSelfAbstractTest.java | 137 +- ...cheAtomicReferenceMultiNodeAbstractTest.java | 61 +- ...idCacheAtomicStampedApiSelfAbstractTest.java | 57 +- .../GridCacheCountDownLatchSelfTest.java | 410 ----- .../GridCacheMultiNodeDataStructureTest.java | 7 +- .../GridCacheQueueApiSelfAbstractTest.java | 250 +-- .../GridCacheQueueCleanupSelfTest.java | 50 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 34 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 188 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 137 +- ...CacheQueueRotativeMultiNodeAbstractTest.java | 149 +- .../GridCacheSequenceApiSelfAbstractTest.java | 200 ++- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 40 +- .../GridCacheSetAbstractSelfTest.java | 272 ++- .../GridCacheSetFailoverAbstractSelfTest.java | 38 +- .../IgniteAtomicLongApiAbstractSelfTest.java | 267 +++ .../IgniteAtomicsAbstractTest.java | 83 + .../IgniteCollectionAbstractTest.java | 255 +++ .../IgniteCountDownLatchAbstractSelfTest.java | 270 +++ .../IgniteDataStructureUniqueNameTest.java | 356 ++++ .../GridCacheLocalAtomicQueueApiSelfTest.java | 11 +- .../local/GridCacheLocalAtomicSetSelfTest.java | 4 +- .../local/GridCacheLocalQueueApiSelfTest.java | 19 +- .../GridCacheLocalSequenceApiSelfTest.java | 17 +- .../local/GridCacheLocalSetSelfTest.java | 8 +- .../local/IgniteLocalAtomicLongApiSelfTest.java | 33 + .../IgniteLocalCountDownLatchSelfTest.java | 95 + ...dCachePartitionedAtomicQueueApiSelfTest.java | 13 +- ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 10 +- ...micQueueFailoverDataConsistencySelfTest.java | 2 +- ...PartitionedAtomicQueueMultiNodeSelfTest.java | 13 +- ...itionedAtomicQueueRotativeMultiNodeTest.java | 13 +- ...hePartitionedAtomicReferenceApiSelfTest.java | 19 +- ...PartitionedAtomicReferenceMultiNodeTest.java | 19 +- ...titionedAtomicSequenceMultiThreadedTest.java | 102 +- ...chePartitionedAtomicSetFailoverSelfTest.java | 8 +- .../GridCachePartitionedAtomicSetSelfTest.java | 21 +- ...achePartitionedAtomicStampedApiSelfTest.java | 23 +- ...rtitionedDataStructuresFailoverSelfTest.java | 8 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 19 +- .../GridCachePartitionedQueueApiSelfTest.java | 25 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 50 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 53 +- ...nedQueueFailoverDataConsistencySelfTest.java | 7 + ...CachePartitionedQueueJoinedNodeSelfTest.java | 25 +- ...dCachePartitionedQueueMultiNodeSelfTest.java | 23 +- ...hePartitionedQueueRotativeMultiNodeTest.java | 24 +- ...GridCachePartitionedSequenceApiSelfTest.java | 24 +- ...chePartitionedSequenceMultiNodeSelfTest.java | 25 +- ...GridCachePartitionedSetFailoverSelfTest.java | 6 +- .../GridCachePartitionedSetSelfTest.java | 8 +- .../IgnitePartitionedAtomicLongApiSelfTest.java | 33 + ...IgnitePartitionedCountDownLatchSelfTest.java | 33 + .../IgnitePartitionedSetNoBackupsSelfTest.java | 68 + ...cheReplicatedAtomicReferenceApiSelfTest.java | 16 +- ...eReplicatedAtomicReferenceMultiNodeTest.java | 16 +- ...CacheReplicatedAtomicStampedApiSelfTest.java | 15 +- ...eplicatedDataStructuresFailoverSelfTest.java | 8 +- .../GridCacheReplicatedQueueApiSelfTest.java | 22 +- ...idCacheReplicatedQueueMultiNodeSelfTest.java | 22 +- ...cheReplicatedQueueRotativeMultiNodeTest.java | 22 +- .../GridCacheReplicatedSequenceApiSelfTest.java | 17 +- ...acheReplicatedSequenceMultiNodeSelfTest.java | 19 +- .../GridCacheReplicatedSetSelfTest.java | 8 +- .../IgniteReplicatedAtomicLongApiSelfTest.java | 33 + .../IgniteReplicatedCountDownLatchSelfTest.java | 33 + .../GridCacheBasicOpAbstractTest.java | 2 +- .../distributed/GridCacheLockAbstractTest.java | 21 + .../GridCacheMultiNodeAbstractTest.java | 2 +- .../GridCacheMultiNodeLockAbstractTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 13 +- ...heAbstractTransformWriteThroughSelfTest.java | 2 +- .../dht/GridCacheDhtEntrySelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../dht/GridCacheDhtEvictionSelfTest.java | 2 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 40 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 16 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 8 +- .../near/GridCacheNearMultiNodeSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 20 +- .../GridCacheNearPartitionedClearSelfTest.java | 4 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 5 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../cache/eviction/GridCacheMockEntry.java | 1 + .../local/GridCacheLocalFullApiSelfTest.java | 5 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 3 +- ...dCacheContinuousQueryReplicatedSelfTest.java | 69 +- .../fs/GridGgfsDataManagerSelfTest.java | 4 +- .../loadtests/cache/GridCacheBenchmark.java | 2 +- .../cache/GridCacheDataStructuresLoadTest.java | 203 ++- .../loadtests/cache/GridCacheLoadTest.java | 2 +- .../GridCacheWriteBehindStoreLoadTest.java | 2 +- .../GridContinuousOperationsLoadTest.java | 9 +- .../GridCachePartitionedAtomicLongLoadTest.java | 15 +- .../loadtests/dsi/GridDsiLifecycleBean.java | 2 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 7 +- .../loadtests/hashmap/GridCacheTestContext.java | 2 +- .../ignite/loadtests/mapper/TestObject.java | 2 +- .../marshaller/GridMarshallerAbstractTest.java | 32 - .../GridAbstractDiscoverySelfTest.java | 6 +- .../GridTcpDiscoverySpiStartStopSelfTest.java | 4 +- .../ignite/testframework/junits/IgniteMock.java | 50 + .../junits/spi/GridSpiAbstractTest.java | 6 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 13 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 7 + .../hadoop/jobtracker/GridHadoopJobTracker.java | 43 +- .../GridHibernateAccessStrategyAdapter.java | 4 +- ...idHibernateL2CacheConfigurationSelfTest.java | 2 +- .../hibernate/GridHibernateL2CacheSelfTest.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 134 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +- .../cache/GridCacheQueryLoadSelfTest.java | 13 +- .../GridCacheQueryMultiThreadedSelfTest.java | 12 +- .../cache/GridCacheQueryTestValue.java | 2 +- .../processors/cache/GridCacheSwapSelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 2 +- .../http/jetty/GridJettyRestHandler.java | 23 +- .../tests/ScalarAffinityRoutingSpec.scala | 5 +- .../org/apache/ignite/IgniteSpringBean.java | 65 + .../cache/VisorCacheCompactCommandSpec.scala | 4 +- pom.xml | 6 +- 399 files changed, 18279 insertions(+), 16871 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index c6e5e8d,a38cba8..ba5709e --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@@ -522,19 -529,10 +522,22 @@@ public class IgniteConfiguration /** */ private IgniteQueryConfiguration qryCfg; + private CommunicationSpi communicationSpi; + private CheckpointSpi[] checkpointSpi; + private DiscoverySpi discoverySpi; + private EventStorageSpi eventStorageSpi; + private AuthenticationSpi authenticationSpi; + private SecureSessionSpi secureSessionSpi; + private DeploymentSpi deploymentSpi; + private FailoverSpi[] failoverSpi; + private CollisionSpi collisionSpi; + private LoadBalancingSpi[] loadBalancingSpi; + private SwapSpaceSpi swapSpaceSpi; + private GridIndexingSpi indexingSpi; + /** */ + private IgniteAtomicConfiguration atomicCfg = new IgniteAtomicConfiguration(); + /** * Creates valid grid configuration with all default values. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGlobalClearAllSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/007fdb9c/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala ----------------------------------------------------------------------
