ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-2612 WIP Rework to Angular directives.
Date Wed, 24 Feb 2016 15:02:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2612 9700b7c0d -> 9c3bbcb9d


IGNITE-2612 WIP Rework to Angular directives.


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

Branch: refs/heads/ignite-2612
Commit: 9c3bbcb9db1f6eff2c264ee45a2d95708f65bee9
Parents: 9700b7c
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Feb 24 22:02:36 2016 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Feb 24 22:02:36 2016 +0700

----------------------------------------------------------------------
 .../states/configuration/caches/general.jade    | 33 +++++++
 .../states/configuration/caches/memory.jade     | 91 +++++++++-----------
 2 files changed, 76 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9c3bbcb9/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
index 761e037..975585b 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/general.jade
@@ -118,6 +118,39 @@ form.panel.panel-default(name='general' novalidate)
                             data-placeholder='0'
                             data-min='0'
                         )
+                .settings-row(data-ng-show='#{model}.backups && #{model}.cacheMode
!== "LOCAL"')
+                    ignite-form-field.checkbox
+                        ignite-form-field-input-checkbox(
+                            data-id='readFromBackup'
+                            data-name='readFromBackup'
+                            data-ng-model='#{model}.readFromBackup'
+                        )
+                        | Read from backup
+                        ignite-form-field-tooltip
+                            | Flag indicating whether data can be read from backup#[br]
+                            | If not set then always get data from primary node (never from
backup)
+                .settings-row
+                    ignite-form-field.checkbox
+                        ignite-form-field-input-checkbox(
+                            data-id='copyOnRead'
+                            data-name='copyOnRead'
+                            data-ng-model='#{model}.copyOnRead'
+                        )
+                        | Copy on read
+                        ignite-form-field-tooltip
+                            | Flag indicating whether copy of the value stored in cache should
be created for cache operation implying return value#[br]
+                            | Also if this flag is set copies are created for values passed
to CacheInterceptor and to CacheEntryProcessor
+                .settings-row
+                    ignite-form-field.checkbox
+                        ignite-form-field-input-checkbox(
+                            data-id='invalidate'
+                            data-name='invalidate'
+                            data-ng-model='#{model}.invalidate'
+                        )
+                        | Invalidate near cache
+                        ignite-form-field-tooltip
+                            | Invalidation flag for near cache entries in transaction#[br]
+                            | If set then values will be invalidated (nullified) upon commit
in near cache
             ignite-ui-ace.col-sm-6
                 .preview-panel(ng-init='mode = false')
                     .preview-legend

http://git-wip-us.apache.org/repos/asf/ignite/blob/9c3bbcb9/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
index e31f094..244b013 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
@@ -20,6 +20,8 @@ form.panel.panel-default(name='memory' novalidate)
     .panel-heading(bs-collapse-toggle)
         ignite-form-panel-chevron
         label Memory
+        ignite-form-field-tooltip.tipLabel
+            | Cache memory settings
         ignite-form-revert
     .panel-collapse(role='tabpanel' bs-collapse-target id='memory')
         .panel-body
@@ -27,65 +29,58 @@ form.panel.panel-default(name='memory' novalidate)
                 .settings-row
                     ignite-form-field
                         ignite-form-field-label
-                            | Name:
+                            | Mode:
                         ignite-form-field-tooltip
-                            | Cache name
-                        ignite-form-field-input-text(
-                            data-id='cacheName'
-                            data-name='cacheName'
-                            data-ng-model='#{model}.name'
-                            data-ng-required='true'
-                            data-placeholder='Input name'
-                        )
-                .settings-row
-                    ignite-form-field
-                        ignite-form-field-label
-                            | Clusters: #[a(ui-sref='base.configuration.clusters({id: #{model}._id})')
(add)]
-                        ignite-form-field-tooltip
-                            | Associate clusters with the current cache
+                            | Memory modes:
+                            ul: li ONHEAP_TIERED - entries are cached on heap memory first
+                                ul: li If offheap memory is enabled and eviction policy evicts
an entry from heap memory, entry will be moved to offheap memory#[br]
+                                       | If offheap memory is disabled, then entry is simply
discarded
+                                    li If swap space is enabled and offheap memory fills
up, then entry will be evicted into swap space#[br]
+                                        | If swap space is disabled, then entry will be discarded.
If swap is enabled and offheap memory is disabled, then entry will be evicted directly from
heap memory into swap
+                                li OFFHEAP_TIERED - works the same as ONHEAP_TIERED, except
that entries never end up in heap memory and get stored in offheap memory right away#[br]
+                                    | Entries get cached in offheap memory first and then
get evicted to swap, if one is configured
+                                li OFFHEAP_VALUES - entry keys will be stored on heap memory,
and values will be stored in offheap memory#[br]
+                                    | Note that in this mode entries can be evicted only
to swap
                         ignite-form-field-dropdown(
-                            data-id='clusters'
-                            data-name='clusters'
-                            data-options='clusters'
-                            data-multiple='true'
-                            data-ng-model='#{model}.clusters'
-                            data-ng-disabled='!clusters.length'
-                            data-placeholder='{{ clusters.length ? "Choose clusters": "No
clusters configured" }}'
+                            data-id='memoryMode'
+                            data-name='memoryMode'
+                            data-options='[\
+                                {value: "ONHEAP_TIERED", label: "ONHEAP_TIERED"},\
+                                {value: "OFFHEAP_TIERED", label: "OFFHEAP_TIERED"},\
+                                {value: "OFFHEAP_VALUES", label: "OFFHEAP_VALUES"}\
+                            ]'
+                            data-ng-model='#{model}.memoryMode'
+                            data-placeholder='ONHEAP_TIERED'
                         )
-                .settings-row
+                .settings-row(data-ng-show='#{model}.memoryMode !== "OFFHEAP_VALUES"')
                     ignite-form-field
                         ignite-form-field-label
-                            | Domain models: #[a(ui-sref='base.configuration.domains({id:
#{model}._id})') (add)]
+                            | Off-heap max memory:
                         ignite-form-field-tooltip
-                            | Associate clusters with the current cache
-                        ignite-form-field-dropdown(
-                            data-id='domains'
-                            data-name='domains'
-                            data-options='domains'
-                            data-multiple='true'
-                            data-ng-model='#{model}.domains'
-                            data-ng-disabled='!domains.length'
-                            data-placeholder='{{ domains.length ? "Choose domain models":
"No domain models configured" }}'
+                            | Sets maximum amount of memory available to off-heap storage#[br]
+                            | Possible values are:
+                            ul: li -1 - means that off-heap storage is disabled
+                                li 0 - Ignite will not limit off-heap storage (it's up to
user to properly add and remove entries from cache to ensure that off-heap storage does not
grow infinitely
+                                li Any positive value specifies the limit of off-heap storage
in bytes
+                        ignite-form-field-input-number(
+                            data-id='offHeapMaxMemory'
+                            data-name='offHeapMaxMemory'
+                            data-ng-model='#{model}.offHeapMaxMemory'
+                            data-placeholder='-1'
+                            data-min='-1'
                         )
                 .settings-row
                     ignite-form-field
                         ignite-form-field-label
-                            | Cache mode:
+                            | Start size:
                         ignite-form-field-tooltip
-                            | Cache modes:
-                            ul: li Partitioned - in this mode the overall key set will be
divided into partitions and all partitions will be split equally between participating nodes
-                                li Replicated - in this mode all the keys are distributed
to all participating nodes
-                                li Local - in this mode caches residing on different grid
nodes will not know about each other
-                        ignite-form-field-dropdown(
-                        data-id='cacheMode'
-                        data-name='cacheMode'
-                        data-options='[\
-                            {value: "LOCAL", label: "LOCAL"},\
-                            {value: "REPLICATED", label: "REPLICATED"},\
-                            {value: "PARTITIONED", label: "PARTITIONED"}\
-                        ]'
-                        data-ng-model='#{model}.cacheMode'
-                        data-placeholder='PARTITIONED'
+                            | Initial cache size which will be used to pre-create internal
hash table after start
+                        ignite-form-field-input-number(
+                            data-id='startSize'
+                            data-name='startSize'
+                            data-ng-model='#{model}.startSize'
+                            data-placeholder='1500000'
+                            data-min='0'
                         )
             ignite-ui-ace.col-sm-6
                 .preview-panel(ng-init='mode = false')


Mime
View raw message