Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/34683690 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/34683690 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/34683690 Branch: refs/heads/ignite-45 Commit: 346836905c551d606ec13e8140e46d9d81edbcb2 Parents: bceb33a b2675bc Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Mar 2 14:05:20 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Mar 2 14:05:20 2015 -0800 ---------------------------------------------------------------------- examples/pom-standalone.xml | 2 +- .../store/CacheNodeWithStoreStartup.java | 6 +- .../store/jdbc/CacheJdbcPersonStore.java | 115 ++-- .../java/org/apache/ignite/IgniteCluster.java | 8 +- .../apache/ignite/cache/store/CacheStore.java | 4 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 17 +- .../configuration/IgniteConfiguration.java | 5 +- .../ignite/internal/GridKernalContext.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 14 +- .../apache/ignite/internal/IgniteKernal.java | 23 +- .../org/apache/ignite/internal/IgnitionEx.java | 592 +++++++++---------- .../affinity/GridAffinityAssignmentCache.java | 13 +- .../processors/cache/CacheMetricsImpl.java | 4 + .../processors/cache/GridCacheContext.java | 19 + .../processors/cache/GridCacheMapEntry.java | 9 + .../processors/cache/GridCacheProcessor.java | 15 + .../processors/cache/GridCacheStoreManager.java | 18 +- .../GridDistributedCacheAdapter.java | 2 + .../distributed/dht/GridDhtCacheEntry.java | 3 + .../distributed/dht/GridDhtLocalPartition.java | 5 + .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../cache/transactions/IgniteTxManager.java | 7 +- .../processors/cluster/ClusterProcessor.java | 46 ++ .../dataload/IgniteDataLoaderImpl.java | 29 +- .../ignite/internal/util/IgniteUtils.java | 90 ++- .../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 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +++-- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++++ .../core/src/main/resources/ignite.properties | 2 +- .../core/src/test/config/store/jdbc/Ignite.xml | 63 +- .../GridCacheAbstractLocalStoreSelfTest.java | 440 ++++++++++++++ .../cache/GridCacheAbstractMetricsSelfTest.java | 42 ++ ...acheAbstractUsersAffinityMapperSelfTest.java | 207 +++++++ ...dCacheAtomicUsersAffinityMapperSelfTest.java | 45 ++ .../GridCachePartitionedLocalStoreSelfTest.java | 51 ++ ...chePartitionedOffHeapLocalStoreSelfTest.java | 56 ++ .../GridCacheReplicatedLocalStoreSelfTest.java | 51 ++ ...heReplicatedUsersAffinityMapperSelfTest.java | 45 ++ ...ridCacheTxPartitionedLocalStoreSelfTest.java | 51 ++ .../GridCacheTxUsersAffinityMapperSelfTest.java | 45 ++ .../GridCacheQueueCleanupSelfTest.java | 1 - .../IgniteCacheExpiryPolicyAbstractTest.java | 38 +- .../junits/cache/TestCacheSession.java | 5 + .../cache/TestThreadLocalCacheSession.java | 5 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 + modules/scalar/pom.xml | 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 +- pom.xml | 4 +- 77 files changed, 2459 insertions(+), 2566 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/34683690/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java ----------------------------------------------------------------------
