You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/04/28 12:46:56 UTC

[1/8] ignite git commit: Disable striped pool for exchange messages.

Repository: ignite
Updated Branches:
  refs/heads/ignite-5075-cacheStart 0c66d0e01 -> 54091d2ef


Disable striped pool for exchange messages.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33f68e27
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33f68e27
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33f68e27

Branch: refs/heads/ignite-5075-cacheStart
Commit: 33f68e27b8760fc8ac87278ddc7dd993193bd702
Parents: c096059
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 28 09:29:35 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 28 09:29:35 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/managers/communication/GridIoManager.java  | 2 +-
 .../ignite/internal/managers/communication/GridIoMessage.java  | 5 ++++-
 .../dht/preloader/GridDhtPartitionsAbstractMessage.java        | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/33f68e27/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index c4f7519..9d35c75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -824,7 +824,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             return;
         }
 
-        if (plc == GridIoPolicy.SYSTEM_POOL && msg.partition() != Integer.MIN_VALUE) {
+        if (plc == GridIoPolicy.SYSTEM_POOL && msg.partition() != GridIoMessage.STRIPE_DISABLED_PART) {
             ctx.getStripedExecutorService().execute(msg.partition(), c);
 
             return;

http://git-wip-us.apache.org/repos/asf/ignite/blob/33f68e27/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
index 16eae26..dccd336 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
@@ -35,6 +35,9 @@ import org.jetbrains.annotations.Nullable;
  */
 public class GridIoMessage implements Message {
     /** */
+    public static final Integer STRIPE_DISABLED_PART = Integer.MIN_VALUE;
+
+    /** */
     private static final long serialVersionUID = 0L;
 
     /** Policy. */
@@ -334,7 +337,7 @@ public class GridIoMessage implements Message {
         if (msg instanceof GridCacheMessage)
             return ((GridCacheMessage)msg).partition();
         else
-            return Integer.MIN_VALUE;
+            return STRIPE_DISABLED_PART;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/33f68e27/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
index 96d7a88..74bbcb0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.preloader;
 import java.io.Externalizable;
 import java.nio.ByteBuffer;
 import java.util.Map;
+import org.apache.ignite.internal.managers.communication.GridIoMessage;
 import org.apache.ignite.internal.processors.cache.GridCacheMessage;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.typedef.T2;
@@ -64,6 +65,11 @@ public abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage
     }
 
     /** {@inheritDoc} */
+    @Override public int partition() {
+        return GridIoMessage.STRIPE_DISABLED_PART;
+    }
+
+    /** {@inheritDoc} */
     @Override public boolean addDeploymentInfo() {
         return false;
     }


[6/8] ignite git commit: .NET: Cleanup unused SqlOnheapRowCacheSize mentions

Posted by sb...@apache.org.
.NET: Cleanup unused SqlOnheapRowCacheSize mentions


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73d4e115
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73d4e115
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73d4e115

Branch: refs/heads/ignite-5075-cacheStart
Commit: 73d4e1152409026d96346fe5f5dfbc6194b97c9c
Parents: dc4b21e
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Fri Apr 28 13:59:12 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Fri Apr 28 13:59:12 2017 +0300

----------------------------------------------------------------------
 .../Cache/Configuration/CacheConfiguration.cs                   | 3 ---
 .../dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd    | 5 -----
 2 files changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/73d4e115/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
index 9c95c40..1ee7c97 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs
@@ -108,9 +108,6 @@ namespace Apache.Ignite.Core.Cache.Configuration
         /// <summary> Default timeout after which long query warning will be printed. </summary>
         public static readonly TimeSpan DefaultLongQueryWarningTimeout = TimeSpan.FromMilliseconds(3000);
 
-        /// <summary> Default size for onheap SQL row cache size. </summary>
-        public const int DefaultSqlOnheapRowCacheSize = 10*1024;
-
         /// <summary> Default value for keep portable in store behavior .</summary>
         public const bool DefaultKeepVinaryInStore = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/73d4e115/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
index 295457a..253a33e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd
@@ -684,11 +684,6 @@
                                             <xs:documentation>If true all the SQL table and field names will be escaped with double quotes like ({ "tableName"."fieldsName"}). This enforces case sensitivity for field names and also allows having special characters in table and field names.</xs:documentation>
                                         </xs:annotation>
                                     </xs:attribute>
-                                    <xs:attribute name="sqlOnheapRowCacheSize" type="xs:int">
-                                        <xs:annotation>
-                                            <xs:documentation>Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access. This setting only makes sense when offheap is enabled for this cache.</xs:documentation>
-                                        </xs:annotation>
-                                    </xs:attribute>
                                     <xs:attribute name="readThrough" type="xs:boolean">
                                         <xs:annotation>
                                             <xs:documentation>Whether read-through should be enabled for cache operations.</xs:documentation>


[2/8] ignite git commit: IGNITE-4988 Code cleanup for ignite-2.0.

Posted by sb...@apache.org.
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/14f4b33f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/14f4b33f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/14f4b33f

Branch: refs/heads/ignite-5075-cacheStart
Commit: 14f4b33f1b49392ded97eeb49fa16fae62d17606
Parents: 33f68e2
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Fri Apr 28 13:51:34 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Apr 28 13:51:34 2017 +0700

----------------------------------------------------------------------
 modules/web-console/backend/app/mongo.js        | 68 +++++++++++++++++++-
 .../modules/configuration/Version.service.js    |  2 +-
 .../generator/ConfigurationGenerator.js         |  2 -
 .../frontend/app/modules/demo/Demo.module.js    |  4 +-
 4 files changed, 69 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/14f4b33f/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 e16aa02..b525419 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -258,6 +258,7 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
         writeBehindFlushSize: Number,
         writeBehindFlushFrequency: Number,
         writeBehindFlushThreadCount: Number,
+        writeBehindCoalescing: Boolean,
 
         invalidate: Boolean,
         defaultLockTimeout: Number,
@@ -319,7 +320,11 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
                     maxSize: Number
                 }
             }
-        }
+        },
+        evictionFilter: String,
+        memoryPolicyName: String,
+        sqlIndexMaxInlineSize: Number,
+        topologyValidator: String
     });
 
     CacheSchema.index({name: 1, space: 1}, {unique: true});
@@ -365,7 +370,8 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
             userName: String
         },
         colocateMetadata: Boolean,
-        relaxedConsistency: Boolean
+        relaxedConsistency: Boolean,
+        updateFileLenOnFlush: Boolean
     });
 
     IgfsSchema.index({name: 1, space: 1}, {unique: true});
@@ -377,6 +383,7 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
     const ClusterSchema = new Schema({
         space: {type: ObjectId, ref: 'Space', index: true},
         name: {type: String},
+        activeOnStart: Boolean,
         localHost: String,
         discovery: {
             localAddress: String,
@@ -850,6 +857,63 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
             Custom: {
                 className: String
             }
+        },
+        warmupClosure: String,
+        hadoopConfiguration: {
+            finishedJobInfoTtl: Number,
+            mapReducePlanner: String,
+            maxParallelTasks: Number,
+            naxTaskQueueSize: Number,
+            nativeLibraryNames: [String]
+        },
+        serviceConfigurations: [{
+            name: String,
+            service: String,
+            maxPerNodeCount: Number,
+            totalCount: Number,
+            nodeFilter: {
+                kind: {type: String, enum: ['Default', 'Exclude', 'IGFS', 'OnNodes', 'Custom']},
+                Exclude: {
+                    nodeId: String
+                },
+                IGFS: {
+                    igfs: {type: ObjectId, ref: 'Igfs'}
+                },
+                Custom: {
+                    className: String
+                }
+            },
+            cache: {type: ObjectId, ref: 'Cache'},
+            affinityKey: String
+        }],
+        cacheSanityCheckEnabled: Boolean,
+        classLoader: String,
+        consistentId: String,
+        failureDetectionTimeout: Number,
+        workDirectory: String,
+        lateAffinityAssignment: Boolean,
+        utilityCacheKeepAliveTime: Number,
+        asyncCallbackPoolSize: Number,
+        dataStreamerThreadPoolSize: Number,
+        queryThreadPoolSize: Number,
+        stripedPoolSize: Number,
+        serviceThreadPoolSize: Number,
+        utilityCacheThreadPoolSize: Number,
+        executorConfiguration: [{
+            name: String,
+            poolSize: Number
+        }],
+        memoryConfiguration: {
+            pageSize: Number,
+            systemCacheMemorySize: Number,
+            concurrencyLevel: Number,
+            defaultMemoryPolicyName: String,
+            memoryPolicies: [{
+                name: String,
+                maxSize: Number,
+                swapFilePath: String,
+                pageEvictionMode: {type: String, enum: ['DISABLED', 'RANDOM_LRU', 'RANDOM_2_LRU']}
+            }]
         }
     });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/14f4b33f/modules/web-console/frontend/app/modules/configuration/Version.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/Version.service.js b/modules/web-console/frontend/app/modules/configuration/Version.service.js
index 164bd20..1cbe635 100644
--- a/modules/web-console/frontend/app/modules/configuration/Version.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/Version.service.js
@@ -24,7 +24,7 @@ const numberComparator = (a, b) => a > b ? 1 : a < b ? -1 : 0;
 
 export default class IgniteVersion {
     /** Current product version. */
-    static ignite = '1.9.0';
+    static ignite = '2.0.0';
 
     /**
      * Tries to parse product version from it's string representation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/14f4b33f/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 354a8ff..8856e03 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1769,8 +1769,6 @@ export default class IgniteConfigurationGenerator {
             return cfg;
 
         cfg.stringProperty('name')
-            .stringProperty('name', 'dataCacheName', (name) => name + '-data')
-            .stringProperty('name', 'metaCacheName', (name) => name + '-meta')
             .enumProperty('defaultMode');
 
         return cfg;

http://git-wip-us.apache.org/repos/asf/ignite/blob/14f4b33f/modules/web-console/frontend/app/modules/demo/Demo.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/demo/Demo.module.js b/modules/web-console/frontend/app/modules/demo/Demo.module.js
index dc763b3..99ea2cb 100644
--- a/modules/web-console/frontend/app/modules/demo/Demo.module.js
+++ b/modules/web-console/frontend/app/modules/demo/Demo.module.js
@@ -117,7 +117,7 @@ angular
         return items;
     }];
 }])
-.service('DemoInfo', ['$rootScope', '$modal', '$state', '$q', 'igniteDemoInfo', 'AgentManager', ($rootScope, $modal, $state, $q, igniteDemoInfo, agentMonitor) => {
+.service('DemoInfo', ['$rootScope', '$modal', '$state', '$q', 'igniteDemoInfo', 'AgentManager', ($rootScope, $modal, $state, $q, igniteDemoInfo, agentMgr) => {
     const scope = $rootScope.$new();
 
     let closePromise = null;
@@ -165,7 +165,7 @@ angular
 
             return dialog.$promise
                 .then(dialog.show)
-                .then(() => Promise.race([agentMonitor.awaitAgent(), closePromise.promise]))
+                .then(() => Promise.race([agentMgr.awaitAgent(), closePromise.promise]))
                 .then(() => scope.hasAgents = true);
         }
     };


[3/8] ignite git commit: ignite-2.0 - Fixed javadoc

Posted by sb...@apache.org.
ignite-2.0 - Fixed javadoc


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab2a5b90
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab2a5b90
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab2a5b90

Branch: refs/heads/ignite-5075-cacheStart
Commit: ab2a5b903b814d917065f3902169dbded8da334d
Parents: 14f4b33
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Apr 28 10:38:58 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Apr 28 10:38:58 2017 +0300

----------------------------------------------------------------------
 modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ab2a5b90/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
index 28225fc..7bd27fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java
@@ -33,7 +33,7 @@ public interface IgfsMetrics {
 
     /**
      * Gets maximum amount of data that can be stored on local node. This metrics is related to
-     * to the {@link org.apache.ignite.configuration.MemoryPolicyConfiguration#getSize()} of the IGFS data cache.
+     * to the {@link org.apache.ignite.configuration.MemoryPolicyConfiguration#getMaxSize()} of the IGFS data cache.
      *
      * @return Maximum IGFS local space size.
      */


[5/8] ignite git commit: IGNITE-5024 code of two tests was fixed to pass new validation rules

Posted by sb...@apache.org.
IGNITE-5024 code of two tests was fixed to pass new validation rules


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc4b21ef
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc4b21ef
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc4b21ef

Branch: refs/heads/ignite-5075-cacheStart
Commit: dc4b21efffbcc0e1f45570e89477f8a63c381d31
Parents: 2872060
Author: Sergey Chugunov <se...@gmail.com>
Authored: Fri Apr 28 11:37:36 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Apr 28 11:56:07 2017 +0300

----------------------------------------------------------------------
 .../cache/CacheMemoryPolicyConfigurationTest.java | 12 +++++++++---
 .../database/MemoryPolicyInitializationTest.java  | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/dc4b21ef/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java
index 326a830..0fb9c08 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMemoryPolicyConfigurationTest.java
@@ -36,6 +36,12 @@ public class CacheMemoryPolicyConfigurationTest extends GridCommonAbstractTest {
     /** */
     private volatile MemoryConfiguration memCfg;
 
+    /** */
+    private static final long DFLT_MEM_PLC_SIZE = 10 * 1024 * 1024;
+
+    /** */
+    private static final long BIG_MEM_PLC_SIZE = 1024 * 1024 * 1024;
+
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -138,12 +144,12 @@ public class CacheMemoryPolicyConfigurationTest extends GridCommonAbstractTest {
 
         MemoryPolicyConfiguration dfltPlcCfg = new MemoryPolicyConfiguration();
         dfltPlcCfg.setName("dfltPlc");
-        dfltPlcCfg.setInitialSize(1024 * 1024);
-        dfltPlcCfg.setMaxSize(1024 * 1024);
+        dfltPlcCfg.setInitialSize(DFLT_MEM_PLC_SIZE);
+        dfltPlcCfg.setMaxSize(DFLT_MEM_PLC_SIZE);
 
         MemoryPolicyConfiguration bigPlcCfg = new MemoryPolicyConfiguration();
         bigPlcCfg.setName("bigPlc");
-        bigPlcCfg.setMaxSize(1024 * 1024 * 1024);
+        bigPlcCfg.setMaxSize(BIG_MEM_PLC_SIZE);
 
         memCfg.setMemoryPolicies(dfltPlcCfg, bigPlcCfg);
         memCfg.setDefaultMemoryPolicyName("dfltPlc");

http://git-wip-us.apache.org/repos/asf/ignite/blob/dc4b21ef/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/MemoryPolicyInitializationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/MemoryPolicyInitializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/MemoryPolicyInitializationTest.java
index a1c9728..ec798ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/MemoryPolicyInitializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/MemoryPolicyInitializationTest.java
@@ -232,10 +232,12 @@ public class MemoryPolicyInitializationTest extends GridCommonAbstractTest {
 
         memCfg.setMemoryPolicies(new MemoryPolicyConfiguration()
                 .setName(CUSTOM_NON_DEFAULT_MEM_PLC_NAME)
+                .setInitialSize(USER_CUSTOM_MEM_PLC_SIZE)
                 .setMaxSize(USER_CUSTOM_MEM_PLC_SIZE),
 
-                new MemoryPolicyConfiguration()
+            new MemoryPolicyConfiguration()
                 .setName(DFLT_MEM_PLC_DEFAULT_NAME)
+                .setInitialSize(USER_CUSTOM_MEM_PLC_SIZE)
                 .setMaxSize(USER_DEFAULT_MEM_PLC_SIZE)
         );
     }
@@ -248,8 +250,9 @@ public class MemoryPolicyInitializationTest extends GridCommonAbstractTest {
         memCfg = new MemoryConfiguration();
 
         memCfg.setMemoryPolicies(new MemoryPolicyConfiguration()
-                .setName(DFLT_MEM_PLC_DEFAULT_NAME)
-                .setMaxSize(USER_DEFAULT_MEM_PLC_SIZE)
+            .setName(DFLT_MEM_PLC_DEFAULT_NAME)
+            .setInitialSize(USER_CUSTOM_MEM_PLC_SIZE)
+            .setMaxSize(USER_DEFAULT_MEM_PLC_SIZE)
         );
     }
 
@@ -261,10 +264,12 @@ public class MemoryPolicyInitializationTest extends GridCommonAbstractTest {
 
         memCfg.setMemoryPolicies(new MemoryPolicyConfiguration()
                 .setName(DFLT_MEM_PLC_DEFAULT_NAME)
+                .setInitialSize(USER_CUSTOM_MEM_PLC_SIZE)
                 .setMaxSize(USER_DEFAULT_MEM_PLC_SIZE),
 
-                new MemoryPolicyConfiguration()
+            new MemoryPolicyConfiguration()
                 .setName(CUSTOM_NON_DEFAULT_MEM_PLC_NAME)
+                .setInitialSize(USER_CUSTOM_MEM_PLC_SIZE)
                 .setMaxSize(USER_CUSTOM_MEM_PLC_SIZE)
         );
     }
@@ -287,8 +292,9 @@ public class MemoryPolicyInitializationTest extends GridCommonAbstractTest {
         memCfg = new MemoryConfiguration();
 
         memCfg.setMemoryPolicies(new MemoryPolicyConfiguration()
-                .setName(CUSTOM_NON_DEFAULT_MEM_PLC_NAME)
-                .setMaxSize(USER_CUSTOM_MEM_PLC_SIZE)
+            .setName(CUSTOM_NON_DEFAULT_MEM_PLC_NAME)
+            .setInitialSize(USER_CUSTOM_MEM_PLC_SIZE)
+            .setMaxSize(USER_CUSTOM_MEM_PLC_SIZE)
         );
     }
 


[8/8] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-5075-cacheStart

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-5075-cacheStart


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54091d2e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54091d2e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54091d2e

Branch: refs/heads/ignite-5075-cacheStart
Commit: 54091d2effffa16769259e75c4c5fba3d00e5c3c
Parents: 0c66d0e 0e8e5dd
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 28 15:45:38 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Apr 28 15:45:38 2017 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/igfs/IgfsMetrics.java     |  2 +-
 .../managers/communication/GridIoManager.java   |  2 +-
 .../managers/communication/GridIoMessage.java   |  5 +-
 .../GridDhtPartitionsAbstractMessage.java       |  6 ++
 .../visor/query/VisorQueryConfiguration.java    | 12 ----
 .../CacheMemoryPolicyConfigurationTest.java     | 12 +++-
 .../MemoryPolicyInitializationTest.java         | 18 +++--
 .../Cache/Configuration/CacheConfiguration.cs   |  3 -
 .../IgniteConfigurationSection.xsd              |  5 --
 .../commands/cache/VisorCacheCommand.scala      |  1 -
 .../web-console/backend/app/browsersHandler.js  |  4 +-
 modules/web-console/backend/app/mongo.js        | 71 ++++++++++++++++++--
 .../app/modules/agent/AgentManager.service.js   | 20 +++---
 .../modules/configuration/Version.service.js    |  2 +-
 .../generator/ConfigurationGenerator.js         |  5 --
 .../generator/PlatformGenerator.js              |  3 +-
 .../generator/defaults/Cache.service.js         |  2 -
 .../generator/defaults/IGFS.service.js          |  1 -
 .../frontend/app/modules/demo/Demo.module.js    |  4 +-
 .../states/configuration/caches/query.pug       |  6 --
 .../modules/states/configuration/igfs/misc.pug  |  2 -
 .../agent/handlers/DatabaseListener.java        | 24 +++----
 22 files changed, 127 insertions(+), 83 deletions(-)
----------------------------------------------------------------------



[7/8] ignite git commit: IGNITE-4988 Fixed metadata import from RDBMS.

Posted by sb...@apache.org.
IGNITE-4988 Fixed metadata import from RDBMS.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e8e5dd9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e8e5dd9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e8e5dd9

Branch: refs/heads/ignite-5075-cacheStart
Commit: 0e8e5dd99ec647a33f090cde02cf7cddf4a9b24c
Parents: 73d4e11
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Apr 28 18:06:41 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Apr 28 18:06:41 2017 +0700

----------------------------------------------------------------------
 .../web-console/backend/app/browsersHandler.js  |  4 ++--
 .../app/modules/agent/AgentManager.service.js   | 20 ++++++++--------
 .../agent/handlers/DatabaseListener.java        | 24 ++++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0e8e5dd9/modules/web-console/backend/app/browsersHandler.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/browsersHandler.js b/modules/web-console/backend/app/browsersHandler.js
index 9f31046..4a03abe 100644
--- a/modules/web-console/backend/app/browsersHandler.js
+++ b/modules/web-console/backend/app/browsersHandler.js
@@ -155,8 +155,8 @@ module.exports.factory = (_, socketio, configure, errors) => {
             });
 
             // Return tables from database to browser.
-            sock.on('schemaImport:tables', (...args) => {
-                this.executeOnAgent(token(), demo, 'schemaImport:tables', ...args);
+            sock.on('schemaImport:metadata', (...args) => {
+                this.executeOnAgent(token(), demo, 'schemaImport:metadata', ...args);
             });
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0e8e5dd9/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index 4c388f1..db8b493 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -241,33 +241,33 @@ export default class IgniteAgentManager {
     }
 
     /**
-     * @param {Object} driverPath
-     * @param {Object} driverClass
-     * @param {Object} url
+     * @param {Object} jdbcDriverJar
+     * @param {Object} jdbcDriverClass
+     * @param {Object} jdbcUrl
      * @param {Object} user
      * @param {Object} password
      * @returns {Promise}
      */
-    schemas({driverPath, driverClass, url, user, password}) {
+    schemas({jdbcDriverJar, jdbcDriverClass, jdbcUrl, user, password}) {
         const info = {user, password};
 
-        return this._emit('schemaImport:schemas', {driverPath, driverClass, url, info});
+        return this._emit('schemaImport:schemas', {jdbcDriverJar, jdbcDriverClass, jdbcUrl, info});
     }
 
     /**
-     * @param {Object} driverPath
-     * @param {Object} driverClass
-     * @param {Object} url
+     * @param {Object} jdbcDriverJar
+     * @param {Object} jdbcDriverClass
+     * @param {Object} jdbcUrl
      * @param {Object} user
      * @param {Object} password
      * @param {Object} schemas
      * @param {Object} tablesOnly
      * @returns {Promise} Promise on list of tables (see org.apache.ignite.schema.parser.DbTable java class)
      */
-    tables({driverPath, driverClass, url, user, password, schemas, tablesOnly}) {
+    tables({jdbcDriverJar, jdbcDriverClass, jdbcUrl, user, password, schemas, tablesOnly}) {
         const info = {user, password};
 
-        return this._emit('schemaImport:tables', {driverPath, driverClass, url, info, schemas, tablesOnly});
+        return this._emit('schemaImport:metadata', {jdbcDriverJar, jdbcDriverClass, jdbcUrl, info, schemas, tablesOnly});
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/0e8e5dd9/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
index 745c1f2..d1394c9 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
@@ -59,18 +59,18 @@ public class DatabaseListener {
         @Override public Object execute(Map<String, Object> args) throws Exception {
             String driverPath = null;
 
-            if (args.containsKey("driverPath"))
-                driverPath = args.get("driverPath").toString();
+            if (args.containsKey("jdbcDriverJar"))
+                driverPath = args.get("jdbcDriverJar").toString();
 
-            if (!args.containsKey("driverClass"))
+            if (!args.containsKey("jdbcDriverClass"))
                 throw new IllegalArgumentException("Missing driverClass in arguments: " + args);
 
-            String driverCls = args.get("driverClass").toString();
+            String driverCls = args.get("jdbcDriverClass").toString();
 
-            if (!args.containsKey("url"))
+            if (!args.containsKey("jdbcUrl"))
                 throw new IllegalArgumentException("Missing url in arguments: " + args);
 
-            String url = args.get("url").toString();
+            String url = args.get("jdbcUrl").toString();
 
             if (!args.containsKey("info"))
                 throw new IllegalArgumentException("Missing info in arguments: " + args);
@@ -88,18 +88,18 @@ public class DatabaseListener {
         @Override public Object execute(Map<String, Object> args) throws Exception {
             String driverPath = null;
 
-            if (args.containsKey("driverPath"))
-                driverPath = args.get("driverPath").toString();
+            if (args.containsKey("jdbcDriverJar"))
+                driverPath = args.get("jdbcDriverJar").toString();
 
-            if (!args.containsKey("driverClass"))
+            if (!args.containsKey("jdbcDriverClass"))
                 throw new IllegalArgumentException("Missing driverClass in arguments: " + args);
 
-            String driverCls = args.get("driverClass").toString();
+            String driverCls = args.get("jdbcDriverClass").toString();
 
-            if (!args.containsKey("url"))
+            if (!args.containsKey("jdbcUrl"))
                 throw new IllegalArgumentException("Missing url in arguments: " + args);
 
-            String url = args.get("url").toString();
+            String url = args.get("jdbcUrl").toString();
 
             if (!args.containsKey("info"))
                 throw new IllegalArgumentException("Missing info in arguments: " + args);


[4/8] ignite git commit: IGNITE-4988 Code cleanup for ignite-2.0.

Posted by sb...@apache.org.
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/ignite-5075-cacheStart
Commit: 2872060897a9a6390d4c5cb7324a733f7b3cec56
Parents: ab2a5b9
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Apr 28 14:56:53 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
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')