ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: # IGNITE-843 WIP on caches screen.
Date Tue, 09 Jun 2015 05:42:43 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 9805e8c0f -> ff787e1bf


# IGNITE-843 WIP on caches screen.


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

Branch: refs/heads/ignite-843
Commit: ff787e1bf7d771722f4f1c57c2d484194ef0a754
Parents: 9805e8c
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Jun 9 12:42:35 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Jun 9 12:42:35 2015 +0700

----------------------------------------------------------------------
 .../nodejs/public/form-models/caches.json       | 87 ++++++++++++++++++--
 .../public/javascripts/controllers/caches.js    |  6 --
 .../webconfig/nodejs/views/indexedTypes.jade    |  8 +-
 modules/webconfig/nodejs/views/login.jade       | 10 +--
 4 files changed, 90 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff787e1b/modules/webconfig/nodejs/public/form-models/caches.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/caches.json b/modules/webconfig/nodejs/public/form-models/caches.json
index ba2c85f..d067121 100644
--- a/modules/webconfig/nodejs/public/form-models/caches.json
+++ b/modules/webconfig/nodejs/public/form-models/caches.json
@@ -198,7 +198,7 @@
         {
           "label": "Flush threads count",
           "type": "text",
-          "model": "WriteBehindFlushThreadCount",
+          "model": "writeBehindFlushThreadCount",
           "placeholder": "1",
           "tip": [
             "Number of threads that will perform cache flushing."
@@ -207,25 +207,33 @@
       ]
     },
     {
-      "label": "Transcation",
+      "label": "Transaction",
       "fields": [
         {
           "label": "Invalidate",
           "type": "check",
-          "model": "Invalidate",
+          "model": "invalidate",
           "tip": [
             "Invalidation flag for near cache entries in transaction.<br/>",
-            "If true, values will be invalidated (nullified) upon commit in near cache."
+            "If set then values will be invalidated (nullified) upon commit in near cache."
           ]
         },
         {
           "label": "Default lock timeout",
           "type": "text",
-          "model": "DefaultLockTimeout",
+          "model": "defaultLockTimeout",
           "placeholder": "1",
           "tip": [
             "Default lock acquisition timeout.<br/>",
-            "If 0 thenlock acquisition will never timeout."
+            "If 0 then lock acquisition will never timeout."
+          ]
+        },
+        {
+          "label": "Manager finder",
+          "type": "text",
+          "model": "transactionManagerLookupClassName",
+          "tip": [
+            "Class name of transaction manager finder for integration for JEE app servers."
           ]
         }
       ]
@@ -234,11 +242,78 @@
       "label": "Query",
       "fields": [
         {
+          "label": "Escape all",
+          "type": "check",
+          "model": "sqlEscapeAll",
+          "tip": [
+            "If set then all the SQL table and field names will be escaped with double quotes.<br/>",
+            "This enforces case sensitivity for field names and also allows having special
characters in table and field names."
+          ]
+        },
+        {
+          "label": "Cached rows",
+          "type": "text",
+          "model": "sqlOnheapRowCacheSize",
+          "placeholder": "10240",
+          "tip": [
+            "Number of SQL rows which will be cached onheap to avoid deserialization on each
SQL index access."
+          ]
+        },
+        {
+          "label": "Long query timeout",
+          "type": "text",
+          "model": "longQueryWarningTimeout",
+          "placeholder": "3000",
+          "tip": [
+            "Timeout in milliseconds after which long query warning will be printed."
+          ]
+        },
+        {
           "type": "indexedTypes",
           "model": "indexedTypes",
           "tip": [
             "Collection of types to index"
           ]
+        },
+        {
+          "label": "SQL functions",
+          "type": "text",
+          "model": "sqlFunctionClasses",
+          "tip": [
+            "Classes with user-defined functions for SQL queries."
+          ]
+        }
+      ]
+    },
+    {
+      "label": "Misc",
+      "fields": [
+        {
+          "label": "Read from backup",
+          "type": "check",
+          "model": "readFromBackup",
+          "tip": [
+            "Flag indicating whether data can be read from backup.<br/>",
+            "If not set then always get data from primary node (never from backup)."
+          ]
+        },
+        {
+          "label": "Copy on read",
+          "type": "check",
+          "model": "copyOnRead",
+          "tip": [
+            "Flag indicating whether copy of 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."
+          ]
+        },
+        {
+          "label": "Max concurrent async operations",
+          "type": "text",
+          "model": "maxConcurrentAsyncOperations",
+          "tip": [
+            "Maximum number of allowed concurrent asynchronous operations.<br/>",
+            "If 0 returned then number of concurrent asynchronous operations is unlimited."
+          ]
         }
       ]
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff787e1b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
index ae67a7f..c93aef0 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -67,12 +67,6 @@ configuratorModule.controller('cachesController', ['$scope', '$modal',
'$http',
             indexedTypesModal.$promise.then(indexedTypesModal.show);
         };
 
-
-        //DefaultLockTimeout dfltLockTimeout
-        //invalidate
-        //TransactionManagerLookupClassName tmLookupClsName
-        // maxConcurrentAsyncOps
-
         $scope.caches = [];
 
         // When landing on the page, get caches and show them.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff787e1b/modules/webconfig/nodejs/views/indexedTypes.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/indexedTypes.jade b/modules/webconfig/nodejs/views/indexedTypes.jade
index a2c958c..a968ebc 100644
--- a/modules/webconfig/nodejs/views/indexedTypes.jade
+++ b/modules/webconfig/nodejs/views/indexedTypes.jade
@@ -11,7 +11,7 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-div(class=['modal', 'center'] tabindex='-1' role='dialog')
+.modal.center(role='dialog')
     .modal-dialog
         .modal-content
             .modal-header
@@ -23,11 +23,11 @@ div(class=['modal', 'center'] tabindex='-1' role='dialog')
                         .form-group
                             label.col-sm-3.control-label Key Class:
                             .controls.col-sm-9
-                                input.form-control(type='text')
+                                input.form-control(type='text' required)
                         .form-group
                             label.col-sm-3.control-label Value Class:
                             .controls.col-sm-9
-                                input.form-control(type='text')
+                                input.form-control(type='text' required)
                 .modal-footer
-                    button.btn.btn-primary(ng-click='saveIndexedType(key, val)' ng-disabled='discoveryForm.$invalid')
Save
+                    button.btn.btn-primary(ng-click='saveIndexedType(key, val)' ng-disabled='indexedTypeForm.$invalid')
Save
                     button.btn.btn-primary(ng-click='$hide()') Cancel

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff787e1b/modules/webconfig/nodejs/views/login.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/login.jade b/modules/webconfig/nodejs/views/login.jade
index 7806e6f..239e51d 100644
--- a/modules/webconfig/nodejs/views/login.jade
+++ b/modules/webconfig/nodejs/views/login.jade
@@ -14,7 +14,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-.modal.center(tabindex='-1' role='dialog')
+.modal.center(role='dialog')
     .modal-dialog
         .modal-content
             .modal-header.header
@@ -27,17 +27,17 @@
                 .modal-body.row
                     div(ng-show='errorMessage')
                         p.text-center.error-message {{errorMessage}}
-                    .col-xs-9.login.col-xs-offset-1
+                    .col-sm-9.login.col-sm-offset-1
                         .form-group(ng-show='action == "register"')
-                            label.col-sm-3.control-label Full Name
+                            label.col-sm-3.control-label Full Name:
                             .controls.col-sm-9
                                 input.form-control(type='text', ng-model='user_info.username',
placeholder='John Smith', focus-me='action=="register"', ng-required='action=="register"')
                         .form-group
-                            label.col-sm-3.control-label Email
+                            label.col-sm-3.control-label Email:
                             .controls.col-sm-9
                                 input.form-control(type='email', ng-model='user_info.email',
placeholder='you@domain.com', focus-me='action=="login"', required)
                         .form-group
-                            label.col-sm-3.control-label Password
+                            label.col-sm-3.control-label Password:
                             .controls.col-sm-9
                                 input.form-control(type='password', ng-model='user_info.password',
placeholder='Password', required)
             .modal-footer


Mime
View raw message