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

Really fix "Bus error: 10" (stack overflow). Improve _insert() performance in OrbitList.

Browse Source
This commit is contained in:
haad 2016-03-06 10:23:12 +01:00
parent 34ae809b0c
commit 6c6c482c69
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/list/OrbitList.js
View File

@ -40,7 +40,7 @@ class OrbitList extends List {
.reverse() // Start from the latest item .reverse() // Start from the latest item
.map((f) => f.heads).flatten() // Go through all heads .map((f) => f.heads).flatten() // Go through all heads
.filter((f) => !(f instanceof OrbitNode === true)) // OrbitNode vs. {}, filter out instances (we already have them in mem) .filter((f) => !(f instanceof OrbitNode === true)) // OrbitNode vs. {}, filter out instances (we already have them in mem)
.map((f) => this._fetchRecursive(f, allHashes)).flatten() // IO - get the data from IPFS .map((f) => await(this._fetchRecursive(f, allHashes, MaxHistory, 0))).flatten() // IO - get the data from IPFS
.map((f) => this._insert(f)) // Insert to the list .map((f) => this._insert(f)) // Insert to the list
.take(MaxHistory) // How many items from the history we should fetch .take(MaxHistory) // How many items from the history we should fetch
.toArray(); .toArray();
@ -48,27 +48,31 @@ class OrbitList extends List {
} }
// Fetch items in the linked list recursively // Fetch items in the linked list recursively
_fetchRecursive(hash, all) { _fetchRecursive(hash, all, amount, depth) {
const isReferenced = (list, item) => Lazy(list).find((f) => f === item) !== undefined; const isReferenced = (list, item) => Lazy(list).find((f) => f === item) !== undefined;
let result = []; let result = [];
if(depth >= amount)
return result;
if(!isReferenced(all, hash)) { if(!isReferenced(all, hash)) {
depth ++;
all.push(hash); all.push(hash);
const item = await(OrbitNode.fromIpfsHash(this._ipfs, hash)); // IO - get from IPFS const item = await(OrbitNode.fromIpfsHash(this._ipfs, hash)); // IO - get from IPFS
result.push(item); result.push(item);
result = result.concat(Lazy(item.heads) result = result.concat(Lazy(item.heads)
.map((f) => this._fetchRecursive(f, all)) .map((f) => await(this._fetchRecursive(f, all, amount, depth)))
.flatten() .flatten()
.toArray()); .toArray());
} }
return result; return result;
} }
// Insert to the list right after the latest parent // Insert to the list right after the latest parent
_insert(item) { _insert(item) {
const index = Lazy(item.heads) let indices = Lazy(item.heads).map((next) => Lazy(this._items).map((f) => f.hash).indexOf(next)) // Find the item's parent's indices
.map((next) => Lazy(this._items).map((f) => f.hash).indexOf(next)) // Find the item's parent's indices const index = indices.length > 0 ? Math.max(indices.max() + 1, 0) : 0; // find the largest index (latest parent)
.reduce((max, a) => a > max ? a : max, 0); // find the largest index (latest parent)
this._items.splice(index, 0, item); this._items.splice(index, 0, item);
} }