Add another regression test and refactor some lines away

Author: Ruben Bridgewater

lib/parser.js

@@ -135,8 +135,6 @@ function parseBulkString (parser) {
   var offsetEnd = parser.offset + length
   if (offsetEnd + 2 > parser.buffer.length) {
     parser.bigStrSize = offsetEnd + 2
-    parser.bigOffset = parser.offset
-    parser.totalChunkSize = parser.buffer.length
     return
   }
 
@@ -333,7 +331,7 @@ function concatBuffer (parser, length) {
     list[i].copy(bufferPool, pos)
     pos += list[i].length
   }
-  return bufferPool.slice(parser.offset, length)
+  return bufferPool.slice(0, length)
 }
 
 /**
@@ -355,17 +353,14 @@ JavascriptRedisParser.prototype.execute = function (buffer) {
     this.buffer.copy(bufferPool, 0, 0, oldLength)
     buffer.copy(bufferPool, oldLength, 0, buffer.length)
     this.buffer = bufferPool.slice(0, newLength)
-    this.offset = 0
   } else if (this.totalChunkSize + buffer.length >= this.bigStrSize) {
-    this.bufferCache.unshift(this.buffer)
     this.bufferCache.push(buffer)
     // The returned type might be Array * (42) and in that case we can't improve the parsing currently
     if (this.optionReturnBuffers === false && this.buffer[0] === 36) {
       this.returnReply(concatBulkString(this))
       this.buffer = buffer
     } else { // This applies for arrays too
       this.buffer = concatBuffer(this, this.totalChunkSize + buffer.length)
-      this.offset = 0
     }
     this.bigStrSize = 0
     this.totalChunkSize = 0
@@ -389,8 +384,9 @@ JavascriptRedisParser.prototype.execute = function (buffer) {
       this.buffer = tempBuffer
       if (this.bigStrSize !== 0) {
         this.bigStrSize -= offset
-        this.bigOffset -= offset
-        this.totalChunkSize -= offset
+        this.bigOffset = this.offset - offset
+        this.totalChunkSize = this.buffer.length
+        this.bufferCache.push(this.buffer)
       }
       this.offset = 0
       return

test/parsers.spec.js

@@ -11,7 +11,7 @@ var parsers = [JavascriptParser, HiredisParser]
 // Mock the not needed return functions
 function returnReply () { throw new Error('failed') }
 function returnError () { throw new Error('failed') }
-function returnFatalError () { throw new Error('failed') }
+function returnFatalError (err) { throw err }
 
 describe('parsers', function () {
   describe('general parser functionality', function () {
@@ -93,6 +93,39 @@ describe('parsers', function () {
         assert.strictEqual(replyCount, 3)
       })
 
+      it('multiple parsers do not interfere with bulk strings in arrays', function () {
+        var replyCount = 0
+        var results = [['foo', 'foo bar baz'], [1234567890, 'hello world', 'the end'], 'ttttttttttttttttttttttttttttttttttttttttttttttt']
+        function checkReply (reply) {
+          console.log(reply)
+          assert.deepEqual(results[replyCount], reply)
+          replyCount++
+        }
+        var parserOne = new Parser({
+          returnReply: checkReply,
+          returnError: returnError,
+          returnFatalError: returnFatalError
+        })
+        var parserTwo = new Parser({
+          returnReply: checkReply,
+          returnError: returnError,
+          returnFatalError: returnFatalError
+        })
+        parserOne.execute(new Buffer('*2\r\n+foo\r\n$11\r\nfoo '))
+        parserOne.execute(new Buffer('bar '))
+        assert.strictEqual(replyCount, 0)
+        parserTwo.execute(new Buffer('*3\r\n:1234567890\r\n$11\r\nhello '))
+        assert.strictEqual(replyCount, 0)
+        parserOne.execute(new Buffer('baz\r\n+ttttttttttttttttttttttttt'))
+        assert.strictEqual(replyCount, 1)
+        parserTwo.execute(new Buffer('wor'))
+        parserTwo.execute(new Buffer('ld\r\n'))
+        assert.strictEqual(replyCount, 1)
+        parserTwo.execute(new Buffer('+the end\r\n'))
+        assert.strictEqual(replyCount, 2)
+        parserOne.execute(new Buffer('tttttttttttttttttttttt\r\n'))
+      })
+
       it('chunks getting to big for the bufferPool', function () {
         // This is a edge case. Chunks should not exceed Math.pow(2, 16) bytes
         var lorem = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, ' +