Skip to content

J
jio-main
Commit 7f163854 authored by Tristan Cavelier's avatar Tristan Cavelier
Browse files
Options

revisionstorage.js updated for jIO v2

parent b86d500e
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 144 deletions
src/jio.storage/revisionstorage.js
View file @ 7f163854
...@@ -20,26 +20,14 @@ ...@@ -20,26 +20,14 @@
}(['jio', 'sha256'], function (jIO, sha256) { }(['jio', 'sha256'], function (jIO, sha256) {
"use strict"; "use strict";
jIO.addStorageType("revision", function (spec, my) { jIO.addStorage("revision", function (spec) {
var that = {}, priv = {}; var that = this, priv = {};
spec = spec || {}; spec = spec || {};
that = my.basicStorage(spec, my);
// ATTRIBUTES // // ATTRIBUTES //
priv.doc_tree_suffix = ".revision_tree.json"; priv.doc_tree_suffix = ".revision_tree.json";
priv.sub_storage = spec.sub_storage; priv.sub_storage = spec.sub_storage;
// METHODS // // METHODS //
/**
* Description to store in order to be restored later
* @method specToStore
* @return {object} Descriptions to store
*/
that.specToStore = function () {
return {
"sub_storage": priv.sub_storage
};
};
/** /**
* Clones an object in deep (without functions) * Clones an object in deep (without functions)
* @method clone * @method clone
...@@ -93,11 +81,9 @@ ...@@ -93,11 +81,9 @@
priv.checkDocumentRevisionFormat = function (doc) { priv.checkDocumentRevisionFormat = function (doc) {
var send_error = function (message) { var send_error = function (message) {
return { return {
"status": 31, "status": 409,
"statusText": "Wrong Revision Format",
"error": "wrong_revision_format",
"message": message, "message": message,
"reason": "Revision is wrong" "reason": "Wrong revision"
}; };
}; };
if (typeof doc._rev === "string") { if (typeof doc._rev === "string") {
...@@ -232,7 +218,7 @@ ...@@ -232,7 +218,7 @@
* @return {array} 0:The next revision number and 1:the hash code * @return {array} 0:The next revision number and 1:the hash code
*/ */
priv.generateNextRevision = function (doc, deleted_flag) { priv.generateNextRevision = function (doc, deleted_flag) {
var string, revision_history, revs_info, pseudo_revision; var string, revision_history, revs_info;
doc = priv.clone(doc) || {}; doc = priv.clone(doc) || {};
revision_history = doc._revs; revision_history = doc._revs;
revs_info = doc._revs_info; revs_info = doc._revs_info;
...@@ -281,7 +267,7 @@ ...@@ -281,7 +267,7 @@
}; };
priv.updateDocumentTree = function (doc, doc_tree) { priv.updateDocumentTree = function (doc, doc_tree) {
var revs_info, updateDocumentTreeRec, next_rev; var revs_info, updateDocumentTreeRec;
doc = priv.clone(doc); doc = priv.clone(doc);
revs_info = doc._revs_info; revs_info = doc._revs_info;
updateDocumentTreeRec = function (doc_tree, revs_info) { updateDocumentTreeRec = function (doc_tree, revs_info) {
...@@ -306,19 +292,20 @@ ...@@ -306,19 +292,20 @@
updateDocumentTreeRec(doc_tree, priv.clone(revs_info)); updateDocumentTreeRec(doc_tree, priv.clone(revs_info));
}; };
priv.send = function (method, doc, option, callback) { priv.send = function (command, method, doc, option, callback) {
that.addJob( function onSuccess(success) {
method, callback(undefined, success);
priv.sub_storage, }
doc, function onError(err) {
option, callback(err, undefined);
function (success) { }
callback(undefined, success); if (method === 'allDocs') {
}, command.storage(priv.sub_storage).allDocs(option).
function (err) { then(onSuccess, onError);
callback(err, undefined); } else {
} command.storage(priv.sub_storage)[method](doc, option).
); then(onSuccess, onError);
}
}; };
priv.getWinnerRevsInfo = function (doc_tree) { priv.getWinnerRevsInfo = function (doc_tree) {
...@@ -369,35 +356,35 @@ ...@@ -369,35 +356,35 @@
return conflicts.length === 0 ? undefined : conflicts; return conflicts.length === 0 ? undefined : conflicts;
}; };
priv.get = function (doc, option, callback) { priv.get = function (command, doc, option, callback) {
priv.send("get", doc, option, callback); priv.send(command, "get", doc, option, callback);
}; };
priv.put = function (doc, option, callback) { priv.put = function (command, doc, option, callback) {
priv.send("put", doc, option, callback); priv.send(command, "put", doc, option, callback);
}; };
priv.remove = function (doc, option, callback) { priv.remove = function (command, doc, option, callback) {
priv.send("remove", doc, option, callback); priv.send(command, "remove", doc, option, callback);
}; };
priv.getAttachment = function (attachment, option, callback) { priv.getAttachment = function (command, attachment, option, callback) {
priv.send("getAttachment", attachment, option, callback); priv.send(command, "getAttachment", attachment, option, callback);
}; };
priv.putAttachment = function (attachment, option, callback) { priv.putAttachment = function (command, attachment, option, callback) {
priv.send("putAttachment", attachment, option, callback); priv.send(command, "putAttachment", attachment, option, callback);
}; };
priv.removeAttachment = function (attachment, option, callback) { priv.removeAttachment = function (command, attachment, option, callback) {
priv.send("removeAttachment", attachment, option, callback); priv.send(command, "removeAttachment", attachment, option, callback);
}; };
priv.getDocument = function (doc, option, callback) { priv.getDocument = function (command, doc, option, callback) {
doc = priv.clone(doc); doc = priv.clone(doc);
doc._id = doc._id + "." + doc._rev; doc._id = doc._id + "." + doc._rev;
delete doc._attachment; delete doc._attachment;
delete doc._rev; delete doc._rev;
delete doc._revs; delete doc._revs;
delete doc._revs_info; delete doc._revs_info;
priv.get(doc, option, callback); priv.get(command, doc, option, callback);
}; };
priv.putDocument = function (doc, option, callback) { priv.putDocument = function (command, doc, option, callback) {
doc = priv.clone(doc); doc = priv.clone(doc);
doc._id = doc._id + "." + doc._rev; doc._id = doc._id + "." + doc._rev;
delete doc._attachment; delete doc._attachment;
...@@ -406,19 +393,19 @@ ...@@ -406,19 +393,19 @@
delete doc._rev; delete doc._rev;
delete doc._revs; delete doc._revs;
delete doc._revs_info; delete doc._revs_info;
priv.put(doc, option, callback); priv.put(command, doc, option, callback);
}; };
priv.getRevisionTree = function (doc, option, callback) { priv.getRevisionTree = function (command, doc, option, callback) {
doc = priv.clone(doc); doc = priv.clone(doc);
doc._id = doc._id + priv.doc_tree_suffix; doc._id = doc._id + priv.doc_tree_suffix;
priv.get(doc, option, callback); priv.get(command, doc, option, callback);
}; };
priv.getAttachmentList = function (doc, option, callback) { priv.getAttachmentList = function (command, doc, option, callback) {
var attachment_id, dealResults, state = "ok", result_list = [], count = 0; var attachment_id, dealResults, state = "ok", result_list = [], count = 0;
dealResults = function (attachment_id, attachment_meta) { dealResults = function (attachment_id, attachment_meta) {
return function (err, attachment) { return function (err, response) {
if (state !== "ok") { if (state !== "ok") {
return; return;
} }
...@@ -433,12 +420,12 @@ ...@@ -433,12 +420,12 @@
} }
result_list.push({ result_list.push({
"_attachment": attachment_id, "_attachment": attachment_id,
"_data": attachment, "_data": response.data,
"_mimetype": attachment_meta.content_type "_mimetype": attachment_meta.content_type
}); });
if (count === 0) { if (count === 0) {
state = "finished"; state = "finished";
callback(undefined, result_list); callback(undefined, {"data": result_list});
} }
}; };
}; };
...@@ -446,6 +433,7 @@ ...@@ -446,6 +433,7 @@
if (doc._attachments.hasOwnProperty(attachment_id)) { if (doc._attachments.hasOwnProperty(attachment_id)) {
count += 1; count += 1;
priv.getAttachment( priv.getAttachment(
command,
{"_id": doc._id, "_attachment": attachment_id}, {"_id": doc._id, "_attachment": attachment_id},
option, option,
dealResults(attachment_id, doc._attachments[attachment_id]) dealResults(attachment_id, doc._attachments[attachment_id])
...@@ -457,11 +445,12 @@ ...@@ -457,11 +445,12 @@
} }
}; };
priv.putAttachmentList = function (doc, option, attachment_list, callback) { priv.putAttachmentList = function (command, doc, option,
attachment_list, callback) {
var i, dealResults, state = "ok", count = 0, attachment; var i, dealResults, state = "ok", count = 0, attachment;
attachment_list = attachment_list || []; attachment_list = attachment_list || [];
dealResults = function (index) { dealResults = function () {
return function (err, response) { return function (err) {
if (state !== "ok") { if (state !== "ok") {
return; return;
} }
...@@ -472,7 +461,7 @@ ...@@ -472,7 +461,7 @@
} }
if (count === 0) { if (count === 0) {
state = "finished"; state = "finished";
callback(undefined, {"id": doc._id, "ok": true}); callback(undefined, {});
} }
}; };
}; };
...@@ -481,18 +470,18 @@ ...@@ -481,18 +470,18 @@
if (attachment !== undefined) { if (attachment !== undefined) {
count += 1; count += 1;
attachment._id = doc._id + "." + doc._rev; attachment._id = doc._id + "." + doc._rev;
priv.putAttachment(attachment, option, dealResults(i)); priv.putAttachment(command, attachment, option, dealResults(i));
} }
} }
if (count === 0) { if (count === 0) {
return callback(undefined, {"id": doc._id, "ok": true}); return callback(undefined, {});
} }
}; };
priv.putDocumentTree = function (doc, option, doc_tree, callback) { priv.putDocumentTree = function (command, doc, option, doc_tree, callback) {
doc_tree = priv.clone(doc_tree); doc_tree = priv.clone(doc_tree);
doc_tree._id = doc._id + priv.doc_tree_suffix; doc_tree._id = doc._id + priv.doc_tree_suffix;
priv.put(doc_tree, option, callback); priv.put(command, doc_tree, option, callback);
}; };
priv.notFoundError = function (message, reason) { priv.notFoundError = function (message, reason) {
...@@ -515,7 +504,7 @@ ...@@ -515,7 +504,7 @@
}; };
}; };
priv.revisionGenericRequest = function (doc, option, priv.revisionGenericRequest = function (command, doc, option,
specific_parameter, onEnd) { specific_parameter, onEnd) {
var prev_doc, doc_tree, attachment_list, callback = {}; var prev_doc, doc_tree, attachment_list, callback = {};
if (specific_parameter.doc_id) { if (specific_parameter.doc_id) {
...@@ -526,7 +515,7 @@ ...@@ -526,7 +515,7 @@
} }
callback.begin = function () { callback.begin = function () {
var check_error; var check_error;
doc._id = doc._id || priv.generateUuid(); doc._id = doc._id || priv.generateUuid(); // XXX should not generate id
if (specific_parameter.revision_needed && !doc._rev) { if (specific_parameter.revision_needed && !doc._rev) {
return onEnd(priv.conflictError( return onEnd(priv.conflictError(
"Document update conflict", "Document update conflict",
...@@ -538,7 +527,7 @@ ...@@ -538,7 +527,7 @@
if (check_error !== undefined) { if (check_error !== undefined) {
return onEnd(check_error, undefined); return onEnd(check_error, undefined);
} }
priv.getRevisionTree(doc, option, callback.getRevisionTree); priv.getRevisionTree(command, doc, option, callback.getRevisionTree);
}; };
callback.getRevisionTree = function (err, response) { callback.getRevisionTree = function (err, response) {
var winner_info, previous_revision, generate_new_revision; var winner_info, previous_revision, generate_new_revision;
...@@ -550,7 +539,7 @@ ...@@ -550,7 +539,7 @@
return onEnd(err, undefined); return onEnd(err, undefined);
} }
} }
doc_tree = response || priv.newDocTree(); doc_tree = response.data || priv.newDocTree();
if (specific_parameter.get || specific_parameter.getAttachment) { if (specific_parameter.get || specific_parameter.getAttachment) {
if (!doc._rev) { if (!doc._rev) {
winner_info = priv.getWinnerRevsInfo(doc_tree); winner_info = priv.getWinnerRevsInfo(doc_tree);
...@@ -569,7 +558,7 @@ ...@@ -569,7 +558,7 @@
doc._rev = winner_info[0].rev; doc._rev = winner_info[0].rev;
} }
priv.fillDocumentRevisionProperties(doc, doc_tree); priv.fillDocumentRevisionProperties(doc, doc_tree);
return priv.getDocument(doc, option, callback.getDocument); return priv.getDocument(command, doc, option, callback.getDocument);
} }
priv.fillDocumentRevisionProperties(doc, doc_tree); priv.fillDocumentRevisionProperties(doc, doc_tree);
if (generate_new_revision) { if (generate_new_revision) {
...@@ -602,7 +591,8 @@ ...@@ -602,7 +591,8 @@
"deleted" : "available"); "deleted" : "available");
priv.updateDocumentTree(doc, doc_tree); priv.updateDocumentTree(doc, doc_tree);
if (prev_doc) { if (prev_doc) {
return priv.getDocument(prev_doc, option, callback.getDocument); return priv.getDocument(command, prev_doc,
option, callback.getDocument);
} }
if (specific_parameter.remove || specific_parameter.removeAttachment) { if (specific_parameter.remove || specific_parameter.removeAttachment) {
return onEnd(priv.notFoundError( return onEnd(priv.notFoundError(
...@@ -662,9 +652,11 @@ ...@@ -662,9 +652,11 @@
} }
} }
if (specific_parameter.remove) { if (specific_parameter.remove) {
priv.putDocumentTree(doc, option, doc_tree, callback.putDocumentTree); priv.putDocumentTree(command, doc, option,
doc_tree, callback.putDocumentTree);
} else { } else {
priv.getAttachmentList(res_doc, option, callback.getAttachmentList); priv.getAttachmentList(command, res_doc, option,
callback.getAttachmentList);
} }
}; };
callback.getAttachmentList = function (err, res_list) { callback.getAttachmentList = function (err, res_list) {
...@@ -706,9 +698,9 @@ ...@@ -706,9 +698,9 @@
), undefined); ), undefined);
} }
} }
priv.putDocument(doc, option, callback.putDocument); priv.putDocument(command, doc, option, callback.putDocument);
}; };
callback.putDocument = function (err, response) { callback.putDocument = function (err) {
var i, attachment_found = false; var i, attachment_found = false;
if (err) { if (err) {
err.message = "Cannot post the document"; err.message = "Cannot post the document";
...@@ -731,20 +723,22 @@ ...@@ -731,20 +723,22 @@
} }
} }
priv.putAttachmentList( priv.putAttachmentList(
command,
doc, doc,
option, option,
attachment_list, attachment_list,
callback.putAttachmentList callback.putAttachmentList
); );
}; };
callback.putAttachmentList = function (err, response) { callback.putAttachmentList = function (err) {
if (err) { if (err) {
err.message = "Cannot copy attacments to the document"; err.message = "Cannot copy attacments to the document";
return onEnd(err, undefined); return onEnd(err, undefined);
} }
priv.putDocumentTree(doc, option, doc_tree, callback.putDocumentTree); priv.putDocumentTree(command, doc, option,
doc_tree, callback.putDocumentTree);
}; };
callback.putDocumentTree = function (err, response) { callback.putDocumentTree = function (err) {
var response_object; var response_object;
if (err) { if (err) {
err.message = "Cannot update the document history"; err.message = "Cannot update the document history";
...@@ -762,7 +756,7 @@ ...@@ -762,7 +756,7 @@
} }
onEnd(undefined, response_object); onEnd(undefined, response_object);
// if (option.keep_revision_history !== true) { // if (option.keep_revision_history !== true) {
// // priv.remove(prev_doc, option, function () { // // priv.remove(command, prev_doc, option, function () {
// // - change "available" status to "deleted" // // - change "available" status to "deleted"
// // - remove attachments // // - remove attachments
// // - done, no callback // // - done, no callback
...@@ -780,16 +774,17 @@ ...@@ -780,16 +774,17 @@
* @method post * @method post
* @param {object} command The JIO command * @param {object} command The JIO command
*/ */
that.post = function (command) { that.post = function (command, metadata, option) {
priv.revisionGenericRequest( priv.revisionGenericRequest(
command.cloneDoc(), command,
command.cloneOption(), metadata,
option,
{}, {},
function (err, response) { function (err, response) {
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
that.success(response); command.success({"id": response.id});
} }
); );
}; };
...@@ -802,124 +797,125 @@ ...@@ -802,124 +797,125 @@
* @method put * @method put
* @param {object} command The JIO command * @param {object} command The JIO command
*/ */
that.put = function (command) { that.put = function (command, metadata, option) {
priv.revisionGenericRequest( priv.revisionGenericRequest(
command.cloneDoc(), command,
command.cloneOption(), metadata,
option,
{}, {},
function (err, response) { function (err) {
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
that.success(response); command.success();
} }
); );
}; };
that.putAttachment = function (command) { that.putAttachment = function (command, param, option) {
priv.revisionGenericRequest( priv.revisionGenericRequest(
command.cloneDoc(), command,
command.cloneOption(), param,
option,
{ {
"doc_id": command.getDocId(), "doc_id": param._id,
"attachment_id": command.getAttachmentId(), "attachment_id": param._attachment,
"add_to_attachment_list": { "add_to_attachment_list": {
"_attachment": command.getAttachmentId(), "_attachment": param._attachment,
"_mimetype": command.getAttachmentMimeType(), "_mimetype": param._blob.type,
"_data": command.getAttachmentData() "_data": param._blob
}, },
"putAttachment": true "putAttachment": true
}, },
function (err, response) { function (err) {
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
that.success(response); command.success();
} }
); );
}; };
that.remove = function (command) { that.remove = function (command, param, option) {
if (command.getAttachmentId()) {
return that.removeAttachment(command);
}
priv.revisionGenericRequest( priv.revisionGenericRequest(
command.cloneDoc(), command,
command.cloneOption(), param,
option,
{ {
"revision_needed": true, "revision_needed": true,
"remove": true "remove": true
}, },
function (err, response) { function (err) {
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
that.success(response); command.success();
} }
); );
}; };
that.removeAttachment = function (command) { that.removeAttachment = function (command, param, option) {
priv.revisionGenericRequest( priv.revisionGenericRequest(
command.cloneDoc(), command,
command.cloneOption(), param,
option,
{ {
"doc_id": command.getDocId(), "doc_id": param._id,
"attachment_id": command.getAttachmentId(), "attachment_id": param._attachment,
"revision_needed": true, "revision_needed": true,
"removeAttachment": true, "removeAttachment": true,
"remove_from_attachment_list": { "remove_from_attachment_list": {
"_attachment": command.getAttachmentId() "_attachment": param._attachment
} }
}, },
function (err, response) { function (err) {
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
that.success(response); command.success();
} }
); );
}; };
that.get = function (command) { that.get = function (command, param, option) {
if (command.getAttachmentId()) {
return that.getAttachment(command);
}
priv.revisionGenericRequest( priv.revisionGenericRequest(
command.cloneDoc(), command,
command.cloneOption(), param,
option,
{ {
"get": true "get": true
}, },
function (err, response) { function (err, response) {
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
that.success(response); command.success({"data": response.data});
} }
); );
}; };
that.getAttachment = function (command) { that.getAttachment = function (command, param, option) {
priv.revisionGenericRequest( priv.revisionGenericRequest(
command.cloneDoc(), command,
command.cloneOption(), param,
option,
{ {
"doc_id": command.getDocId(), "doc_id": param._id,
"attachment_id": command.getAttachmentId(), "attachment_id": param._attachment,
"getAttachment": true "getAttachment": true
}, },
function (err, response) { function (err, response) {
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
that.success(response); command.success({"data": response.data});
} }
); );
}; };
that.allDocs = function (command) { that.allDocs = function (command, param, option) {
/*jslint unparam: true */
var rows, result = {"total_rows": 0, "rows": []}, functions = {}; var rows, result = {"total_rows": 0, "rows": []}, functions = {};
functions.finished = 0; functions.finished = 0;
functions.falseResponseGenerator = function (response, callback) { functions.falseResponseGenerator = function (response, callback) {
...@@ -929,7 +925,7 @@ ...@@ -929,7 +925,7 @@
return function (err, doc_tree) { return function (err, doc_tree) {
var document_revision, row, revs_info; var document_revision, row, revs_info;
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
revs_info = priv.getWinnerRevsInfo(doc_tree); revs_info = priv.getWinnerRevsInfo(doc_tree);
document_revision = document_revision =
...@@ -942,7 +938,7 @@ ...@@ -942,7 +938,7 @@
"rev": revs_info[0].rev "rev": revs_info[0].rev
} }
}; };
if (document_revision.doc && command.getOption("include_docs")) { if (document_revision.doc && option.include_docs) {
document_revision.doc._id = doc_id; document_revision.doc._id = doc_id;
document_revision.doc._rev = revs_info[0].rev; document_revision.doc._rev = revs_info[0].rev;
row.doc = document_revision.doc; row.doc = document_revision.doc;
...@@ -956,15 +952,15 @@ ...@@ -956,15 +952,15 @@
functions.success = function () { functions.success = function () {
functions.finished -= 1; functions.finished -= 1;
if (functions.finished === 0) { if (functions.finished === 0) {
that.success(result); command.success(result);
} }
}; };
priv.send("allDocs", null, command.cloneOption( priv.send(command, "allDocs", null, option, function (err, response) {
), function (err, response) { var i, row, selector, selected;
var i, j, row, selector, selected;
if (err) { if (err) {
return that.error(err); return command.error(err);
} }
response = response.data;
selector = /\.revision_tree\.json$/; selector = /\.revision_tree\.json$/;
rows = { rows = {
"revision_trees": { "revision_trees": {
...@@ -1016,8 +1012,9 @@ ...@@ -1016,8 +1012,9 @@
); );
} else { } else {
priv.getRevisionTree( priv.getRevisionTree(
command,
{"_id": rows.revision_trees[i].id}, {"_id": rows.revision_trees[i].id},
command.cloneOption(), option,
functions.fillResultGenerator(rows.revision_trees[i].id) functions.fillResultGenerator(rows.revision_trees[i].id)
); );
} }
...@@ -1026,9 +1023,6 @@ ...@@ -1026,9 +1023,6 @@
functions.success(); functions.success();
}); });
}; };
// END //
return that;
}); // end RevisionStorage }); // end RevisionStorage
})); }));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7