RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid duplicate hash table lookups.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-07-06 16:35:23 -07:00
parent a3bb955d95
commit c27466a7c5
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/bcoin/chaindb.js
View File

@ -317,6 +317,8 @@ ChainDB.prototype.getCache = function getCache(hash) {
*/ */
ChainDB.prototype.getHeight = function getHeight(hash, callback) { ChainDB.prototype.getHeight = function getHeight(hash, callback) {
var entry;
if (hash == null || hash < 0) { if (hash == null || hash < 0) {
callback = utils.asyncify(callback); callback = utils.asyncify(callback);
return callback(null, -1); return callback(null, -1);
@ -332,9 +334,11 @@ ChainDB.prototype.getHeight = function getHeight(hash, callback) {
return callback(null, -1); return callback(null, -1);
} }
if (this.cacheHash.has(hash)) { entry = this.cacheHash.get(hash);
if (entry) {
callback = utils.asyncify(callback); callback = utils.asyncify(callback);
return callback(null, this.cacheHash.get(hash).height); return callback(null, entry.height);
} }
this.db.fetch(layout.h(hash), function(data) { this.db.fetch(layout.h(hash), function(data) {
@ -359,6 +363,8 @@ ChainDB.prototype.getHeight = function getHeight(hash, callback) {
*/ */
ChainDB.prototype.getHash = function getHash(height, callback) { ChainDB.prototype.getHash = function getHash(height, callback) {
var entry;
if (height == null || height < 0) { if (height == null || height < 0) {
callback = utils.asyncify(callback); callback = utils.asyncify(callback);
return callback(null, null); return callback(null, null);
@ -369,9 +375,11 @@ ChainDB.prototype.getHash = function getHash(height, callback) {
return callback(null, height); return callback(null, height);
} }
if (this.cacheHeight.has(height)) { entry = this.cacheHeight.get(height);
if (entry) {
callback = utils.asyncify(callback); callback = utils.asyncify(callback);
return callback(null, this.cacheHeight.get(height).hash); return callback(null, entry.hash);
} }
this.db.fetch(layout.H(height), function(data) { this.db.fetch(layout.H(height), function(data) {
@ -445,6 +453,7 @@ ChainDB.prototype.getBoth = function getBoth(block, callback) {
ChainDB.prototype.getEntry = function getEntry(hash, callback) { ChainDB.prototype.getEntry = function getEntry(hash, callback) {
var self = this; var self = this;
var entry;
if (hash == null || hash < 0) if (hash == null || hash < 0)
return utils.nextTick(callback); return utils.nextTick(callback);
@ -456,8 +465,10 @@ ChainDB.prototype.getEntry = function getEntry(hash, callback) {
if (!hash) if (!hash)
return callback(); return callback();
if (self.cacheHash.has(hash)) entry = self.cacheHash.get(hash);
return callback(null, self.cacheHash.get(hash));
if (entry)
return callback(null, entry);
return self.db.fetch(layout.e(hash), function(data) { return self.db.fetch(layout.e(hash), function(data) {
return bcoin.chainentry.fromRaw(self.chain, data); return bcoin.chainentry.fromRaw(self.chain, data);

7
lib/bcoin/chainentry.js
View File

@ -179,6 +179,7 @@ ChainEntry.prototype.getRetargetAncestors = function getRetargetAncestors(callba
ChainEntry.prototype.getAncestors = function getAncestors(max, callback) { ChainEntry.prototype.getAncestors = function getAncestors(max, callback) {
var entry = this; var entry = this;
var ancestors = []; var ancestors = [];
var cached;
if (max === 0) if (max === 0)
return callback(null, []); return callback(null, []);
@ -193,12 +194,14 @@ ChainEntry.prototype.getAncestors = function getAncestors(max, callback) {
if (ancestors.length >= max) if (ancestors.length >= max)
return callback(null, ancestors); return callback(null, ancestors);
if (!this.chain.db.hasCache(entry.prevBlock)) { cached = this.chain.db.getCache(entry.prevBlock);
if (!cached) {
ancestors.pop(); ancestors.pop();
break; break;
} }
entry = this.chain.db.getCache(entry.prevBlock); entry = cached;
} }
(function next(err, entry) { (function next(err, entry) {