Merge branch 'ignite-758' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-758
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af1b0c62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af1b0c62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af1b0c62 Branch: refs/heads/ignite-737 Commit: af1b0c62aaae4f4431e4f5d37580928062053da4 Parents: b690fca 2006b66 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 16 22:52:52 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 16 22:52:52 2015 +0300 ---------------------------------------------------------------------- .../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 | 2 +- .../processors/cache/CacheLockImpl.java | 14 +- .../processors/cache/CacheOperationContext.java | 162 ++ .../processors/cache/CacheProjection.java | 1386 ------------- .../internal/processors/cache/GridCache.java | 176 -- .../processors/cache/GridCacheAdapter.java | 223 +-- .../cache/GridCacheConcurrentMap.java | 18 +- .../processors/cache/GridCacheContext.java | 52 +- .../processors/cache/GridCacheGateway.java | 10 +- .../processors/cache/GridCacheProcessor.java | 20 +- .../processors/cache/GridCacheProjectionEx.java | 351 ---- .../cache/GridCacheProjectionImpl.java | 766 -------- .../processors/cache/GridCacheProxyImpl.java | 324 +-- .../processors/cache/GridCacheUtils.java | 6 +- .../processors/cache/IgniteCacheProxy.java | 185 +- .../processors/cache/IgniteInternalCache.java | 1860 ++++++++++++++++++ .../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 | 32 - .../cache/query/CacheQueriesImpl.java | 43 +- .../cache/query/CacheQueriesProxy.java | 200 -- .../cache/query/GridCacheQueryManager.java | 12 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 4 +- .../transactions/IgniteTxLocalAdapter.java | 16 +- .../datastreamer/DataStreamerCacheUpdaters.java | 12 +- .../datastructures/DataStructuresProcessor.java | 24 +- .../datastructures/GridCacheAtomicLongImpl.java | 4 +- .../GridCacheAtomicReferenceImpl.java | 4 +- .../GridCacheAtomicSequenceImpl.java | 4 +- .../GridCacheAtomicStampedImpl.java | 6 +- .../GridCacheCountDownLatchImpl.java | 4 +- .../datastructures/GridCacheSetImpl.java | 2 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../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 | 2 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../ignite/startup/BasicWarmupClosure.java | 20 +- .../internal/GridCacheProjectionRemoveTest.java | 41 - .../internal/IgniteInternalCacheRemoveTest.java | 41 + .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 2 +- .../cache/GridCacheCommandHandlerSelfTest.java | 8 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../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 +- .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 6 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 69 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 2 +- modules/visor-console/pom.xml | 4 +- .../ignite/visor/commands/VisorConsole.scala | 20 +- .../cache/IgniteCacheAbstractBenchmark.java | 2 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +- 84 files changed, 2785 insertions(+), 3655 deletions(-) ----------------------------------------------------------------------
