Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 87D7917CC2 for ; Wed, 4 Mar 2015 03:11:11 +0000 (UTC) Received: (qmail 16728 invoked by uid 500); 4 Mar 2015 03:11:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 16687 invoked by uid 500); 4 Mar 2015 03:11:11 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 16674 invoked by uid 99); 4 Mar 2015 03:11:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2015 03:11:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 04 Mar 2015 03:10:45 +0000 Received: (qmail 14470 invoked by uid 99); 4 Mar 2015 03:10:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2015 03:10:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A337CE0FC8; Wed, 4 Mar 2015 03:10:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 04 Mar 2015 03:11:16 -0000 Message-Id: In-Reply-To: <6d72d03139a14f04a3160539cd887301@git.apache.org> References: <6d72d03139a14f04a3160539cd887301@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [39/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9efcd803 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9efcd803 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9efcd803 Branch: refs/heads/ignite-185 Commit: 9efcd8035dd74977f44ce7ab6ebd989b57e57482 Parents: 5a76d70 b2675bc Author: ivasilinets Authored: Mon Mar 2 18:03:07 2015 +0300 Committer: ivasilinets Committed: Mon Mar 2 18:03:07 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 2 +- .../java/org/apache/ignite/IgniteCluster.java | 8 +- .../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 | 12 +- .../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/visor/cache/VisorCache.java | 190 ++---- .../cache/VisorCacheAffinityConfiguration.java | 51 +- .../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/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 +- .../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 +- 67 files changed, 2105 insertions(+), 2415 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9efcd803/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9efcd803/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java index 47a2cf4,0f6a84f..6ff2d2d --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java @@@ -69,10 -71,12 +69,11 @@@ public class VisorCacheAffinityConfigur VisorCacheAffinityConfiguration cfg = new VisorCacheAffinityConfiguration(); - cfg.function(compactClass(aff)); - cfg.mapper(compactClass(ccfg.getAffinityMapper())); - cfg.partitionedBackups(ccfg.getBackups()); - cfg.excludeNeighbors(excludeNeighbors); + cfg.function = compactClass(aff); + cfg.mapper = compactClass(ccfg.getAffinityMapper()); + cfg.partitions = aff.partitions(); + cfg.partitionedBackups = ccfg.getBackups(); - cfg.dfltReplicas = dfltReplicas; + cfg.excludeNeighbors = excludeNeighbors; return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9efcd803/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------