Merge branch 'sprint-1' into ignite-175 Conflicts: examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicReferenceExample.java examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicStampedExample.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.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/8e30fc19 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e30fc19 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e30fc19 Branch: refs/heads/ignite-164v2stable Commit: 8e30fc1933cea4a45931780e2619431310635f91 Parents: a82c8ea 53760d1 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 6 11:19:55 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 6 11:19:55 2015 +0300 ---------------------------------------------------------------------- .gitignore | 1 + 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 ++ .../MessagingPingPongListenActorExample.java | 4 +- .../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/test/resources/spring-server-node.xml | 6 +- .../test/resources/spring-server-ssl-node.xml | 6 +- .../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 | 38 +- .../org/apache/ignite/IgniteCountDownLatch.java | 232 +++ .../java/org/apache/ignite/IgnitePortables.java | 4 +- .../java/org/apache/ignite/IgniteQueue.java | 185 ++ .../main/java/org/apache/ignite/IgniteSet.java | 107 ++ .../apache/ignite/cache/CacheConfiguration.java | 118 +- .../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 +- .../ignite/cache/CacheTypeFieldMetadata.java | 145 ++ .../apache/ignite/cache/CacheTypeMetadata.java | 330 ++++ .../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/CacheQueryConfiguration.java | 23 - .../cache/query/CacheQueryGroupIndex.java | 9 - .../ignite/cache/query/CacheQuerySqlField.java | 10 - .../cache/query/CacheQueryTypeMetadata.java | 196 --- .../query/annotations/QueryGroupIndex.java | 9 - .../cache/query/annotations/QuerySqlField.java | 10 - .../ignite/cache/store/CacheLocalStore.java | 31 - .../apache/ignite/cache/store/CacheStore.java | 2 +- .../cache/store/CacheStoreBalancingWrapper.java | 296 ---- .../store/jdbc/CacheAbstractJdbcStore.java | 1560 ++++++++++++++++ .../cache/store/jdbc/CacheJdbcPojoStore.java | 205 +++ .../store/jdbc/dialect/BasicJdbcDialect.java | 274 +++ .../cache/store/jdbc/dialect/DB2Dialect.java | 68 + .../cache/store/jdbc/dialect/H2Dialect.java | 41 + .../cache/store/jdbc/dialect/JdbcDialect.java | 117 ++ .../cache/store/jdbc/dialect/MySQLDialect.java | 48 + .../cache/store/jdbc/dialect/OracleDialect.java | 72 + .../store/jdbc/dialect/SQLServerDialect.java | 67 + .../cache/store/jdbc/dialect/package.html | 24 + .../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 | 57 +- .../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/GridCacheQueriesProxy.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 | 38 +- .../processors/rest/GridRestCommand.java | 12 +- .../processors/rest/GridRestProcessor.java | 12 +- .../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 - .../IgniteOptimizedObjectInputStream.java | 2 + .../ignite/messaging/MessagingListenActor.java | 18 +- .../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 +- .../core/src/test/config/store/jdbc/Ignite.xml | 101 ++ .../store/GridCacheBalancingStoreSelfTest.java | 1 + .../CacheJdbcPojoStoreMultitreadedSelfTest.java | 35 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 702 ++++++++ ...eJdbcStoreAbstractMultithreadedSelfTest.java | 197 +++ .../cache/store/jdbc/model/Organization.java | 155 ++ .../cache/store/jdbc/model/OrganizationKey.java | 97 + .../ignite/cache/store/jdbc/model/Person.java | 155 ++ .../cache/store/jdbc/model/PersonKey.java | 97 + .../ignite/cache/store/jdbc/model/package.html | 24 + .../ignite/internal/GridAffinitySelfTest.java | 2 +- .../internal/GridListenActorSelfTest.java | 11 +- ...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 | 273 ++- .../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 +- modules/schema-load/pom.xml | 107 ++ .../main/java/media/data_connection_48x48.png | Bin 0 -> 4443 bytes .../src/main/java/media/error_48x48.png | Bin 0 -> 4349 bytes .../src/main/java/media/ignite_128x128.png | Bin 0 -> 4917 bytes .../src/main/java/media/ignite_16x16.png | Bin 0 -> 608 bytes .../src/main/java/media/ignite_24x24.png | Bin 0 -> 930 bytes .../src/main/java/media/ignite_32x32.png | Bin 0 -> 1203 bytes .../src/main/java/media/ignite_48x48.png | Bin 0 -> 1868 bytes .../src/main/java/media/ignite_64x64.png | Bin 0 -> 2453 bytes .../src/main/java/media/information_48x48.png | Bin 0 -> 4102 bytes .../src/main/java/media/question_48x48.png | Bin 0 -> 3857 bytes .../src/main/java/media/sign_warning_48x48.png | Bin 0 -> 2988 bytes .../schema-load/src/main/java/media/style.css | 95 + .../src/main/java/media/text_tree_48x48.png | Bin 0 -> 2567 bytes .../ignite/schema/generator/PojoGenerator.java | 415 +++++ .../ignite/schema/generator/XmlGenerator.java | 341 ++++ .../ignite/schema/model/PojoDescriptor.java | 508 ++++++ .../apache/ignite/schema/model/PojoField.java | 421 +++++ .../schema/parser/DatabaseMetadataParser.java | 105 ++ .../apache/ignite/schema/parser/DbColumn.java | 76 + .../apache/ignite/schema/parser/DbTable.java | 105 ++ .../parser/dialect/DB2MetadataDialect.java | 30 + .../parser/dialect/DatabaseMetadataDialect.java | 78 + .../parser/dialect/JdbcMetadataDialect.java | 144 ++ .../parser/dialect/OracleMetadataDialect.java | 257 +++ .../ignite/schema/ui/ConfirmCallable.java | 81 + .../org/apache/ignite/schema/ui/Controls.java | 661 +++++++ .../org/apache/ignite/schema/ui/GridPaneEx.java | 177 ++ .../org/apache/ignite/schema/ui/MessageBox.java | 233 +++ .../apache/ignite/schema/ui/ModalDialog.java | 50 + .../apache/ignite/schema/ui/SchemaLoadApp.java | 1395 +++++++++++++++ .../ignite/schema/ui/TextColumnValidator.java | 32 + .../schema/load/AbstractSchemaLoaderTest.java | 134 ++ .../load/generator/PojoGeneratorTest.java | 70 + .../schema/load/generator/XmlGeneratorTest.java | 50 + .../apache/ignite/schema/load/model/Ignite.xml | 321 ++++ .../apache/ignite/schema/load/model/Objects.txt | 502 ++++++ .../ignite/schema/load/model/ObjectsKey.txt | 96 + .../ignite/schema/load/model/Primitives.txt | 506 ++++++ .../ignite/schema/load/model/PrimitivesKey.txt | 96 + .../load/parser/DbMetadataParserTest.java | 118 ++ .../testsuites/IgniteSchemaLoadTestSuite.java | 41 + .../org/apache/ignite/IgniteSpringBean.java | 65 + .../cache/VisorCacheCompactCommandSpec.scala | 4 +- .../commands/open/VisorOpenCommandSpec.scala | 6 +- .../config/benchmark-multicast.properties | 74 + .../yardstick/config/benchmark-store.properties | 76 + modules/yardstick/config/benchmark.properties | 70 +- .../yardstick/config/ignite-store-config.xml | 202 +++ .../ignite/yardstick/cache/model/SampleKey.java | 88 + .../yardstick/cache/model/SampleValue.java | 9 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 121 ++ .../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 47 + .../jdbc/IgniteJdbcStoreGetTxBenchmark.java | 47 + .../store/jdbc/IgniteJdbcStorePutBenchmark.java | 47 + .../jdbc/IgniteJdbcStorePutGetBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutGetTxBenchmark.java | 52 + .../jdbc/IgniteJdbcStorePutTxBenchmark.java | 47 + pom.xml | 7 +- 487 files changed, 31014 insertions(+), 17197 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicReferenceExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicReferenceExample.java index 0000000,f2dc2b6..285e854 mode 000000,100644..100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicReferenceExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicReferenceExample.java @@@ -1,0 -1,110 +1,110 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + package org.apache.ignite.examples.datagrid.datastructures; + + import org.apache.ignite.*; + import org.apache.ignite.examples.datagrid.*; + import org.apache.ignite.lang.*; + + import java.util.*; + + /** + * Demonstrates a simple usage of distributed atomic reference. + * <p> + * Remote nodes should always be started with special configuration file which + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-cache.xml'}. + * <p> + * Alternatively you can run {@link CacheNodeStartup} in another JVM which will + * start node with {@code examples/config/example-cache.xml} configuration. + */ + public final class IgniteAtomicReferenceExample { + /** + * Executes example. + * + * @param args Command line arguments, none required. + * @throws Exception If example execution failed. + */ + public static void main(String[] args) throws Exception { + try (Ignite ignite = Ignition.start("examples/config/example-cache.xml")) { + System.out.println(); + System.out.println(">>> Atomic reference example started."); + + // Make name of atomic reference. + final String refName = UUID.randomUUID().toString(); + + // Make value of atomic reference. + String val = UUID.randomUUID().toString(); + + // Initialize atomic reference. + IgniteAtomicReference<String> ref = ignite.atomicReference(refName, val, true); + + System.out.println("Atomic reference initial value : " + ref.get() + '.'); + + // Make closure for checking atomic reference value on cluster. - Runnable c = new ReferenceClosure(refName); ++ IgniteRunnable c = new ReferenceClosure(refName); + + // Check atomic reference on all cluster nodes. + ignite.compute().run(c); + + // Make new value of atomic reference. + String newVal = UUID.randomUUID().toString(); + + System.out.println("Try to change value of atomic reference with wrong expected value."); + + ref.compareAndSet("WRONG EXPECTED VALUE", newVal); // Won't change. + + // Check atomic reference on all cluster nodes. + // Atomic reference value shouldn't be changed. + ignite.compute().run(c); + + System.out.println("Try to change value of atomic reference with correct expected value."); + + ref.compareAndSet(val, newVal); + + // Check atomic reference on all cluster nodes. + // Atomic reference value should be changed. + ignite.compute().run(c); + } + + System.out.println(); + System.out.println("Finished atomic reference example..."); + System.out.println("Check all nodes for output (this node is also part of the cluster)."); + } + + /** + * Obtains atomic reference. + */ + private static class ReferenceClosure implements IgniteRunnable { + /** Reference name. */ + private final String refName; + + /** + * @param refName Reference name. + */ + ReferenceClosure(String refName) { + this.refName = refName; + } + + /** {@inheritDoc} */ + @Override public void run() { + IgniteAtomicReference<String> ref = Ignition.ignite().atomicReference(refName, null, true); + + System.out.println("Atomic reference value is " + ref.get() + '.'); + } + } + } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicStampedExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicStampedExample.java index 0000000,30a2f66..cbdd56f mode 000000,100644..100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicStampedExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/IgniteAtomicStampedExample.java @@@ -1,0 -1,117 +1,117 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + package org.apache.ignite.examples.datagrid.datastructures; + + import org.apache.ignite.*; + import org.apache.ignite.examples.datagrid.*; + import org.apache.ignite.lang.*; + + import java.util.*; + + /** + * Demonstrates a simple usage of distributed atomic stamped. + * <p> + * Remote nodes should always be started with special configuration file which + * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-cache.xml'}. + * <p> + * Alternatively you can run {@link CacheNodeStartup} in another JVM which will + * start node with {@code examples/config/example-cache.xml} configuration. + */ + public final class IgniteAtomicStampedExample { + /** + * Executes example. + * + * @param args Command line arguments, none required. + * @throws Exception If example execution failed. + */ + public static void main(String[] args) throws Exception { + try (Ignite ignite = Ignition.start("examples/config/example-cache.xml")) { + System.out.println(); + System.out.println(">>> Atomic stamped example started."); + + // Make name of atomic stamped. + String stampedName = UUID.randomUUID().toString(); + + // Make value of atomic stamped. + String val = UUID.randomUUID().toString(); + + // Make stamp of atomic stamped. + String stamp = UUID.randomUUID().toString(); + + // Initialize atomic stamped. + IgniteAtomicStamped<String, String> stamped = ignite.atomicStamped(stampedName, val, stamp, true); + + System.out.println("Atomic stamped initial [value=" + stamped.value() + ", stamp=" + stamped.stamp() + ']'); + + // Make closure for checking atomic stamped. - Runnable c = new StampedUpdateClosure(stampedName); ++ IgniteRunnable c = new StampedUpdateClosure(stampedName); + + // Check atomic stamped on all cluster nodes. + ignite.compute().broadcast(c); + + // Make new value of atomic stamped. + String newVal = UUID.randomUUID().toString(); + + // Make new stamp of atomic stamped. + String newStamp = UUID.randomUUID().toString(); + + System.out.println("Try to change value and stamp of atomic stamped with wrong expected value and stamp."); + + stamped.compareAndSet("WRONG EXPECTED VALUE", newVal, "WRONG EXPECTED STAMP", newStamp); + + // Check atomic stamped on all cluster nodes. + // Atomic stamped value and stamp shouldn't be changed. + ignite.compute().run(c); + + System.out.println("Try to change value and stamp of atomic stamped with correct value and stamp."); + + stamped.compareAndSet(val, newVal, stamp, newStamp); + + // Check atomic stamped on all cluster nodes. + // Atomic stamped value and stamp should be changed. + ignite.compute().run(c); + } + + System.out.println(); + System.out.println("Finished atomic stamped example..."); + System.out.println("Check all nodes for output (this node is also part of the cluster)."); + } + + /** + * Performs update of on an atomic stamped variable in cache. + */ + private static class StampedUpdateClosure implements IgniteRunnable { + /** Atomic stamped variable name. */ + private final String stampedName; + + /** + * @param stampedName Atomic stamped variable name. + */ + StampedUpdateClosure(String stampedName) { + this.stampedName = stampedName; + } + + /** {@inheritDoc} */ + @Override public void run() { + IgniteAtomicStamped<String, String> stamped = Ignition.ignite(). + atomicStamped(stampedName, null, null, true); + + System.out.println("Atomic stamped [value=" + stamped.value() + ", stamp=" + stamped.stamp() + ']'); + } + } + } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index 2488a6e,f3b0dec..98f86fd --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@@ -606,9 -559,9 +559,9 @@@ public abstract class GridCacheQueueMul /** * Tests queue serialization. */ - private static class QueueJob implements Callable<Integer>, Serializable { + private static class QueueJob implements IgniteCallable<Integer> { /** */ - private CacheQueue<Integer> queue; + private IgniteQueue<Integer> queue; /** * @param queue Queue. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e30fc19/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateAccessStrategyAdapter.java ----------------------------------------------------------------------