redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-09 00:22:08 +03:00
Code Activity

Merge pull request #846 from fintura/parser

Browse Source 
Improve js parser
This commit is contained in:
Ruben Bridgewater
2015-09-16 05:19:50 +02:00
parent aab1fc8f4f 013831c00f
commit 30f227b7b1
1 changed files with 15 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/parser/javascript.js
View File

@@ -54,6 +54,11 @@ ReplyParser.prototype._parseResult = function (type) {
throw new IncompleteReadBuffer("Wait for more data."); throw new IncompleteReadBuffer("Wait for more data.");
} }
if (type === 45) {
var result = this._buffer.toString(this._encoding, start, end);
return new Error(result);
}
if (this.options.return_buffers) { if (this.options.return_buffers) {
return this._buffer.slice(start, end); return this._buffer.slice(start, end);
} else { } else {
@@ -76,12 +81,8 @@ ReplyParser.prototype._parseResult = function (type) {
throw new IncompleteReadBuffer("Wait for more data."); throw new IncompleteReadBuffer("Wait for more data.");
} }
if (this.options.return_buffers) {
return this._buffer.slice(start, end);
}
// return the coerced numeric value // return the coerced numeric value
return +small_toString(this._buffer, start, end); return +this._buffer.toString('ascii', start, end);
} else if (type === 36) { // $ } else if (type === 36) { // $
// set a rewind point, as the packet could be larger than the // set a rewind point, as the packet could be larger than the
// buffer in memory // buffer in memory
@@ -123,7 +124,7 @@ ReplyParser.prototype._parseResult = function (type) {
throw new IncompleteReadBuffer("Wait for more data."); throw new IncompleteReadBuffer("Wait for more data.");
} }
var reply = [ ]; var reply = [];
var ntype, i, res; var ntype, i, res;
offset = this._offset - 1; offset = this._offset - 1;
@@ -152,36 +153,25 @@ ReplyParser.prototype.execute = function (buffer) {
while (true) { while (true) {
offset = this._offset; offset = this._offset;
try { // at least 4 bytes: :1\r\n
// at least 4 bytes: :1\r\n if (this._bytesRemaining() < 4) {
if (this._bytesRemaining() < 4) { break;
break; }
}
try {
type = this._buffer[this._offset++]; type = this._buffer[this._offset++];
if (type === 43) { // + if (type === 43) { // +
ret = this._parseResult(type); ret = this._parseResult(type);
if (ret === null) {
break;
}
this.send_reply(ret); this.send_reply(ret);
} else if (type === 45) { // - } else if (type === 45) { // -
ret = this._parseResult(type); ret = this._parseResult(type);
if (ret === null) { this.send_error(ret);
break;
}
this.send_error(new Error(ret));
} else if (type === 58) { // : } else if (type === 58) { // :
ret = this._parseResult(type); ret = this._parseResult(type);
if (ret === null) {
break;
}
this.send_reply(ret); this.send_reply(ret);
} else if (type === 36) { // $ } else if (type === 36) { // $
ret = this._parseResult(type); ret = this._parseResult(type);
@@ -219,9 +209,6 @@ ReplyParser.prototype.execute = function (buffer) {
}; };
ReplyParser.prototype.append = function (newBuffer) { ReplyParser.prototype.append = function (newBuffer) {
if (!newBuffer) {
return;
}
// first run // first run
if (this._buffer === null) { if (this._buffer === null) {
@@ -238,27 +225,13 @@ ReplyParser.prototype.append = function (newBuffer) {
return; return;
} }
// very large packet this._buffer = Buffer.concat([this._buffer.slice(this._offset), newBuffer]);
// check for concat, if we have it, use it
if (Buffer.concat !== undefined) {
this._buffer = Buffer.concat([this._buffer.slice(this._offset), newBuffer]);
} else {
var remaining = this._bytesRemaining(),
newLength = remaining + newBuffer.length,
tmpBuffer = new Buffer(newLength);
this._buffer.copy(tmpBuffer, 0, this._offset);
newBuffer.copy(tmpBuffer, remaining, 0);
this._buffer = tmpBuffer;
}
this._offset = 0; this._offset = 0;
}; };
ReplyParser.prototype.parseHeader = function () { ReplyParser.prototype.parseHeader = function () {
var end = this._packetEndOffset(), var end = this._packetEndOffset(),
value = small_toString(this._buffer, this._offset, end - 1); value = this._buffer.toString('ascii', this._offset, end - 1);
this._offset = end + 1; this._offset = end + 1;
@@ -270,10 +243,6 @@ ReplyParser.prototype._packetEndOffset = function () {
while (this._buffer[offset] !== 0x0d && this._buffer[offset + 1] !== 0x0a) { while (this._buffer[offset] !== 0x0d && this._buffer[offset + 1] !== 0x0a) {
offset++; offset++;
if (offset >= this._buffer.length) {
throw new IncompleteReadBuffer("didn't see LF after NL reading multi bulk count (" + offset + " => " + this._buffer.length + ", " + this._offset + ")");
}
} }
offset++; offset++;