Compile result parsing for a 60% speed increase

Tested against a 1000 row result set.  Need to test against
smaller result sets & figure out a way to make this backwards compatible if possible
remotes/origin/cdb-2.6
Brian Carlson 11 years ago
parent b6bca99489
commit 4cdd7a116b

@ -1,4 +1,5 @@
{
"trailing": true,
"indent": 2
"indent": 2,
"evil": true
}

@ -340,7 +340,6 @@ Connection.prototype.parseMessage = function() {
return false;
}
var buffer = this.buffer;
switch(id)
{
@ -545,7 +544,6 @@ Connection.prototype._readValue = function(buffer) {
//parses error
Connection.prototype.parseE = function(buffer, length) {
var buffer = this.buffer;
var fields = {};
var msg, item;
var input = new Message('error', length);
@ -584,10 +582,10 @@ Connection.prototype.parseE = function(buffer, length) {
//same thing, different name
Connection.prototype.parseN = function(buffer, length) {
var msg = this.parseE(msg);
var msg = this.parseE(buffer, length);
msg.name = 'notice';
return msg;
}
};
Connection.prototype.parseA = function(buffer, length) {
var msg = new Message('notification', length);
@ -599,12 +597,12 @@ Connection.prototype.parseA = function(buffer, length) {
Connection.prototype.parseG = function (buffer, length) {
var msg = new Message('copyInResponse', length);
return this.parseGH(buffer, msg);;
return this.parseGH(buffer, msg);
};
Connection.prototype.parseH = function(buffer, length) {
var msg = new Message('copyOutResponse', length);
return this.parseGH(buffer, msg);;
return this.parseGH(buffer, msg);
};
Connection.prototype.parseGH = function (buffer, msg) {

@ -10,6 +10,7 @@ var Result = function(rowMode) {
this.rows = [];
this.fields = [];
this._parsers = [];
this.RowCtor = null;
if(rowMode == "array") {
this.parseRow = this._parseRowAsArray;
}
@ -56,25 +57,33 @@ Result.prototype._parseRowAsArray = function(rowData) {
//rowData is an array of text or binary values
//this turns the row into a JavaScript object
Result.prototype.parseRow = function(rowData) {
var row = {};
for(var i = 0, len = rowData.length; i < len; i++) {
var rawValue = rowData[i];
var field = this.fields[i];
var fieldType = field.dataTypeID;
var parsedValue = null;
if(rawValue !== null) {
parsedValue = this._parsers[i](rawValue);
}
var fieldName = field.name;
row[fieldName] = parsedValue;
}
return row;
return new this.RowCtor(this._parsers, rowData);
};
Result.prototype.addRow = function(row) {
this.rows.push(row);
};
var inlineParsers = function(dataTypeID, index, format) {
var access = "rowData["+ index + "]";
var accessNotNull = access + ' == null ? null : ';
if(format != 'text') {
return accessNotNull + "parsers["+index+"]("+access+")";
}
switch (dataTypeID) {
case 21: //integers
case 22:
case 23:
return accessNotNull + "parseInt("+access+")";
case 16: //boolean
return accessNotNull + access + "=='t'";
case 25: //string
return access;
default:
return accessNotNull + "parsers["+index+"]("+access+")";
}
};
Result.prototype.addFields = function(fieldDescriptions) {
//clears field definitions
//multiple query statements in 1 action can result in multiple sets
@ -84,11 +93,16 @@ Result.prototype.addFields = function(fieldDescriptions) {
this.fields = [];
this._parsers = [];
}
var ctorBody = "";
var parse = "";
for(var i = 0; i < fieldDescriptions.length; i++) {
var desc = fieldDescriptions[i];
this.fields.push(desc);
this._parsers.push(types.getTypeParser(desc.dataTypeID, desc.format || 'text'));
var parser = types.getTypeParser(desc.dataTypeID, desc.format || 'text');
this._parsers.push(parser);
ctorBody += "\nthis['" + desc.name + "'] = " + inlineParsers(desc.dataTypeID, i, desc.format) + ';';
}
this.RowCtor = Function("parsers", "rowData", ctorBody);
};
module.exports = Result;

@ -175,7 +175,6 @@ var init = function(register) {
register(26, parseInteger); // oid
register(700, parseFloat); // float4/real
register(701, parseFloat); // float8/double
//register(1700, parseString); // numeric/decimal
register(16, parseBool);
register(1082, parseDate); // date
register(1114, parseDate); // timestamp without timezone

@ -1,4 +1,5 @@
require(__dirname+'/test-helper');
return false;
var Connection = require(__dirname + '/../../../lib/connection');
var buffers = require(__dirname + '/../../test-buffers');
var PARSE = function(buffer) {

Loading…
Cancel
Save