address comments

visgl · Aug 6, 2019 · 9ca51e1 · 9ca51e1
1 parent cadef9f
commit 9ca51e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/modules/csv/src/csv-loader.js b/modules/csv/src/csv-loader.js
@@ -63,7 +63,7 @@ function parseCSVInBatches(asyncIterator, options) {
 
       // Check if we need to save a header row
       if (isFirstRow && !headerRow) {
-        const {header = isHeaderRow(row)} = options;
+        const header = options.header === undefined ? isHeaderRow(row) : options.header;
         if (header) {
           headerRow = row;
           return;

diff --git a/modules/experimental/src/categories/table/columnar-table-batch.js b/modules/experimental/src/categories/table/columnar-table-batch.js
@@ -28,6 +28,9 @@ export default class ColumnarTableBatch {
     this.pruneColumns();
     const columns = Array.isArray(this.schema) ? this.columns : {};
 
+    // schema is an array if there're no headers
+    // object if there are headers
+    // columns should match schema format
     if (!Array.isArray(this.schema)) {
       for (const fieldName in this.schema) {
         const field = this.schema[fieldName];

diff --git a/modules/experimental/src/categories/table/row-table-batch.js b/modules/experimental/src/categories/table/row-table-batch.js
@@ -5,6 +5,8 @@ export default class RowTableBatch {
     this.rows = null;
     this.length = 0;
 
+    // schema is an array if there're no headers
+    // object if there are headers
     if (!Array.isArray(schema)) {
       this._headers = [];
       for (const key in schema) {
@@ -18,7 +20,7 @@ export default class RowTableBatch {
       this.rows = new Array(this.batchSize);
       this.length = 0;
     }
-    this.rows[this.length] = row;
+    this.rows[this.length] = convertRowToObject(row, this._headers);
     this.length++;
   }
 
@@ -28,12 +30,7 @@ export default class RowTableBatch {
 
   getNormalizedBatch() {
     if (this.rows) {
-      let rows = this.rows.slice(0, this.length);
-
-      if (this._headers) {
-        rows = rows.map(row => convertRowToObject(row, this._headers));
-      }
-
+      const rows = this.rows.slice(0, this.length);
       this.rows = null;
       return {data: rows, schema: this.schema, length: rows.length};
     }
@@ -42,6 +39,9 @@ export default class RowTableBatch {
 }
 
 function convertRowToObject(row, headers) {
+  if (!headers) {
+    return row;
+  }
   const result = {};
   for (let i = 0; i < headers.length; i++) {
     result[headers[i]] = row[i];