xinb
/
ip2region_private
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs btree search ready for test

This commit is contained in:
dongyado 2016-07-07 10:48:22 +08:00
parent a2e3bdb13e
commit 3fd756300e
2 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
binding/nodejs/ip2region.js
View File

@ -88,24 +88,24 @@ ip2region.btreeSearch = function(ip)
{ {
var indexBlockBuffer = new Buffer(indexBlockLength); var indexBlockBuffer = new Buffer(indexBlockLength);
var headerIndexBuffer = new Buffer(totalHeaderLength); var headerIndexBuffer = new Buffer(totalHeaderLength);
if( typeof(ip) == 'string' ) ip = ip2long($ip); if( typeof(ip) == 'string' ) ip = ip2long(ip);
var i = 0; var i = 0;
// header index handler // header index handler
if (headerSip == null) { if (headerSip == null) {
fs.readSync(ip2region.db_fd, headerIndexBuffer, 0, totalHeaderLength,8); fs.readSync(this.db_fd, headerIndexBuffer, 0, totalHeaderLength, 8);
headerSip = []; headerSip = new Array();
headerPtr = []; headerPtr = new Array();
var startIp = 0; var startIp = 0;
var dataPtr = 0; var dataPtr = 0;
for ( i = 0; i < totalHeaderLength; i += 8) { for ( i = 0; i < totalHeaderLength; i += 8) {
startIp = getLong(headerIndexBuffer, $i); startIp = getLong(headerIndexBuffer, i);
dataPtr = getLong(headerIndexBuffer, $i + 4); dataPtr = getLong(headerIndexBuffer, i + 4);
if ( dataPtr == 0) break; if ( dataPtr == 0) break;
headerSip.array_push(startIp); headerSip.push(startIp);
headerPtr.array_push(dataPtr); headerPtr.push(dataPtr);
headerLen++; // header index size count headerLen++; // header index size count
} }
} }
@ -118,9 +118,9 @@ ip2region.btreeSearch = function(ip)
var eptr = 0; var eptr = 0;
while(low <= high) { while(low <= high) {
mid = ((low + hign) >> 1); mid = ((low + high) >> 1);
if (ip == headerIndex[mid]) { if (ip == headerSip[mid]) {
if ( m > 0) { if ( m > 0) {
sptr = headerPtr[mid - 1]; sptr = headerPtr[mid - 1];
eptr = headerPtr[mid]; eptr = headerPtr[mid];
@ -136,14 +136,14 @@ ip2region.btreeSearch = function(ip)
sptr = headerPtr[mid]; sptr = headerPtr[mid];
eptr = headerPtr[mid + 1]; eptr = headerPtr[mid + 1];
break; break;
} else if ( ip > headerPtr[mid - 1]) { } else if ( ip > headerSip[mid - 1]) {
sptr = headerPtr[mid - 1]; sptr = headerPtr[mid - 1];
eptr = headerPtr[mid]; eptr = headerPtr[mid];
break; break;
} }
low = mid - 1; high = mid - 1;
} else { } else {
if ( mid = headerLen - 1) { if ( mid == headerLen - 1) {
sptr = headerPtr[mid - 1]; sptr = headerPtr[mid - 1];
eptr = headerPtr[mid]; eptr = headerPtr[mid];
break; break;
@ -159,26 +159,52 @@ ip2region.btreeSearch = function(ip)
// match nothing // match nothing
if (sptr == 0) return null; if (sptr == 0) return null;
// second search (in index) // second search (in index)
var blockLen = eptr - sptr; var blockLen = eptr - sptr;
var blockBuffer = new Buffer(blockLen); var blockBuffer = new Buffer(blockLen + indexBlockLength);
fs.readSync(ip2region.db_fd, blockBuffer, 0, blockLen + indexBlockLength, sptr); fs.readSync(this.db_fd, blockBuffer, 0, blockLen + indexBlockLength, sptr);
low = 0; low = 0;
high = blockLen / indexBlockLength; high = blockLen / indexBlockLength;
var p = 0; var p = 0;
var sip = 0; var sip = 0;
var eip = 0; var eip = 0;
var dataPtr = 0;
while(low <= high) { while(low <= high) {
mid = ((low + high) >> 1); mid = ((low + high) >> 1);
p = mid * indexBlockLength; p = mid * indexBlockLength;
sip = getLong(blockBuffer, p);
if (ip < sip) {
high = mid - 1;
} else {
eip = getLong(blockBuffer, p + 4);
if (ip > eip) {
low = mid + 1;
} else {
dataPtr = getLong(blockBuffer, p + 8);
break;
}
}
} }
return ip2long(ip); // read data
if (dataPtr == 0) return null;
var dataLen = ((dataPtr >> 24) & 0xFF);
var dataPtr = (dataPtr & 0x00FFFFFF);
var dataBuffer = new Buffer(dataLen);
fs.readSync(this.db_fd, dataBuffer, 0, dataLen, dataPtr);
var city_id = getLong(dataBuffer, 0);
var data = dataBuffer.toString('utf8', 4, dataLen);
//console.log(city_id);
//console.log(data);
return { city: city_id, region: data };
} }

4
binding/nodejs/test.js
View File

@ -3,13 +3,13 @@
* */ * */
var Ip2region = require('./ip2region'); var Ip2region = require('./ip2region');
//var ip2region = new Ip2region();
// 1. create a ip2region object // 1. create a ip2region object
var ipObj = Ip2region.create('../../data/ip2region.db'); var ipObj = Ip2region.create('../../data/ip2region.db');
// 2. use // 2. use
console.log(ipObj.binarySearch("120.24.78.68")); //console.log(ipObj.binarySearch("120.24.78.68"));
console.log(ipObj.btreeSearch("120.24.78.68"));
// 3. destroy // 3. destroy
Ip2region.destroy(ipObj); Ip2region.destroy(ipObj);