You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/01/21 06:41:33 UTC
ignite git commit: Fixed Visor tasks. (cherry picked from commit
ba93717)
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5.4 e0ae52480 -> d5a5f6aa8
Fixed Visor tasks.
(cherry picked from commit ba93717)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5a5f6aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5a5f6aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5a5f6aa
Branch: refs/heads/ignite-1.5.4
Commit: d5a5f6aa8dc193bec4307947d7b241b3c4f1397e
Parents: e0ae524
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Jan 21 12:40:15 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Jan 21 12:41:17 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/d5a5f6aa/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/d5a5f6aa/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;
}
/**