Merge branch 'master' into ignite-2435
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0cd0bac9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0cd0bac9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0cd0bac9 Branch: refs/heads/ignite-2435 Commit: 0cd0bac9af9c54d29047dc54f0ddcbd9ca994db5 Parents: b6ce18a 3be3d16 Author: nikolay_tikhonov <[email protected]> Authored: Tue Apr 26 18:34:11 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Tue Apr 26 18:34:11 2016 +0300 ---------------------------------------------------------------------- examples/config/filesystem/example-igfs.xml | 3 - .../CacheContinuousAsyncQueryExample.java | 138 ++ .../datagrid/CacheContinuousQueryExample.java | 13 +- .../internal/benchmarks/model/IntValue.java | 19 +- .../main/java/org/apache/ignite/Ignition.java | 19 +- .../ignite/cache/query/ContinuousQuery.java | 27 + .../org/apache/ignite/compute/ComputeJob.java | 2 +- .../ignite/compute/ComputeJobAfterSend.java | 2 +- .../compute/ComputeJobBeforeFailover.java | 2 +- .../ignite/compute/ComputeJobContext.java | 2 +- .../compute/ComputeJobContinuationAdapter.java | 12 +- .../ignite/compute/ComputeLoadBalancer.java | 12 +- .../org/apache/ignite/compute/ComputeTask.java | 26 +- .../ignite/compute/ComputeTaskAdapter.java | 8 +- .../compute/ComputeTaskNoResultCache.java | 6 +- .../ignite/compute/ComputeTaskSession.java | 4 +- .../ignite/compute/ComputeTaskSplitAdapter.java | 8 +- .../apache/ignite/compute/gridify/Gridify.java | 2 +- .../configuration/ConnectorConfiguration.java | 3 + .../configuration/IgniteConfiguration.java | 35 + .../apache/ignite/igfs/mapreduce/IgfsTask.java | 6 +- .../ignite/internal/GridKernalContext.java | 8 + .../ignite/internal/GridKernalContextImpl.java | 12 + .../ignite/internal/GridTaskSessionImpl.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 34 +- .../org/apache/ignite/internal/IgnitionEx.java | 76 +- .../internal/binary/BinaryObjectImpl.java | 14 + .../processors/cache/CacheOperationFilter.java | 61 + .../processors/cache/GridCacheAdapter.java | 448 ++-- .../cache/GridCacheAffinityManager.java | 10 +- .../processors/cache/GridCacheAtomicFuture.java | 5 - .../cache/GridCacheClearAllRunnable.java | 2 +- .../cache/GridCacheConcurrentMap.java | 1996 +---------------- .../cache/GridCacheConcurrentMapImpl.java | 344 +++ .../processors/cache/GridCacheContext.java | 56 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 5 +- .../processors/cache/GridCacheEntrySet.java | 113 - .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheKeySet.java | 104 - .../processors/cache/GridCacheMapEntry.java | 71 +- .../processors/cache/GridCacheProcessor.java | 1 - .../processors/cache/GridCacheProxyImpl.java | 2 +- .../processors/cache/GridCacheUtils.java | 1 - .../processors/cache/GridNoStorageCacheMap.java | 107 + .../processors/cache/IgniteInternalCache.java | 2 +- .../processors/cache/KeyCacheObject.java | 11 + .../processors/cache/KeyCacheObjectImpl.java | 32 +- .../binary/CacheObjectBinaryProcessorImpl.java | 24 +- .../GridDistributedCacheAdapter.java | 4 +- .../distributed/GridDistributedLockRequest.java | 19 +- .../GridDistributedTxRemoteAdapter.java | 1 - .../GridDistributedUnlockRequest.java | 16 +- .../dht/GridCachePartitionedConcurrentMap.java | 191 ++ .../dht/GridClientPartitionTopology.java | 7 - .../distributed/dht/GridDhtCacheAdapter.java | 77 +- .../distributed/dht/GridDhtCacheEntry.java | 25 +- .../distributed/dht/GridDhtLocalPartition.java | 152 +- .../distributed/dht/GridDhtLockRequest.java | 16 +- .../dht/GridDhtPartitionTopology.java | 7 - .../dht/GridDhtPartitionTopologyImpl.java | 281 ++- .../distributed/dht/GridDhtUnlockRequest.java | 15 +- .../distributed/dht/GridNoStorageCacheMap.java | 122 -- .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/GridPartitionedSingleGetFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 280 ++- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 126 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 55 +- .../GridNearAtomicAbstractUpdateFuture.java | 244 +++ .../GridNearAtomicSingleUpdateFuture.java | 645 ++++++ .../dht/atomic/GridNearAtomicUpdateFuture.java | 325 +-- .../dht/atomic/GridNearAtomicUpdateRequest.java | 31 +- .../dht/colocated/GridDhtColocatedCache.java | 13 +- .../dht/preloader/GridDhtPartitionDemander.java | 2 +- .../dht/preloader/GridDhtPartitionSupplier.java | 8 +- .../distributed/near/GridNearAtomicCache.java | 3 +- .../distributed/near/GridNearCacheAdapter.java | 94 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../distributed/near/GridNearGetRequest.java | 45 +- .../distributed/near/GridNearLockRequest.java | 16 +- .../near/GridNearSingleGetRequest.java | 22 +- .../distributed/near/GridNearUnlockRequest.java | 21 +- .../processors/cache/local/GridLocalCache.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 24 +- .../continuous/CacheContinuousQueryEvent.java | 7 + .../continuous/CacheContinuousQueryHandler.java | 446 +++- .../CacheContinuousQueryListener.java | 6 +- .../continuous/CacheContinuousQueryManager.java | 62 +- .../cache/transactions/IgniteInternalTx.java | 1 - .../cache/transactions/IgniteTxAdapter.java | 1 - .../cache/transactions/IgniteTxEntry.java | 33 +- .../cacheobject/IgniteCacheObjectProcessor.java | 10 + .../IgniteCacheObjectProcessorImpl.java | 36 +- .../processors/clock/GridClockServer.java | 3 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../internal/processors/job/GridJobWorker.java | 4 +- .../GridResourceJobContextInjector.java | 4 +- .../handlers/query/QueryCommandHandler.java | 8 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 7 +- .../processors/task/GridTaskProcessor.java | 6 +- .../processors/task/GridTaskWorker.java | 10 +- .../org/apache/ignite/internal/util/F0.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../internal/util/PartitionedReadOnlySet.java | 71 + .../util/StripedCompositeReadWriteLock.java | 10 + .../ignite/internal/util/lang/GridFunc.java | 7 +- .../apache/ignite/internal/util/typedef/PN.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 6 +- .../apache/ignite/lang/IgniteAsyncCallback.java | 111 + .../jobstealing/JobStealingDisabled.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 10 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 36 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 + .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 13 +- .../spi/loadbalancing/LoadBalancingSpi.java | 8 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 20 +- .../adaptive/AdaptiveLoadProbe.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 6 +- .../WeightedRandomLoadBalancingSpi.java | 14 +- .../thread/IgniteStripedThreadPoolExecutor.java | 164 +- modules/core/src/test/config/igfs-loopback.xml | 7 - modules/core/src/test/config/igfs-shmem.xml | 7 - .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 4 +- .../cache/GridCacheTtlManagerSelfTest.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 3 +- .../IgniteDynamicClientCacheStartSelfTest.java | 10 - .../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 2 +- ...actQueueFailoverDataConsistencySelfTest.java | 2 +- .../GridCacheQueueCleanupSelfTest.java | 4 +- .../GridCacheSequenceApiSelfAbstractTest.java | 37 - .../GridCacheSetAbstractSelfTest.java | 5 +- .../GridCacheSetFailoverAbstractSelfTest.java | 8 +- .../IgniteDataStructureUniqueNameTest.java | 3 +- .../IgnitePartitionedQueueNoBackupsTest.java | 6 +- .../IgnitePartitionedSetNoBackupsSelfTest.java | 6 +- .../distributed/dht/GridCacheDhtTestUtils.java | 9 +- .../near/GridCacheNearOneNodeSelfTest.java | 4 +- ...FailoverAtomicPrimaryWriteOrderSelfTest.java | 50 + ...sQueryAsyncFailoverTxReplicatedSelfTest.java | 37 + ...eContinuousQueryAsyncFailoverTxSelfTest.java | 44 + ...eContinuousQueryAsyncFilterListenerTest.java | 986 +++++++++ ...ryFactoryAsyncFilterRandomOperationTest.java | 131 ++ ...usQueryFactoryFilterRandomOperationTest.java | 725 +++++++ .../CacheContinuousQueryFactoryFilterTest.java | 714 ------- ...ContinuousQueryFailoverAbstractSelfTest.java | 63 +- .../CacheContinuousQueryLostPartitionTest.java | 14 + ...ontinuousQueryOperationFromCallbackTest.java | 627 ++++++ .../CacheContinuousQueryOrderingEventTest.java | 722 +++++++ ...acheContinuousQueryRandomOperationsTest.java | 23 + ...gniteComputeConfigVariationsFullApiTest.java | 2009 ++++++++++++++++++ .../processors/igfs/IgfsAbstractSelfTest.java | 10 +- .../GridTcpCommunicationBenchmark.java | 26 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 6 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 22 + .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 148 +- .../tcp/TcpDiscoverySpiConfigSelfTest.java | 22 + .../configvariations/ConfigVariations.java | 2 +- .../junits/GridTestKernalContext.java | 1 + .../IgniteConfigVariationsAbstractTest.java | 43 +- ...teBasicConfigVariationsFullApiTestSuite.java | 72 + .../IgniteBinaryCacheQueryTestSuite.java | 2 - .../IgniteCacheQuerySelfTestSuite3.java | 14 +- .../IgniteCacheQuerySelfTestSuite4.java | 7 + .../http/jetty/GridJettyRestProtocol.java | 4 +- .../scalar/pimps/ScalarProjectionPimp.scala | 4 +- .../scalar/pimps/ScalarTaskThreadContext.scala | 4 +- .../ignite/schema/generator/CodeGenerator.java | 26 +- .../ignite/schema/generator/XmlGenerator.java | 45 +- .../schema/parser/DatabaseMetadataParser.java | 6 +- .../ignite/schema/ui/SchemaImportApp.java | 30 +- .../schema/test/AbstractSchemaImportTest.java | 10 +- .../schema/test/generator/XmlGeneratorTest.java | 4 +- .../apache/ignite/schema/test/model/Objects.txt | 31 +- .../ignite/schema/test/model/Primitives.txt | 31 +- .../org/apache/ignite/schema/test/model/Tst.txt | 31 +- .../schema/test/model/ignite-type-metadata.xml | 42 + .../test/parser/DbMetadataParserTest.java | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 73 +- .../apache/ignite/spark/JavaIgniteContext.scala | 14 +- .../spark/JavaEmbeddedIgniteRDDSelfTest.java | 343 +++ .../ignite/spark/JavaIgniteRDDSelfTest.java | 302 --- .../spark/JavaStandaloneIgniteRDDSelfTest.java | 302 +++ .../ignite/testsuites/IgniteRDDTestSuite.java | 40 + .../ignite/internal/GridFactorySelfTest.java | 85 + .../uri/GridUriDeploymentFileProcessor.java | 2 +- .../commands/top/VisorTopologyCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- .../ignite/cache/websession/WebSession.java | 7 +- .../internal/websession/WebSessionSelfTest.java | 88 +- .../config/benchmark-cache-load-win.properties | 2 +- .../config/benchmark-cache-load.properties | 53 +- .../config/ignite-base-load-config.xml | 256 +++ .../config/ignite-cache-load-config.xml | 70 + .../cache/CacheEntryEventAsyncProbe.java | 61 + .../yardstick/cache/CacheEntryEventProbe.java | 33 +- .../IgniteCacheRandomOperationBenchmark.java | 176 +- .../yardstick/cache/load/model/ModelUtil.java | 2 +- 200 files changed, 11706 insertions(+), 5060 deletions(-) ----------------------------------------------------------------------
