Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-285
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f20d4fd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f20d4fd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f20d4fd1 Branch: refs/heads/ignite-51 Commit: f20d4fd15c9e14f9404e8bd292d2dd7a3dbd9632 Parents: 3cbc0ca e0a087c Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Feb 18 11:36:45 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Feb 18 11:36:45 2015 -0800 ---------------------------------------------------------------------- .../CommunicationMessageCodeGenerator.java | 788 ------------------ .../ignite/codegen/MessageCodeGenerator.java | 799 +++++++++++++++++++ .../apache/ignite/internal/GridComponent.java | 4 +- .../ignite/internal/GridPluginComponent.java | 2 +- .../internal/managers/GridManagerAdapter.java | 2 +- .../discovery/GridDiscoveryManager.java | 4 +- .../processors/GridProcessorAdapter.java | 2 +- .../processors/cache/CacheProjection.java | 25 - .../processors/cache/GridCacheAdapter.java | 181 +++-- .../processors/cache/GridCacheContext.java | 14 +- .../processors/cache/GridCacheEntryEx.java | 16 +- .../cache/GridCacheEvictionManager.java | 21 +- .../processors/cache/GridCacheMapEntry.java | 64 +- .../processors/cache/GridCacheProjectionEx.java | 8 +- .../cache/GridCacheProjectionImpl.java | 33 +- .../processors/cache/GridCacheProxyImpl.java | 28 +- .../processors/cache/GridCacheSwapManager.java | 84 +- .../cache/GridCacheUpdateAtomicResult.java | 29 +- .../processors/cache/GridCacheUtils.java | 32 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../GridDistributedTxRemoteAdapter.java | 21 +- .../distributed/dht/GridDhtCacheAdapter.java | 9 +- .../distributed/dht/GridDhtCacheEntry.java | 112 ++- .../distributed/dht/GridDhtTxLocalAdapter.java | 5 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 13 +- .../dht/GridPartitionedGetFuture.java | 8 +- .../dht/atomic/GridDhtAtomicCache.java | 150 ++-- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 12 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 100 +-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 128 ++- .../distributed/near/GridNearAtomicCache.java | 23 +- .../distributed/near/GridNearGetFuture.java | 15 +- .../near/GridNearTxPrepareFuture.java | 5 +- .../processors/cache/dr/GridCacheDrInfo.java | 5 +- .../local/atomic/GridLocalAtomicCache.java | 83 +- .../cache/transactions/IgniteTxAdapter.java | 16 +- .../cache/transactions/IgniteTxEntry.java | 66 +- .../transactions/IgniteTxLocalAdapter.java | 67 +- .../cache/version/GridCacheVersion.java | 4 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../continuous/GridContinuousProcessor.java | 2 +- .../dataload/IgniteDataLoaderImpl.java | 3 +- .../dr/GridDrDataLoadCacheUpdater.java | 4 +- .../plugin/IgnitePluginProcessor.java | 28 +- .../security/GridSecurityContext.java | 9 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../cache/VisorCacheDefaultConfiguration.java | 57 -- .../visor/node/VisorNodeDataCollectorJob.java | 50 +- .../visor/node/VisorSpisConfiguration.java | 34 - .../internal/visor/util/VisorEventMapper.java | 73 ++ .../internal/visor/util/VisorTaskUtils.java | 60 +- .../apache/ignite/plugin/ExtensionRegistry.java | 2 +- .../apache/ignite/plugin/PluginProvider.java | 3 +- .../spi/discovery/DiscoverySpiDataExchange.java | 3 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 166 ++++ .../cache/GridCacheQueryIndexSelfTest.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 8 +- .../IgniteCacheExpiryPolicyTestSuite.java | 3 + .../discovery/AbstractDiscoverySelfTest.java | 4 +- .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 2 +- .../inmemory/GridTestSwapSpaceSpi.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 2 + .../junits/spi/GridSpiAbstractTest.java | 2 +- .../cache/GridCacheQueryLoadSelfTest.java | 30 +- .../commands/cache/VisorCacheCommand.scala | 3 - .../config/VisorConfigurationCommand.scala | 2 - .../commands/events/VisorEventsCommand.scala | 14 +- 71 files changed, 1951 insertions(+), 1621 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f20d4fd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ----------------------------------------------------------------------
