#ignite-51: merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c48ef793 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c48ef793 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c48ef793 Branch: refs/heads/ignite-51 Commit: c48ef793a62b659d9cf6fd3716f8a8b60b6d5d56 Parents: 5708509 f1188e0 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Mar 2 16:55:26 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Mar 2 16:55:26 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContext.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 14 +- .../apache/ignite/internal/IgniteKernal.java | 23 +- .../processors/cache/CacheObjectAdapter.java | 1 + .../processors/cache/GridCacheAdapter.java | 46 +- .../processors/cache/GridCacheContext.java | 45 +- .../processors/cache/GridCacheEntryEx.java | 15 +- .../processors/cache/GridCacheMapEntry.java | 206 ++++---- .../processors/cache/GridCacheMessage.java | 28 +- .../processors/cache/GridCacheSwapManager.java | 44 +- .../processors/cache/KeyCacheObjectImpl.java | 5 +- .../cache/UserKeyCacheObjectImpl.java | 31 +- .../GridDistributedCacheAdapter.java | 14 +- .../GridDistributedTxPrepareRequest.java | 110 +++-- .../GridDistributedTxRemoteAdapter.java | 25 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../distributed/dht/GridDhtCacheEntry.java | 30 +- .../cache/distributed/dht/GridDhtGetFuture.java | 29 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 38 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 +- .../dht/GridDhtTxPrepareRequest.java | 50 +- .../dht/GridPartitionedGetFuture.java | 20 +- .../dht/atomic/GridDhtAtomicCache.java | 42 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 13 +- .../dht/colocated/GridDhtColocatedCache.java | 68 ++- .../colocated/GridDhtColocatedLockFuture.java | 16 +- .../colocated/GridDhtDetachedCacheEntry.java | 12 +- .../dht/preloader/GridDhtForceKeysFuture.java | 1 - .../preloader/GridDhtPartitionDemandPool.java | 1 - .../distributed/near/GridNearAtomicCache.java | 11 +- .../distributed/near/GridNearCacheAdapter.java | 7 +- .../distributed/near/GridNearCacheEntry.java | 75 ++- .../distributed/near/GridNearGetFuture.java | 27 +- .../distributed/near/GridNearLockFuture.java | 4 +- .../near/GridNearTransactionalCache.java | 20 +- .../cache/distributed/near/GridNearTxLocal.java | 126 +++-- .../near/GridNearTxPrepareFuture.java | 4 +- .../near/GridNearTxPrepareRequest.java | 42 +- .../near/GridNearTxPrepareResponse.java | 22 +- .../processors/cache/local/GridLocalCache.java | 10 +- .../cache/local/GridLocalLockFuture.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 14 +- .../cache/transactions/IgniteTxAdapter.java | 18 +- .../cache/transactions/IgniteTxEntry.java | 3 +- .../transactions/IgniteTxLocalAdapter.java | 170 ++++--- .../cache/transactions/IgniteTxLocalEx.java | 7 +- .../processors/cluster/ClusterProcessor.java | 46 ++ .../dataload/IgniteDataLoaderImpl.java | 9 +- .../portable/GridPortableProcessor.java | 2 +- .../portable/os/GridOsPortableProcessor.java | 7 +- .../ignite/internal/visor/cache/VisorCache.java | 190 ++------ .../cache/VisorCacheAffinityConfiguration.java | 53 +- .../visor/cache/VisorCacheConfiguration.java | 484 ++++--------------- .../cache/VisorCacheDefaultConfiguration.java | 27 +- .../cache/VisorCacheEvictionConfiguration.java | 81 +--- .../cache/VisorCacheNearConfiguration.java | 42 +- .../cache/VisorCachePreloadConfiguration.java | 54 +-- .../cache/VisorCacheStoreConfiguration.java | 148 +++++- .../VisorCacheWriteBehindConfiguration.java | 137 ------ .../visor/node/VisorAtomicConfiguration.java | 27 +- .../visor/node/VisorBasicConfiguration.java | 180 +------ .../node/VisorCacheQueryConfiguration.java | 45 +- .../node/VisorExecutorServiceConfiguration.java | 54 +-- .../visor/node/VisorGridConfiguration.java | 177 +------ .../visor/node/VisorIgfsConfiguration.java | 244 ++-------- .../visor/node/VisorLifecycleConfiguration.java | 9 +- .../visor/node/VisorMetricsConfiguration.java | 29 +- .../node/VisorPeerToPeerConfiguration.java | 28 +- .../visor/node/VisorQueryConfiguration.java | 65 +-- .../visor/node/VisorRestConfiguration.java | 80 +-- .../node/VisorSegmentationConfiguration.java | 45 +- .../visor/node/VisorSpisConfiguration.java | 92 +--- .../node/VisorTransactionConfiguration.java | 62 +-- .../internal/visor/util/VisorTaskUtils.java | 4 +- .../core/src/test/config/store/jdbc/Ignite.xml | 63 ++- .../cache/GridCacheAbstractFullApiSelfTest.java | 12 +- .../processors/cache/GridCacheTestEntryEx.java | 5 +- .../GridCacheReplicatedFullApiSelfTest.java | 1 + .../IgniteCacheExpiryPolicyAbstractTest.java | 38 +- .../communication/GridCacheMessageSelfTest.java | 6 +- .../ignite/schema/generator/XmlGenerator.java | 8 +- .../apache/ignite/schema/model/PojoField.java | 11 +- .../apache/ignite/schema/load/model/Ignite.xml | 133 +++-- .../commands/cache/VisorCacheCommand.scala | 25 +- .../yardstick/config/ignite-store-config.xml | 15 +- 87 files changed, 1445 insertions(+), 2814 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c48ef793/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java ----------------------------------------------------------------------
