Fixed Visor tasks.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba93717f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba93717f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba93717f Branch: refs/heads/ignite-2324 Commit: ba93717f9653769b43332b866c22aa69a58cfd0e Parents: bccd459 Author: Alexey Kuznetsov <[email protected]> Authored: Thu Jan 21 12:40:15 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Jan 21 12:40:15 2016 +0700 ---------------------------------------------------------------------- .../cache/VisorCacheQueryConfiguration.java | 14 +++++------ .../cache/VisorCacheStoreConfiguration.java | 26 +++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ba93717f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java index c00d211..73088bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheQueryConfiguration.java @@ -65,15 +65,13 @@ public class VisorCacheQueryConfiguration implements Serializable { * @return Fill data transfer object with cache query configuration data. */ public VisorCacheQueryConfiguration from(CacheConfiguration ccfg) { - VisorCacheQueryConfiguration cfg = new VisorCacheQueryConfiguration(); + sqlFuncClss = compactClasses(ccfg.getSqlFunctionClasses()); + longQryWarnTimeout = ccfg.getLongQueryWarningTimeout(); + sqlEscapeAll = ccfg.isSqlEscapeAll(); + indexedTypes = compactClasses(ccfg.getIndexedTypes()); + sqlOnheapRowCacheSize = ccfg.getSqlOnheapRowCacheSize(); - cfg.sqlFuncClss = compactClasses(ccfg.getSqlFunctionClasses()); - cfg.longQryWarnTimeout = ccfg.getLongQueryWarningTimeout(); - cfg.sqlEscapeAll = ccfg.isSqlEscapeAll(); - cfg.indexedTypes = compactClasses(ccfg.getIndexedTypes()); - cfg.sqlOnheapRowCacheSize = ccfg.getSqlOnheapRowCacheSize(); - - return cfg; + return this; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ba93717f/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java index c152d76..2ba1b57 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java @@ -71,27 +71,25 @@ public class VisorCacheStoreConfiguration implements Serializable { * @return Data transfer object for cache store configuration properties. */ public VisorCacheStoreConfiguration from(IgniteEx ignite, CacheConfiguration ccfg) { - VisorCacheStoreConfiguration cfg = new VisorCacheStoreConfiguration(); - IgniteCacheProxy<Object, Object> c = ignite.context().cache().jcache(ccfg.getName()); - CacheStore store = c != null && c.context().started() ? c.context().store().configuredStore() : null; + CacheStore cstore = c != null && c.context().started() ? c.context().store().configuredStore() : null; - cfg.jdbcStore = store instanceof CacheAbstractJdbcStore; + jdbcStore = cstore instanceof CacheAbstractJdbcStore; - cfg.store = compactClass(store); - cfg.storeFactory = compactClass(ccfg.getCacheStoreFactory()); + store = compactClass(cstore); + storeFactory = compactClass(ccfg.getCacheStoreFactory()); - cfg.readThrough = ccfg.isReadThrough(); - cfg.writeThrough = ccfg.isWriteThrough(); + readThrough = ccfg.isReadThrough(); + writeThrough = ccfg.isWriteThrough(); - cfg.writeBehindEnabled = ccfg.isWriteBehindEnabled(); - cfg.batchSz = ccfg.getWriteBehindBatchSize(); - cfg.flushFreq = ccfg.getWriteBehindFlushFrequency(); - cfg.flushSz = ccfg.getWriteBehindFlushSize(); - cfg.flushThreadCnt = ccfg.getWriteBehindFlushThreadCount(); + writeBehindEnabled = ccfg.isWriteBehindEnabled(); + batchSz = ccfg.getWriteBehindBatchSize(); + flushFreq = ccfg.getWriteBehindFlushFrequency(); + flushSz = ccfg.getWriteBehindFlushSize(); + flushThreadCnt = ccfg.getWriteBehindFlushThreadCount(); - return cfg; + return this; } /**
