[Core] Data Stream iterator fix (#7294)

Fix two problems found on the datastream iterator. - the first row of the stream was always skipped - an empty row was added at the end
aces · Feb 15, 2021 · 2ec4dfa · 2ec4dfa
1 parent e2ae079
commit 2ec4dfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/jslib/fetchDataStream.js b/jslib/fetchDataStream.js
@@ -35,7 +35,6 @@ async function processLines(data, rowcb, endstreamcb) {
                 row = [];
                 continue;
             case 0x04: // end of stream
-                rowcb(row);
                 endstreamcb(row);
                 return {remainder: [], eos: true};
         }

diff --git a/src/Http/DataIteratorBinaryStream.php b/src/Http/DataIteratorBinaryStream.php
@@ -183,15 +183,17 @@ public function read($length)
         if ($this->eof) {
             return "";
         }
-        $this->rowgen->next();
-        $row = $this->rowgen->current();
         if (!$this->rowgen->valid()) {
             $this->eof = true;
             return chr(0x04);
         }
+        $row = $this->rowgen->current();
+        $this->rowgen->next();
+
         $rowArray        = array_values(json_decode(json_encode($row), true));
         $rowVal          = join(chr(0x1e), $rowArray) . chr(0x1f);
         $this->position += strlen($rowVal);
+
         return $rowVal;
     }