Skip to content

jio
jio
Commit 0c406095 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

WIP replicate report

parent 13fbc570
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 15 deletions
src/jio.storage/replicatestorage.js
View file @ 0c406095
...@@ -40,6 +40,27 @@ ...@@ -40,6 +40,27 @@
SkipError.prototype = new Error(); SkipError.prototype = new Error();
SkipError.prototype.constructor = SkipError; SkipError.prototype.constructor = SkipError;
function ReplicateReport() {
this._list = [];
this.name = 'ReplicateReport';
this.message = this.name;
this.has_error = false;
}
ReplicateReport.prototype = {
constructor: ReplicateReport,
logError: function (id, error) {
this._list.push([id, error]);
this.has_error = true;
},
doNothing: function (id) {
this._list.push([id, 'Nothing']);
},
toString: function () {
return this._list.toString();
}
};
/**************************************************** /****************************************************
Use a local jIO to read/write/search documents Use a local jIO to read/write/search documents
Synchronize in background those document with a remote jIO. Synchronize in background those document with a remote jIO.
...@@ -808,6 +829,7 @@ ...@@ -808,6 +829,7 @@
function propagateModification(context, source, destination, doc, hash, id, function propagateModification(context, source, destination, doc, hash, id,
skip_document_dict, skip_document_dict,
skip_deleted_document_dict, skip_deleted_document_dict,
report,
options) { options) {
var result = new RSVP.Queue(), var result = new RSVP.Queue(),
post_id, post_id,
...@@ -901,6 +923,11 @@ ...@@ -901,6 +923,11 @@
hash: hash, hash: hash,
from_local: from_local from_local: from_local
}); });
})
.push(function () {
if (options.create_new_document === true) {
report.createDocument(id, true);
}
}); });
} }
return result return result
...@@ -958,6 +985,7 @@ ...@@ -958,6 +985,7 @@
source, destination, id, source, destination, id,
conflict_force, conflict_revert, conflict_force, conflict_revert,
conflict_ignore, conflict_ignore,
report,
options) { options) {
// No need to check twice // No need to check twice
skip_document_dict[id] = null; skip_document_dict[id] = null;
...@@ -1012,6 +1040,7 @@ ...@@ -1012,6 +1040,7 @@
return propagateModification(context, source, destination, doc, return propagateModification(context, source, destination, doc,
local_hash, id, skip_document_dict, local_hash, id, skip_document_dict,
skip_deleted_document_dict, skip_deleted_document_dict,
report,
{use_post: ((options.use_post) && {use_post: ((options.use_post) &&
(remote_hash === null)), (remote_hash === null)),
from_local: from_local, from_local: from_local,
...@@ -1042,6 +1071,7 @@ ...@@ -1042,6 +1071,7 @@
id, id,
skip_document_dict, skip_document_dict,
skip_deleted_document_dict, skip_deleted_document_dict,
report,
{use_post: ((options.use_revert_post) && {use_post: ((options.use_revert_post) &&
(local_hash === null)), (local_hash === null)),
from_local: !from_local, from_local: !from_local,
...@@ -1056,6 +1086,7 @@ ...@@ -1056,6 +1086,7 @@
return propagateModification(context, source, destination, doc, return propagateModification(context, source, destination, doc,
local_hash, id, skip_document_dict, local_hash, id, skip_document_dict,
skip_deleted_document_dict, skip_deleted_document_dict,
report,
{use_post: options.use_post, {use_post: options.use_post,
from_local: from_local, from_local: from_local,
create_new_document: create_new_document:
...@@ -1067,6 +1098,9 @@ ...@@ -1067,6 +1098,9 @@
stringify(doc) + " !== " + stringify(doc) + " !== " +
stringify(remote_doc), stringify(remote_doc),
409); 409);
})
.push(undefined, function (error) {
report.logError(id, error);
}); });
} }
...@@ -1100,7 +1134,7 @@ ...@@ -1100,7 +1134,7 @@
source, destination, id, source, destination, id,
conflict_force, conflict_revert, conflict_force, conflict_revert,
conflict_ignore, conflict_ignore,
local_hash, status_hash, local_hash, status_hash, report,
options) { options) {
queue queue
.push(function () { .push(function () {
...@@ -1124,8 +1158,10 @@ ...@@ -1124,8 +1158,10 @@
source, destination, id, source, destination, id,
conflict_force, conflict_revert, conflict_force, conflict_revert,
conflict_ignore, conflict_ignore,
report,
options); options);
} }
report.doNothing(id);
}); });
} }
...@@ -1133,7 +1169,7 @@ ...@@ -1133,7 +1169,7 @@
skip_deleted_document_dict, skip_deleted_document_dict,
cache, source_key, destination_key, cache, source_key, destination_key,
source, destination, signature_allDocs, source, destination, signature_allDocs,
options) { report, options) {
var argument_list = [], var argument_list = [],
argument_list_deletion = []; argument_list_deletion = [];
if (!options.hasOwnProperty("use_post")) { if (!options.hasOwnProperty("use_post")) {
...@@ -1214,6 +1250,7 @@ ...@@ -1214,6 +1250,7 @@
options.conflict_revert, options.conflict_revert,
options.conflict_ignore, options.conflict_ignore,
local_hash, status_hash, local_hash, status_hash,
report,
options]); options]);
} }
} }
...@@ -1278,7 +1315,8 @@ ...@@ -1278,7 +1315,8 @@
argument_list = arguments, argument_list = arguments,
skip_document_dict = {}, skip_document_dict = {},
skip_deleted_document_dict = {}, skip_deleted_document_dict = {},
cache = {}; cache = {},
report = new ReplicateReport();
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
...@@ -1345,7 +1383,7 @@ ...@@ -1345,7 +1383,7 @@
cache, 'local', 'remote', cache, 'local', 'remote',
context._local_sub_storage, context._local_sub_storage,
context._remote_sub_storage, context._remote_sub_storage,
signature_allDocs, signature_allDocs, report,
{ {
use_post: context._use_remote_post, use_post: context._use_remote_post,
conflict_force: (context._conflict_handling === conflict_force: (context._conflict_handling ===
...@@ -1376,7 +1414,8 @@ ...@@ -1376,7 +1414,8 @@
cache, 'remote', 'local', cache, 'remote', 'local',
context._remote_sub_storage, context._remote_sub_storage,
context._local_sub_storage, context._local_sub_storage,
signature_allDocs, { signature_allDocs,
report, {
use_revert_post: context._use_remote_post, use_revert_post: context._use_remote_post,
conflict_force: (context._conflict_handling === conflict_force: (context._conflict_handling ===
CONFLICT_KEEP_REMOTE), CONFLICT_KEEP_REMOTE),
...@@ -1431,6 +1470,12 @@ ...@@ -1431,6 +1470,12 @@
); );
}); });
} }
})
.push(function () {
if (report.has_error) {
throw report;
}
return report;
}); });
}; };
......
test/jio.storage/replicatestorage_fastrepair.tests.js
View file @ 0c406095
...@@ -146,7 +146,8 @@ ...@@ -146,7 +146,8 @@
id = result; id = result;
return context.jio.repair(); return context.jio.repair();
}) })
.then(function () { .then(function (result) {
equal(result, 'nutnut2');
return context.jio.__storage._remote_sub_storage.get(id); return context.jio.__storage._remote_sub_storage.get(id);
}) })
.then(function (result) { .then(function (result) {
......
test/jio.storage/replicatestorage_repair.tests.js
View file @ 0c406095
...@@ -77,7 +77,8 @@ ...@@ -77,7 +77,8 @@
id = result; id = result;
return context.jio.repair(); return context.jio.repair();
}) })
.then(function () { .then(function (result) {
deepEqual(result.toString(), 'lala');
return context.jio.__storage._remote_sub_storage.get(id); return context.jio.__storage._remote_sub_storage.get(id);
}) })
.then(function (result) { .then(function (result) {
...@@ -495,6 +496,8 @@ ...@@ -495,6 +496,8 @@
equal(error.message, "Conflict on 'conflict': " + equal(error.message, "Conflict on 'conflict': " +
"{\"title\":\"foo\"} !== {\"title\":\"bar\"}"); "{\"title\":\"foo\"} !== {\"title\":\"bar\"}");
equal(error.status_code, 409); equal(error.status_code, 409);
equal(error.show(), "Conflict on 'conflict': " +
"{\"title\":\"foo\"} !== {\"title\":\"bar\"}");
}) })
.then(function () { .then(function () {
return context.jio.__storage._signature_sub_storage.get("conflict"); return context.jio.__storage._signature_sub_storage.get("conflict");
......
test/tests.html
View file @ 0c406095
...@@ -36,7 +36,7 @@ See https://www.nexedi.com/licensing for rationale and options. ...@@ -36,7 +36,7 @@ See https://www.nexedi.com/licensing for rationale and options.
<!--script src="jio/util.js"></script--> <!--script src="jio/util.js"></script-->
<!--script src="jio/fakestorage.js"></script> <!--script src="jio/fakestorage.js"></script>
<script src="jio/tests.js"></script--> <script src="jio/tests.js"></script-->
<script src="jio/util.js"></script> <!--script src="jio/util.js"></script>
<script src="queries/key.tests.js"></script> <script src="queries/key.tests.js"></script>
<script src="queries/key-schema.tests.js"></script> <script src="queries/key-schema.tests.js"></script>
...@@ -44,11 +44,11 @@ See https://www.nexedi.com/licensing for rationale and options. ...@@ -44,11 +44,11 @@ See https://www.nexedi.com/licensing for rationale and options.
<script src="queries/key-typechecks.tests.js"></script> <script src="queries/key-typechecks.tests.js"></script>
<script src="queries/jiodate.tests.js"></script> <script src="queries/jiodate.tests.js"></script>
<script src="queries/key-jiodate.tests.js"></script> <script src="queries/key-jiodate.tests.js"></script-->
<!--script src="queries/key-localstorage.tests.js"></script--> <!--script src="queries/key-localstorage.tests.js"></script-->
<script src="jio.storage/memorystorage.tests.js"></script> <!--script src="jio.storage/memorystorage.tests.js"></script>
<script src="jio.storage/querystorage.tests.js"></script> <script src="jio.storage/querystorage.tests.js"></script>
<script src="jio.storage/localstorage.tests.js"></script> <script src="jio.storage/localstorage.tests.js"></script>
<script src="jio.storage/documentstorage.tests.js"></script> <script src="jio.storage/documentstorage.tests.js"></script>
...@@ -58,24 +58,24 @@ See https://www.nexedi.com/licensing for rationale and options. ...@@ -58,24 +58,24 @@ See https://www.nexedi.com/licensing for rationale and options.
<script src="jio.storage/erp5storage.tests.js"></script> <script src="jio.storage/erp5storage.tests.js"></script>
<script src="jio.storage/indexeddbstorage.tests.js"></script> <script src="jio.storage/indexeddbstorage.tests.js"></script>
<script src="jio.storage/uuidstorage.tests.js"></script> <script src="jio.storage/uuidstorage.tests.js"></script>
<script src="jio.storage/replicatestorage.tests.js"></script> <script src="jio.storage/replicatestorage.tests.js"></script-->
<script src="jio.storage/replicatestorage_repair.tests.js"></script> <script src="jio.storage/replicatestorage_repair.tests.js"></script>
<script src="jio.storage/replicatestorage_repairattachment.tests.js"></script> <script src="jio.storage/replicatestorage_repairattachment.tests.js"></script>
<script src="jio.storage/replicatestorage_fastrepair.tests.js"></script> <script src="jio.storage/replicatestorage_fastrepair.tests.js"></script>
<script src="jio.storage/replicatestorage_fastrepairattachment.tests.js"></script> <script src="jio.storage/replicatestorage_fastrepairattachment.tests.js"></script>
<script src="jio.storage/shastorage.tests.js"></script> <!--script src="jio.storage/shastorage.tests.js"></script>
<script src="jio.storage/parserstorage.tests.js"></script> <script src="jio.storage/parserstorage.tests.js"></script-->
<!--script src="jio.storage/qiniustorage.tests.js"></script--> <!--script src="jio.storage/qiniustorage.tests.js"></script-->
<!--script src="jio.storage/indexstorage.tests.js"></script--> <!--script src="jio.storage/indexstorage.tests.js"></script-->
<script src="jio.storage/cryptstorage.tests.js"></script> <!--script src="jio.storage/cryptstorage.tests.js"></script>
<script src="jio.storage/cloudooostorage.tests.js"></script> <script src="jio.storage/cloudooostorage.tests.js"></script>
<script src="jio.storage/dropboxstorage.tests.js"></script> <script src="jio.storage/dropboxstorage.tests.js"></script>
<script src="jio.storage/zipstorage.tests.js"></script> <script src="jio.storage/zipstorage.tests.js"></script>
<script src="jio.storage/gdrivestorage.tests.js"></script> <script src="jio.storage/gdrivestorage.tests.js"></script>
<script src="jio.storage/websqlstorage.tests.js"></script> <script src="jio.storage/websqlstorage.tests.js"></script>
<script src="jio.storage/fbstorage.tests.js"></script> <script src="jio.storage/fbstorage.tests.js"></script>
<script src="jio.storage/httpstorage.tests.js"></script> <script src="jio.storage/httpstorage.tests.js"></script-->
<!--script src="../src/jio.storage/xwikistorage.js"></script> <!--script src="../src/jio.storage/xwikistorage.js"></script>
<script src="jio.storage/xwikistorage.tests.js"></script--> <script src="jio.storage/xwikistorage.tests.js"></script-->
......
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