Merge branch 'ignite-sql-tests' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b689abdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b689abdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b689abdd Branch: refs/heads/ignite-sql-tests Commit: b689abdd3f9a6a595fd41c47f5f5af8db4d0f851 Parents: 8ce64ba 848a9ca Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Feb 20 00:51:16 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Feb 20 00:51:16 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 32 -------------------- .../processors/cache/GridCacheAttributes.java | 13 -------- .../processors/cache/GridCacheProcessor.java | 3 -- .../visor/cache/VisorCacheConfiguration.java | 18 ----------- .../IgniteCacheQuerySelfTestSuite.java | 2 +- .../commands/cache/VisorCacheCommand.scala | 1 - .../commands/cache/VisorCacheCommandSpec.scala | 16 ++++++---- modules/yardstick/config/ignite-base-config.xml | 16 ---------- 8 files changed, 11 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b689abdd/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b689abdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b689abdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b689abdd/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java index afd34ff,2809560..1f900ce --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java @@@ -165,8 -156,10 +162,7 @@@ public class VisorCacheConfiguration im cfg.offsetHeapMaxMemory(ccfg.getOffHeapMaxMemory()); cfg.maxQueryIteratorCount(ccfg.getMaximumQueryIteratorCount()); cfg.maxConcurrentAsyncOperations(ccfg.getMaxConcurrentAsyncOperations()); -// cfg.pessimisticTxLoggerSize(ccfg.getPessimisticTxLogSize()); -// cfg.pessimisticTxLoggerLinger(ccfg.getPessimisticTxLogLinger()); cfg.memoryMode(ccfg.getMemoryMode()); - cfg.indexingSpiName(ccfg.getIndexingSpiName()); cfg.interceptor(compactClass(ccfg.getInterceptor())); cfg.affinityConfiguration(VisorCacheAffinityConfiguration.from(ccfg)); cfg.preloadConfiguration(VisorCachePreloadConfiguration.from(ccfg)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b689abdd/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ----------------------------------------------------------------------
