Repository: ignite Updated Branches: refs/heads/ignite-2.0 7bfff3b89 -> b2aeac751
http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml b/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml index 13a0b75..4f7ea55 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml +++ b/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml @@ -35,9 +35,6 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> <bean id="cache-configuration" class="org.apache.ignite.configuration.CacheConfiguration"> - <!-- Initial cache size. --> - <property name="startSize" value="3000000"/> - <!-- Set synchronous rebalancing (default is asynchronous). --> <property name="rebalanceMode" value="SYNC"/> @@ -54,9 +51,6 @@ </bean> <bean id="cache-configuration1" class="org.apache.ignite.configuration.CacheConfiguration"> - <!-- Initial cache size. --> - <property name="startSize" value="3000000"/> - <!-- Set synchronous rebalancing (default is asynchronous). --> <property name="rebalanceMode" value="SYNC"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/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 1fb78b8..0616154 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 @@ -846,7 +846,6 @@ object VisorCacheCommand { cacheT += ("Write Synchronization Mode", safe(cfg.getWriteSynchronizationMode)) cacheT += ("Invalidate", bool2Str(cfg.isInvalidate)) - cacheT += ("Start Size", cfg.getStartSize) cacheT += ("Affinity Function", safe(affinityCfg.getFunction)) cacheT += ("Affinity Backups", affinityCfg.getPartitionedBackups) http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/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 c68e4f8..e16aa02 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -179,7 +179,6 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose }, backups: Number, - startSize: Number, onheapCacheEnabled: Boolean, http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/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 434a4b4..354a8ff 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -1485,8 +1485,6 @@ export default class IgniteConfigurationGenerator { static cacheMemory(cache, ccfg = this.cacheConfigurationBean(cache)) { this._evictionPolicy(ccfg, 'evictionPolicy', cache.evictionPolicy, cacheDflts.evictionPolicy); - ccfg.intProperty('startSize'); - return ccfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/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 233ecb2..febba62 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/PlatformGenerator.js @@ -295,8 +295,6 @@ export default ['JavaTypes', 'igniteClusterPlatformDefaults', 'igniteCachePlatfo static cacheMemory(cache, ccfg = this.cacheConfigurationBean(cache)) { // this._evictionPolicy(ccfg, 'evictionPolicy', cache.evictionPolicy, cacheDflts.evictionPolicy); - ccfg.intProperty('startSize'); - return ccfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/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 4efc892..e77d1d3 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,7 +26,6 @@ const DFLT_CACHE = { clsName: 'org.apache.ignite.cache.PartitionLossPolicy', value: 'IGNORE' }, - startSize: 1500000, sqlOnheapRowCacheSize: 10240, longQueryWarningTimeout: 3000, snapshotableIndex: false, http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug b/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug index 8384be9..4ea9160 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug @@ -41,14 +41,5 @@ include /app/helpers/jade/mixins <li>First In First Out (FIFO) - Eviction policy based on FIFO algorithm and supports batch eviction</li>\ <li>SORTED - Eviction policy which will select the minimum cache entry for eviction</li>\ </ul>') - .settings-row - +number('Start size:', `${model}.startSize`, '"startSize"', 'true', '1500000', '0', - 'In terms of size and capacity, Ignite internal cache map acts exactly like a normal Java HashMap: it has some initial capacity\ - (which is pretty small by default), which doubles as data arrives. The process of internal cache map resizing is CPU-intensive\ - and time-consuming, and if you load a huge dataset into cache (which is a normal use case), the map will have to resize a lot of times.\ - To avoid that, you can specify the initial cache map capacity, comparable to the expected size of your dataset.\ - This will save a lot of CPU resources during the load time, because the map would not have to resize.\ - For example, if you expect to load 10 million entries into cache, you can set this property to 10 000 000.\ - This will save you from cache internal map resizes.') .col-sm-6 +preview-xml-java(model, 'cacheMemory') http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java index b21716c..1e86278 100644 --- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java +++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java @@ -206,7 +206,6 @@ public class DemoCachesLoadService implements Service { ccfg.setAffinity(new RendezvousAffinityFunction(false, 32)); ccfg.setQueryDetailMetricsSize(10); - ccfg.setStartSize(100); ccfg.setStatisticsEnabled(true); ccfg.setSqlFunctionClasses(SQLFunctions.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java index c704dbe..e6242fc 100644 --- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java +++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java @@ -111,7 +111,6 @@ public class DemoRandomCacheLoadService implements Service { ccfg.setAffinity(new RendezvousAffinityFunction(false, 32)); ccfg.setQueryDetailMetricsSize(10); - ccfg.setStartSize(100); ccfg.setStatisticsEnabled(true); ccfg.setIndexedTypes(Integer.class, Integer.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/b2aeac75/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml ---------------------------------------------------------------------- diff --git a/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml b/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml index 9cb2761..09a7848 100644 --- a/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml +++ b/modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml @@ -94,9 +94,6 @@ <!-- Enable primary sync write mode. --> <property name="writeSynchronizationMode" value="PRIMARY_SYNC"/> - <!-- Initial cache size. --> - <property name="startSize" value="1500000"/> - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). @@ -123,9 +120,6 @@ <bean class="org.apache.ignite.configuration.NearCacheConfiguration"/> </property> - <!-- Initial cache size. --> - <property name="startSize" value="1500000"/> - <!-- Setting this value will cause local node to wait for remote commits. However, it's important to set it this way in the examples as we assert on @@ -161,9 +155,6 @@ <!-- Set synchronous rebalancing (default is asynchronous). --> <property name="rebalanceMode" value="SYNC"/> - - <!-- Initial cache size. --> - <property name="startSize" value="150000"/> </bean> <!-- @@ -175,9 +166,6 @@ <!-- LOCAL cache mode. --> <property name="cacheMode" value="LOCAL"/> - - <!-- Initial cache size. --> - <property name="startSize" value="150000"/> </bean> </list> </property>
