Mirroristas/orbitdb
2
0
Fork 0
mirror of https://github.com/orbitdb/orbitdb.git synced 2025-05-22 14:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gt in query

Browse Source
This commit is contained in:
haad 2016-03-07 10:24:36 +01:00
parent 8d8240cb90
commit cf2fefd553
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/OrbitDB.js
View File

@ -26,8 +26,8 @@ class OrbitDB {
// console.log("--> Head:", hash, this._logs[channel] !== undefined) // console.log("--> Head:", hash, this._logs[channel] !== undefined)
if(hash && this._logs[channel]) { if(hash && this._logs[channel]) {
const other = await(OrbitList.fromIpfsHash(this._ipfs, hash)); const other = await(OrbitList.fromIpfsHash(this._ipfs, hash));
this._logs[channel].join(other); await(this._logs[channel].join(other));
this.events.emit('sync', channel, hash); this.events.emit('sync', channel, 'empty');
} }
} }
@ -35,6 +35,8 @@ class OrbitDB {
// Get items from the db // Get items from the db
query(channel, password, opts) { query(channel, password, opts) {
console.log("--> Query:", channel, password, opts);
if(!opts) opts = {}; if(!opts) opts = {};
const operations = Lazy(this._logs[channel].items); const operations = Lazy(this._logs[channel].items);
@ -47,14 +49,16 @@ class OrbitDB {
result = this._read(operations.reverse(), opts.key, 1, true); result = this._read(operations.reverse(), opts.key, 1, true);
} else if(opts.gt || opts.gte) { } else if(opts.gt || opts.gte) {
// Greater than case // Greater than case
result = this._read(operations, opts.gt ? opts.gt : opts.gte, amount, opts.gte || opts.lte); result = this._read(operations, opts.gt ? opts.gt : opts.gte, amount, opts.gte ? opts.gte : false);
} else { } else {
// Lower than and lastN case, search latest first by reversing the sequence // Lower than and lastN case, search latest first by reversing the sequence
result = this._read(operations.reverse(), opts.lt ? opts.lt : opts.lte, amount, opts.lte || !opts.lt).reverse(); result = this._read(operations.reverse(), opts.lt ? opts.lt : opts.lte, amount, opts.lte || !opts.lt).reverse();
} }
if(opts.reverse) result.reverse(); if(opts.reverse) result.reverse();
return result.toArray(); const res = result.toArray();
console.log("--> Found", res.length, "items");
return res;
} }
// Adds an event to the log // Adds an event to the log
@ -97,9 +101,9 @@ class OrbitDB {
return sequence return sequence
.map((f) => await(f.fetchPayload())) // IO - fetch the actual OP from ipfs. consider merging with LL. .map((f) => await(f.fetchPayload())) // IO - fetch the actual OP from ipfs. consider merging with LL.
.skipWhile((f) => key && f.key !== key) // Drop elements until we have the first one requested .skipWhile((f) => key && f.key !== key) // Drop elements until we have the first one requested
.drop(!inclusive ? 1 : 0) // Drop the 'gt/lt' item, include 'gte/lte' item
.map(_createLWWSet) // Return items as LWW (ignore values after the first found) .map(_createLWWSet) // Return items as LWW (ignore values after the first found)
.filter((f) => f !== null) // Make sure we don't have empty ones .filter((f) => f !== null) // Make sure we don't have empty ones
.drop(inclusive ? 0 : 1) // Drop the 'gt/lt' item, include 'gte/lte' item
.take(amount) .take(amount)
} }