You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/06/23 08:37:34 UTC

incubator-ignite git commit: # ignite-850 WIP marshaller.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 eed5101fe -> ba1bc7b65


# ignite-850 WIP marshaller.


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

Branch: refs/heads/ignite-843
Commit: ba1bc7b6520c2cff41e7be4e5a9cb9c9779d13a3
Parents: eed5101
Author: Andrey <an...@gridgain.com>
Authored: Tue Jun 23 13:37:46 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Jun 23 13:37:46 2015 +0700

----------------------------------------------------------------------
 modules/webconfig/nodejs/db.js                            | 10 ++++++++--
 modules/webconfig/nodejs/public/form-models/clusters.json |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba1bc7b6/modules/webconfig/nodejs/db.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/db.js b/modules/webconfig/nodejs/db.js
index 63f1a1e..df5e280 100644
--- a/modules/webconfig/nodejs/db.js
+++ b/modules/webconfig/nodejs/db.js
@@ -179,9 +179,15 @@ var ClusterSchema = new Schema({
             'EVTS_CACHE_QUERY', 'EVTS_SWAPSPACE', 'EVTS_IGFS']
     }],
     managementThreadPoolSize: Number,
+    marshaller: {kind: {type: String, enum: ['OptimizedMarshaller', 'JdkMarshaller']},
+        OptimizedMarshaller: {
+            poolSize: Number,
+            requireSerializable: Boolean
+        }
+    },
     marshalLocalJobs: Boolean,
-    marshCacheKeepAliveTime: Number,
-    marshCachePoolSize: Number,
+    marshallerCacheKeepAliveTime: Number,
+    marshallerCacheThreadPoolSize: Number,
     metricsExpireTime: Number,
     metricsHistorySize: Number,
     metricsLogFrequency: Number,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba1bc7b6/modules/webconfig/nodejs/public/form-models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json
index 1fb8de3..7e5ac72 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -405,7 +405,7 @@
               "fields": [
                 {
                   "label": "Streams pool size",
-                  "type": "text",
+                  "type": "number",
                   "model": "poolSize",
                   "placeholder": "0",
                   "tip": [