Merge branches 'ignite-737' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-737
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d9a67562 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d9a67562 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d9a67562 Branch: refs/heads/ignite-837 Commit: d9a67562164436d114a65fc42f82631bee371b59 Parents: 9467c46 fddf2a3 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 21 11:32:20 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Apr 21 11:32:20 2015 +0700 ---------------------------------------------------------------------- .../cache/eviction/fifo/FifoEvictionPolicy.java | 7 +- .../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +- .../cache/eviction/lru/LruEvictionPolicy.java | 5 +- .../eviction/sorted/SortedEvictionPolicy.java | 431 +++++ .../sorted/SortedEvictionPolicyMBean.java | 66 + .../cache/eviction/sorted/package-info.java | 21 + .../apache/ignite/cache/query/QueryMetrics.java | 2 +- .../configuration/CacheConfiguration.java | 3 +- .../org/apache/ignite/internal/IgniteEx.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 10 +- .../internal/managers/GridManagerAdapter.java | 4 +- .../discovery/GridDiscoveryManager.java | 2 +- .../processors/cache/CacheLockImpl.java | 20 +- .../processors/cache/CacheOperationContext.java | 170 ++ .../processors/cache/CacheProjection.java | 1386 ------------- .../internal/processors/cache/GridCache.java | 223 --- .../processors/cache/GridCacheAdapter.java | 155 +- .../cache/GridCacheConcurrentMap.java | 24 +- .../processors/cache/GridCacheContext.java | 66 +- .../processors/cache/GridCacheGateway.java | 38 +- .../processors/cache/GridCacheProcessor.java | 21 +- .../processors/cache/GridCacheProjectionEx.java | 351 ---- .../cache/GridCacheProjectionImpl.java | 766 -------- .../processors/cache/GridCacheProxy.java | 27 - .../processors/cache/GridCacheProxyImpl.java | 396 ++-- .../processors/cache/GridCacheUtils.java | 6 +- .../processors/cache/IgniteCacheProxy.java | 225 ++- .../processors/cache/IgniteInternalCache.java | 1816 ++++++++++++++++++ .../cache/affinity/GridCacheAffinityProxy.java | 30 +- .../CacheDataStructuresManager.java | 8 +- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/colocated/GridDhtColocatedCache.java | 7 +- .../distributed/near/GridNearAtomicCache.java | 6 +- .../near/GridNearTransactionalCache.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 10 +- .../processors/cache/query/CacheQueries.java | 103 - .../cache/query/CacheQueriesImpl.java | 142 -- .../cache/query/CacheQueriesProxy.java | 200 -- .../processors/cache/query/CacheQuery.java | 5 +- .../cache/query/GridCacheQueryManager.java | 110 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 2 - .../transactions/IgniteTxLocalAdapter.java | 16 +- .../cache/transactions/IgniteTxManager.java | 44 - .../datastreamer/DataStreamerCacheUpdaters.java | 13 +- .../datastructures/DataStructuresProcessor.java | 24 +- .../datastructures/GridCacheAtomicLongImpl.java | 4 +- .../GridCacheAtomicReferenceImpl.java | 4 +- .../GridCacheAtomicSequenceImpl.java | 4 +- .../GridCacheAtomicStampedImpl.java | 4 +- .../GridCacheCountDownLatchImpl.java | 4 +- .../datastructures/GridCacheSetImpl.java | 2 +- .../processors/igfs/IgfsDataManager.java | 6 +- .../processors/igfs/IgfsMetaManager.java | 8 +- .../handlers/cache/GridCacheCommandHandler.java | 64 +- .../service/GridServiceProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 6 +- .../visor/cache/VisorCacheMetadataTask.java | 9 +- .../internal/visor/cache/VisorCacheMetrics.java | 4 +- .../visor/cache/VisorCacheRebalanceTask.java | 4 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../ignite/startup/BasicWarmupClosure.java | 20 +- .../TransactionSynchronization.java | 45 - .../internal/GridCacheProjectionRemoveTest.java | 41 - ...ridFailFastNodeFailureDetectionSelfTest.java | 5 + .../internal/IgniteInternalCacheRemoveTest.java | 41 + .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 4 +- .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +- ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ++++ .../GridCacheSortedEvictionPolicySelfTest.java | 373 ++++ .../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +- .../processors/igfs/IgfsSizeSelfTest.java | 2 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../cache/GridCacheCommandHandlerSelfTest.java | 10 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../GridContinuousOperationsLoadTest.java | 3 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../IgniteCacheEvictionSelfTestSuite.java | 3 + .../hadoop/jobtracker/HadoopJobTracker.java | 14 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 8 +- .../HibernateAccessStrategyAdapter.java | 10 +- .../hibernate/HibernateCollectionRegion.java | 2 +- .../cache/hibernate/HibernateEntityRegion.java | 2 +- .../hibernate/HibernateGeneralDataRegion.java | 2 +- .../hibernate/HibernateNaturalIdRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 4 +- .../hibernate/HibernateQueryResultsRegion.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 2 +- .../HibernateReadWriteAccessStrategy.java | 2 +- .../ignite/cache/hibernate/HibernateRegion.java | 4 +- .../cache/hibernate/HibernateRegionFactory.java | 10 +- .../hibernate/HibernateTimestampsRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 4 +- .../HibernateTransactionalDataRegion.java | 2 +- .../HibernateL2CacheConfigurationSelfTest.java | 2 +- .../hibernate/HibernateL2CacheSelfTest.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 53 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 66 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 3 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 3 + ...GridCachePartitionedFieldsQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 8 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 4 +- .../cache/IgniteCacheAbstractBenchmark.java | 2 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +- 115 files changed, 4144 insertions(+), 4210 deletions(-) ----------------------------------------------------------------------
