You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/06/23 12:26:16 UTC
[1/2] incubator-ignite git commit: # IGNITE-843 WIP cache store.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 606f1e4bb -> 94ff76bf7
# IGNITE-843 WIP cache store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e1d8245
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e1d8245
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e1d8245
Branch: refs/heads/ignite-843
Commit: 7e1d8245537c8b889ef71cb0eb5729950a1f2b25
Parents: 9970ed9
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jun 23 17:25:42 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jun 23 17:25:42 2015 +0700
----------------------------------------------------------------------
modules/webconfig/nodejs/db.js | 17 +++++
.../nodejs/public/form-models/caches.json | 65 +++++++++++++++++++-
2 files changed, 81 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e1d8245/modules/webconfig/nodejs/db.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/db.js b/modules/webconfig/nodejs/db.js
index df5e280..06169d5 100644
--- a/modules/webconfig/nodejs/db.js
+++ b/modules/webconfig/nodejs/db.js
@@ -89,6 +89,23 @@ var CacheSchema = new Schema({
rebalanceTimeout: Number,
rebalanceThrottle: Number,
+ store: {
+ kind: {type: String, enum: ['CacheJdbcPojoStoreFactory', 'CacheJdbcBlobStoreFactory', 'CacheHibernateBlobStoreFactory']},
+ CacheJdbcPojoStoreFactory: {
+ dataSourceBean: String,
+ dialect: {type: String, enum: ['BasicJdbcDialect', 'OracleDialect', 'DB2Dialect', 'SQLServerDialect', 'MySQLDialect', 'H2Dialect']}
+ },
+ CacheJdbcBlobStoreFactory: {
+ multicastGroup: String,
+ multicastPort: Number,
+ responseWaitTime: Number,
+ addressRequestAttempts: Number,
+ localAddress: String
+ },
+ CacheHibernateBlobStoreFactory: {
+ hibernateProperties: [String]
+ }
+ },
readThrough: Boolean,
writeThrough: Boolean,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e1d8245/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 29f426e..d6085ae 100644
--- a/modules/webconfig/nodejs/public/form-models/caches.json
+++ b/modules/webconfig/nodejs/public/form-models/caches.json
@@ -387,12 +387,75 @@
"tip": [
"Flag indicating whether DB schema should be initialized by Ignite (default behaviour) or was explicitly created by user."
]
+ },
+ {
+ "label": "Create query",
+ "type": "text",
+ "model": "�reateTableQuery",
+ "placeholder": "create table if not exists ENTRIES (key binary primary key, val binary)",
+ "tip": [
+ "Default query for table creation in underlying database.",
+ "create table if not exists ENTRIES (key binary primary key, val binary)"
+ ]
+ },
+ {
+ "label": "Load query",
+ "type": "text",
+ "model": "loadQuery",
+ "placeholder": "select * from ENTRIES where key=?",
+ "tip": [
+ "Default load entry query from underlying database.",
+ "select * from ENTRIES where key=?"
+ ]
+ },
+ {
+ "label": "insert query",
+ "type": "text",
+ "model": "insertQuery",
+ "placeholder": "insert into ENTRIES (key, val) values (?, ?)",
+ "tip": [
+ "Default insert entry query to underlying database.",
+ "insert into ENTRIES (key, val) values (?, ?)"
+ ]
+ },
+ {
+ "label": "Update query",
+ "type": "text",
+ "model": "updateQuery",
+ "placeholder": "update ENTRIES set val=? where key=?",
+ "tip": [
+ "Default update entry query to underlying database.",
+ "update ENTRIES set val=? where key=?"
+ ]
+ },
+ {
+ "label": "Delete query",
+ "type": "text",
+ "model": "deleteQuery",
+ "placeholder": "delete from ENTRIES where key=?",
+ "tip": [
+ "Default delete entry query to underlying database.",
+ "delete from ENTRIES where key=?"
+ ]
}
]
},
"CacheHibernateBlobStoreFactory": {
"expanded": true,
- "fields": []
+ "fields": [
+ {
+ "tableLabel": "Hibernate properties",
+ "label": "Hibernate property",
+ "type": "table-simple",
+ "model": "hibernateProperties",
+ "editIdx": -1,
+ "placeholder": "key=value",
+ "tip": [
+ "List of Hibernate properties.",
+ "For example: connection.url=jdbc:h2:mem:"
+ ]
+ }
+ ]
}
}
},
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/94ff76bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/94ff76bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/94ff76bf
Branch: refs/heads/ignite-843
Commit: 94ff76bf7b01dc913633d5cfd0f011ed8bfe0756
Parents: 7e1d824 606f1e4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jun 23 17:26:11 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jun 23 17:26:11 2015 +0700
----------------------------------------------------------------------
.../webconfig/nodejs/public/javascripts/controllers/caches.js | 4 ++--
.../webconfig/nodejs/public/javascripts/controllers/clusters.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------