Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding

This commit is contained in:
Max Neunhoeffer 2014-01-17 14:23:03 +01:00
parent bedd06229b 7751576907
commit 4f9a180690
1 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
js/server/modules/org/arangodb/cluster.js
View File

@ -193,7 +193,18 @@ function createLocalDatabases (plannedDatabases) {
// TODO: handle options and user information // TODO: handle options and user information
console.info("creating local database '%s'", payload.name); console.info("creating local database '%s'", payload.name);
db._createDatabase(payload.name);
try {
db._createDatabase(payload.name);
payload.error = false;
payload.errorNum = 0;
payload.errorMessage = "no error";
}
catch (err) {
payload.error = true;
payload.errorNum = err.errorNum;
payload.errorMessage = err.errorMessage;
}
writeLocked({ part: "Current" }, writeLocked({ part: "Current" },
createDatabaseAgency, createDatabaseAgency,
@ -298,17 +309,23 @@ function createLocalCollections (plannedCollections) {
// must create this shard // must create this shard
console.info("creating local shard '%s/%s'", database, shard); console.info("creating local shard '%s/%s'", database, shard);
if (payload.type === ArangoCollection.TYPE_EDGE) { try {
db._createEdgeCollection(shard, payload); if (payload.type === ArangoCollection.TYPE_EDGE) {
db._createEdgeCollection(shard, payload);
}
else {
db._create(shard, payload);
}
payload.error = false;
payload.errorNum = 0;
payload.errorMessage = "no error";
} }
else { catch (err2) {
db._create(shard, payload); payload.error = true;
payload.errorNum = err2.errorNum;
payload.errorMessage = err2.errorMessage;
} }
payload.error = false;
payload.errorNum = 0;
payload.errorMessage = "no error";
writeLocked({ part: "Current" }, writeLocked({ part: "Current" },
createCollectionAgency, createCollectionAgency,
[ database, payload ]); [ database, payload ]);
@ -329,12 +346,20 @@ function createLocalCollections (plannedCollections) {
console.info("updating properties for local shard '%s/%s'", console.info("updating properties for local shard '%s/%s'",
database, database,
shard); shard);
db._collection(shard).properties(properties);
try {
db._collection(shard).properties(properties);
payload.error = false;
payload.errorNum = 0;
payload.errorMessage = "no error";
}
catch (err3) {
payload.error = true;
payload.errorNum = err3.errorNum;
payload.errorMessage = err3.errorMessage;
}
payload.error = false;
payload.errorNum = 0;
payload.errorMessage = "no error";
writeLocked({ part: "Current" }, writeLocked({ part: "Current" },
createCollectionAgency, createCollectionAgency,
[ database, payload ]); [ database, payload ]);