Merge remote-tracking branch 'remotes/origin/ignite-6' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3024747b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3024747b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3024747b Branch: refs/heads/ignite-sql-tests Commit: 3024747bd06d77b7f885df91105b8433753259b4 Parents: bde630d 7a6a963 Author: sboikov <sboi...@gridgain.com> Authored: Thu Feb 5 14:45:41 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Feb 5 14:45:41 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../ignite/examples/CacheExamplesSelfTest.java | 14 +- .../rest/ClientMemcachedProtocolSelfTest.java | 8 +- .../JettyRestProcessorAbstractSelfTest.java | 21 +- .../rest/RestMemcacheProtocolSelfTest.java | 60 +- .../processors/rest/TestMemcacheClient.java | 11 +- .../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 ++ .../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 | 32 - .../java/org/apache/ignite/cache/GridCache.java | 14 - .../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 - .../IgniteAtomicConfiguration.java | 105 ++ .../IgniteCollectionConfiguration.java | 67 + .../configuration/IgniteConfiguration.java | 18 + .../DataStructureRemovedException.java | 61 + .../ignite/internal/GridKernalContext.java | 8 + .../ignite/internal/GridKernalContextImpl.java | 12 + .../apache/ignite/internal/IgniteKernal.java | 144 +- .../org/apache/ignite/internal/IgnitionEx.java | 80 +- .../processors/cache/GridCacheAdapter.java | 11 - .../processors/cache/GridCacheAttributes.java | 13 - .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheEventManager.java | 4 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 17 +- .../processors/cache/GridCacheProxyImpl.java | 12 - .../processors/cache/GridCacheUtils.java | 15 +- .../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 | 1593 ----------------- .../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 --- .../cache/query/GridCacheQueryAdapter.java | 2 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../cache/transactions/IgniteTxManager.java | 3 +- .../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/rest/GridRestCommand.java | 12 +- .../processors/rest/GridRestProcessor.java | 10 +- .../handlers/cache/GridCacheCommandHandler.java | 107 +- .../DataStructuresCommandHandler.java | 110 ++ .../tcp/GridTcpMemcachedNioListener.java | 64 +- .../rest/request/DataStructuresRequest.java | 74 + .../rest/request/GridRestCacheRequest.java | 37 +- .../visor/cache/VisorCacheConfiguration.java | 2 - .../ignite/internal/GridAffinitySelfTest.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 14 +- ...idCacheConfigurationConsistencySelfTest.java | 5 +- .../GridCacheQueryInternalKeysSelfTest.java | 4 +- .../GridCacheReferenceCleanupSelfTest.java | 2 +- ...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 + .../IgniteCrossCacheTxStoreSelfTest.java | 13 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 38 +- .../local/GridCacheLocalFullApiSelfTest.java | 5 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 3 +- .../cache/GridCacheDataStructuresLoadTest.java | 203 ++- .../GridCachePartitionedAtomicLongLoadTest.java | 15 +- .../loadtests/dsi/GridDsiLifecycleBean.java | 2 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 7 +- .../loadtests/hashmap/GridCacheTestContext.java | 2 +- .../marshaller/GridMarshallerAbstractTest.java | 32 - .../ignite/testframework/junits/IgniteMock.java | 50 + .../IgniteCacheDataStructuresSelfTestSuite.java | 13 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 130 +- .../http/jetty/GridJettyRestHandler.java | 23 +- .../tests/ScalarAffinityRoutingSpec.scala | 5 +- .../org/apache/ignite/IgniteSpringBean.java | 65 + 230 files changed, 15886 insertions(+), 15063 deletions(-) ----------------------------------------------------------------------
