IGNITE-4988 Code cleanup for ignite-2.0.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28720608 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28720608 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28720608 Branch: refs/heads/master Commit: 2872060897a9a6390d4c5cb7324a733f7b3cec56 Parents: ab2a5b9 Author: Alexey Kuznetsov <[email protected]> Authored: Fri Apr 28 14:56:53 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Apr 28 14:56:53 2017 +0700 ---------------------------------------------------------------------- .../internal/visor/query/VisorQueryConfiguration.java | 12 ------------ .../ignite/visor/commands/cache/VisorCacheCommand.scala | 1 - modules/web-console/backend/app/mongo.js | 3 --- .../configuration/generator/ConfigurationGenerator.js | 3 --- .../configuration/generator/PlatformGenerator.js | 3 +-- .../configuration/generator/defaults/Cache.service.js | 2 -- .../configuration/generator/defaults/IGFS.service.js | 1 - .../app/modules/states/configuration/caches/query.pug | 6 ------ .../app/modules/states/configuration/igfs/misc.pug | 2 -- 9 files changed, 1 insertion(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryConfiguration.java index 92921b2..67eaaa4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryConfiguration.java @@ -48,9 +48,6 @@ public class VisorQueryConfiguration extends VisorDataTransferObject { private List<String> indexedTypes; /** */ - private int sqlOnheapRowCacheSize; - - /** */ private String sqlSchema; /** @@ -102,13 +99,6 @@ public class VisorQueryConfiguration extends VisorDataTransferObject { } /** - * @return Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access. - */ - public int getSqlOnheapRowCacheSize() { - return sqlOnheapRowCacheSize; - } - - /** * @return Schema name, which is used by SQL engine for SQL statements generation. */ public String getSqlSchema() { @@ -121,7 +111,6 @@ public class VisorQueryConfiguration extends VisorDataTransferObject { out.writeLong(longQryWarnTimeout); out.writeBoolean(sqlEscapeAll); U.writeCollection(out, indexedTypes); - out.writeInt(sqlOnheapRowCacheSize); U.writeString(out, sqlSchema); } @@ -131,7 +120,6 @@ public class VisorQueryConfiguration extends VisorDataTransferObject { longQryWarnTimeout = in.readLong(); sqlEscapeAll = in.readBoolean(); indexedTypes = U.readList(in); - sqlOnheapRowCacheSize = in.readInt(); sqlSchema = U.readString(in); } http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala index 0616154..680522f 100755 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala @@ -895,7 +895,6 @@ object VisorCacheCommand { cacheT +=("Query Execution Time Threshold", queryCfg.getLongQueryWarningTimeout) cacheT +=("Query Schema Name", queryCfg.getSqlSchema) cacheT +=("Query Escaped Names", bool2Str(queryCfg.isSqlEscapeAll)) - cacheT +=("Query Onheap Cache Size", queryCfg.getSqlOnheapRowCacheSize) val sqlFxs = queryCfg.getSqlFunctionClasses http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/web-console/backend/app/mongo.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js index b525419..80be010 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -266,10 +266,8 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose sqlEscapeAll: Boolean, sqlSchema: String, - sqlOnheapRowCacheSize: Number, longQueryWarningTimeout: Number, sqlFunctionClasses: [String], - snapshotableIndex: Boolean, queryDetailMetricsSize: Number, queryParallelism: Number, statisticsEnabled: Boolean, @@ -355,7 +353,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose threadCount: Number }, ipcEndpointEnabled: Boolean, - maxSpaceSize: Number, maximumTaskRangeLength: Number, managementPort: Number, pathModes: [{path: String, mode: {type: String, enum: ['PRIMARY', 'PROXY', 'DUAL_SYNC', 'DUAL_ASYNC']}}], http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js index 8856e03..d5aecdb 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -1498,13 +1498,11 @@ export default class IgniteConfigurationGenerator { }, []); ccfg.stringProperty('sqlSchema') - .intProperty('sqlOnheapRowCacheSize') .intProperty('longQueryWarningTimeout') .arrayProperty('indexedTypes', 'indexedTypes', indexedTypes, 'java.lang.Class') .intProperty('queryDetailMetricsSize') .intProperty('queryParallelism') .arrayProperty('sqlFunctionClasses', 'sqlFunctionClasses', cache.sqlFunctionClasses, 'java.lang.Class') - .intProperty('snapshotableIndex') .intProperty('sqlEscapeAll'); return ccfg; @@ -1835,7 +1833,6 @@ export default class IgniteConfigurationGenerator { static igfsMisc(igfs, cfg = this.igfsConfigurationBean(igfs)) { cfg.intProperty('blockSize') .intProperty('bufferSize') - .intProperty('maxSpaceSize') .intProperty('maximumTaskRangeLength') .intProperty('managementPort') .intProperty('perNodeBatchSize') http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js index febba62..d1a9092 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js @@ -300,8 +300,7 @@ export default ['JavaTypes', 'igniteClusterPlatformDefaults', 'igniteCachePlatfo // Generate cache queries & Indexing group. static cacheQuery(cache, domains, ccfg = this.cacheConfigurationBean(cache)) { - ccfg.intProperty('sqlOnheapRowCacheSize') - .intProperty('longQueryWarningTimeout'); + ccfg.intProperty('longQueryWarningTimeout'); return ccfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js index e77d1d3..390233b 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cache.service.js @@ -26,9 +26,7 @@ const DFLT_CACHE = { clsName: 'org.apache.ignite.cache.PartitionLossPolicy', value: 'IGNORE' }, - sqlOnheapRowCacheSize: 10240, longQueryWarningTimeout: 3000, - snapshotableIndex: false, sqlEscapeAll: false, storeKeepBinary: false, loadPreviousValue: false, http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js index 6c8d16c..49699bc 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/IGFS.service.js @@ -37,7 +37,6 @@ const DFLT_IGFS = { fragmentizerThrottlingDelay: 200, blockSize: 65536, bufferSize: 65536, - maxSpaceSize: 0, maximumTaskRangeLength: 0, managementPort: 11400, perNodeBatchSize: 100, http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug b/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug index 52425ba..b3650e2 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug @@ -47,9 +47,6 @@ include /app/helpers/jade/mixins </li>\ </ul>') .settings-row - +number('On-heap cache for off-heap indexes:', `${model}.sqlOnheapRowCacheSize`, '"sqlOnheapRowCacheSize"', 'true', '10240', '1', - 'Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access') - .settings-row +number('Long query timeout:', `${model}.longQueryWarningTimeout`, '"longQueryWarningTimeout"', 'true', '3000', '0', 'Timeout in milliseconds after which long query warning will be printed') .settings-row @@ -106,9 +103,6 @@ include /app/helpers/jade/mixins .group-content-empty(ng-if=`!(${sqlFunctionClasses}.length) && !group.add.length`) | Not defined .settings-row - +checkbox('Snapshotable index', `${model}.snapshotableIndex`, '"snapshotableIndex"', - 'Flag indicating whether SQL indexes should support snapshots') - .settings-row +checkbox('Escape table and filed names', `${model}.sqlEscapeAll`, '"sqlEscapeAll"', 'If enabled than all schema, table and field names will be escaped with double quotes (for example: "tableName"."fieldName").<br/>\ This enforces case sensitivity for field names and also allows having special characters in table and field names.<br/>\ http://git-wip-us.apache.org/repos/asf/ignite/blob/28720608/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug b/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug index 6133feb..29f955a 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug @@ -57,8 +57,6 @@ mixin table-igfs-path-mode-edit(prefix, focusId, index) .settings-row +number('Buffer size:', `${model}.bufferSize`, '"bufferSize"', 'true', '65536', '0', 'Read/write buffer size for IGFS stream operations in bytes') .settings-row - +number('Maximum space size:', `${model}.maxSpaceSize`, '"maxSpaceSize"', 'true', '0', '0', 'Maximum space available for data cache to store file system entries') - .settings-row +number('Maximum task range length:', `${model}.maximumTaskRangeLength`, '"maximumTaskRangeLength"', 'true', '0', '0', 'Maximum default range size of a file being split during IGFS task execution') .settings-row +number-min-max('Management port:', `${model}.managementPort`, '"managementPort"', 'true', '11400', '0', '65535', 'Port number for management endpoint')
