Commit d9f1ea94 authored by Alexandra Rogova's avatar Alexandra Rogova

elasticlunrstorage repair updates documents

parent b0f722a0
......@@ -67,7 +67,7 @@
});
index.setRef(id);
// do not store the documents in the index
index.saveDocument(false);
//index.saveDocument(false);
return index;
}
......@@ -107,11 +107,10 @@
return result.ref;
});
}
return null;
}
function recursiveIndexQuery(index, indexedFields, query) {
function recursiveIndexQuery(index, indexedFields, query, sub_storage) {
var ids = null,
subquery,
i,
......@@ -131,7 +130,6 @@
}
}
}
return ids;
}
......@@ -303,7 +301,44 @@
ElasticlunrStorage.prototype.repair = function () {
// rebuild index?
return this._sub_storage.repair.apply(this._sub_storage, arguments);
var idx,
doc_ids = [],
context = this,
args = arguments;
return this._getIndex()
.push(function(index){
idx = index;
return context._sub_storage.repair.apply(context._sub_storage, args);
})
.push(function(){
return context._sub_storage.allDocs();
})
.push(function(all_docs){
var i,
queue = new RSVP.Queue(),
add_to_queue;
add_to_queue = function(id){
queue.push(function(){
return context._sub_storage.get(id.toString());
})
.push(function(doc){
var data = JSON.parse(JSON.stringify(doc));
data.id = id.toString();
idx.updateDoc(data);
});
};
for (i=0; i<all_docs.data.rows.length; i+=1){
add_to_queue(all_docs.data.rows[i].id);
doc_ids.push(all_docs.data.rows[i].id);
}
return queue;
})
.push(undefined, function (my_error) {
if (my_error.status_code === 501) { //501 = sub_storage does not have allDocs capacity
//
}
else throw my_error;
});
};
ElasticlunrStorage.prototype.hasCapacity = function (name) {
......@@ -320,7 +355,7 @@
return this._sub_storage.hasCapacity(name);
};
ElasticlunrStorage.prototype.buildQuery = function (options) {
ElasticlunrStorage.prototype.buildQuery = function (options) { // Appelé par allDocs
var context = this,
indexedFields = this._index_fields,
runSubstorageQuery = options.select_list || options.include_docs,
......@@ -328,10 +363,9 @@
if (options.query && options.query.indexOf('OR') === -1) {
parsedQuery = jIO.QueryFactory.create(options.query);
return context._getIndex()
.push(function (index) {
return recursiveIndexQuery(index, indexedFields, parsedQuery);
return recursiveIndexQuery(index, indexedFields, parsedQuery, context._sub_storage);
})
.push(function (ids) {
try {
......@@ -352,7 +386,6 @@
if (runSubstorageQuery) {
return context._sub_storage.buildQuery(options);
}
return (ids || []).map(function (id) {
return {
id: id,
......
......@@ -599,7 +599,7 @@
test("repair called substorage repair", function () {
stop();
expect(2);
//expect(2);
Index200.prototype.getAttachment = function () {
return true;
......@@ -622,8 +622,52 @@
};
jio.repair(expected_options)
.then(function (result) {
/*.then(function (result) {
equal(result, "OK");
})*/
.fail(function (error) {
ok(false, error);
})
.always(function () {
start();
});
});
test("repair adds missing documents", function(){
stop();
expect(2);
Index200.prototype.getAttachment = function () {
return true;
};
var sub_storage = jIO.createJIO({
type: "indexeddb",
database: "merge_test"
}),
jio = jIO.createJIO({
type: "elasticlunr",
index_fields: ["title"],
index_sub_storage: {
type: "index200"
},
sub_storage: {
type: "indexeddb",
database: "merge_test"
}
});
sub_storage.put("foo", {title: "bar"});
return jio.repair()
.push(function(){
return jio.allDocs({
query: 'title: "bar"'
});
})
.push(function(result){
equal(result.data.total_rows, 1);
equal(result.data.rows[0].id, "foo");
})
.fail(function (error) {
ok(false, error);
......@@ -633,6 +677,79 @@
});
});
test("repair updates documents", function(){
expect(2);
stop();
Index200.prototype.getAttachment = function () {
return true;
};
Index200.prototype.putAttachment = function () {
return true;
};
var sub_storage = jIO.createJIO({
type: "indexeddb",
database: "merge_test"
}),
jio = jIO.createJIO({
type: "elasticlunr",
index_fields: ["title"],
index_sub_storage: {
type: "index200"
},
sub_storage: {
type: "indexeddb",
database: "merge_test"
}
});
return jio.put("foo", {title: "bar"})
.push(function(){
return sub_storage.put("foo", {title: "Hello world!"});
})
.push(function(){
return jio.repair();
})
.push(function(){
return jio.allDocs({query: 'title: "Hello world!"'});
})
.push(function(result){
equal(result.data.total_rows, 1);
equal(result.data.rows[0].id, "foo");
})
.fail(function (error) {
ok(false, error);
})
.always(function () {
start();
});
});
/*
test("repair deletes outdated documents", function(){
var sub_storage = jIO.createJIO({
type: "indexeddb",
database: "merge_test"
}),
jio = jIO.createJIO({
type: "elasticlunr",
index_fields: ["title"],
index_sub_storage: {
type: "index200"
},
sub_storage: {
type: "indexeddb",
database: "merge_test"
}
});
jio.put("foo", {title: "bar"});
sub_storage.remove("foo");
});
*/
/////////////////////////////////////////////////////////////////
// ElasticlunrStorage.buildQuery
/////////////////////////////////////////////////////////////////
......
......@@ -29,6 +29,9 @@ See https://www.nexedi.com/licensing for rationale and options.
<script src="../external/qunit.js" type="text/javascript"></script>
<script src="../external/sinon.js" type="text/javascript"></script>
<!--<script src ="./elasticlunr.js"></script>
<script src="./elasticlunrstorage.js"></script>-->
<script>
QUnit.config.testTimeout = 5000;
</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