IGNITE-843 Removed random eviction policy.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2dc76991 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2dc76991 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2dc76991 Branch: refs/heads/ignite-843-rc1 Commit: 2dc76991ac53898d95df82e783e31e55289290c2 Parents: ce94505 Author: Andrey <anovi...@gridgain.com> Authored: Tue Nov 10 13:57:17 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Nov 10 13:57:17 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/caches.json | 30 -------------------- .../src/main/js/controllers/models/summary.json | 15 ---------- modules/control-center-web/src/main/js/db.js | 10 ++----- .../js/helpers/generator/generator-common.js | 4 --- 4 files changed, 2 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2dc76991/modules/control-center-web/src/main/js/controllers/models/caches.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json index 07c6cc3..7c40aba 100644 --- a/modules/control-center-web/src/main/js/controllers/models/caches.json +++ b/modules/control-center-web/src/main/js/controllers/models/caches.json @@ -236,21 +236,6 @@ } ] }, - "RND": { - "expanded": false, - "fields": [ - { - "label": "Max size", - "type": "number", - "path": "evictionPolicy.RND", - "model": "maxSize", - "placeholder": 100000, - "tip": [ - "Maximum allowed size of cache before entry will start getting evicted" - ] - } - ] - }, "FIFO": { "expanded": false, "fields": [ @@ -923,21 +908,6 @@ } ] }, - "RND": { - "expanded": false, - "fields": [ - { - "label": "Max size", - "type": "number", - "path": "nearConfiguration.nearEvictionPolicy.RND", - "model": "maxSize", - "placeholder": 100000, - "tip": [ - "Maximum allowed size of cache before entry will start getting evicted" - ] - } - ] - }, "FIFO": { "expanded": false, "fields": [ http://git-wip-us.apache.org/repos/asf/ignite/blob/2dc76991/modules/control-center-web/src/main/js/controllers/models/summary.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/summary.json b/modules/control-center-web/src/main/js/controllers/models/summary.json index 69b6d5b..b3025a3 100644 --- a/modules/control-center-web/src/main/js/controllers/models/summary.json +++ b/modules/control-center-web/src/main/js/controllers/models/summary.json @@ -81,21 +81,6 @@ } ] }, - "RND": { - "expanded": false, - "fields": [ - { - "label": "Max size", - "type": "number", - "path": "nearConfiguration.nearEvictionPolicy.RND", - "model": "maxSize", - "placeholder": 100000, - "tip": [ - "Maximum allowed size of cache before entry will start getting evicted" - ] - } - ] - }, "FIFO": { "expanded": false, "fields": [ http://git-wip-us.apache.org/repos/asf/ignite/blob/2dc76991/modules/control-center-web/src/main/js/db.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js index b45cdce..cce1976 100644 --- a/modules/control-center-web/src/main/js/db.js +++ b/modules/control-center-web/src/main/js/db.js @@ -105,15 +105,12 @@ var CacheSchema = new Schema({ swapEnabled: Boolean, evictionPolicy: { - kind: {type: String, enum: ['LRU', 'RND', 'FIFO', 'Sorted']}, + kind: {type: String, enum: ['LRU', 'FIFO', 'Sorted']}, LRU: { batchSize: Number, maxMemorySize: Number, maxSize: Number }, - RND: { - maxSize: Number - }, FIFO: { batchSize: Number, maxMemorySize: Number, @@ -189,15 +186,12 @@ var CacheSchema = new Schema({ nearConfiguration: { nearStartSize: Number, nearEvictionPolicy: { - kind: {type: String, enum: ['LRU', 'RND', 'FIFO', 'Sorted']}, + kind: {type: String, enum: ['LRU', 'FIFO', 'Sorted']}, LRU: { batchSize: Number, maxMemorySize: Number, maxSize: Number }, - RND: { - maxSize: Number - }, FIFO: { batchSize: Number, maxMemorySize: Number, http://git-wip-us.apache.org/repos/asf/ignite/blob/2dc76991/modules/control-center-web/src/main/js/helpers/generator/generator-common.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js index 0d16c5d..16bb952 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js @@ -192,10 +192,6 @@ $generatorCommon.EVICTION_POLICIES = { className: 'org.apache.ignite.cache.eviction.lru.LruEvictionPolicy', fields: {batchSize: null, maxMemorySize: null, maxSize: null} }, - RND: { - className: 'org.apache.ignite.cache.eviction.random.RandomEvictionPolicy', - fields: {maxSize: null} - }, FIFO: { className: 'org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy', fields: {batchSize: null, maxMemorySize: null, maxSize: null}