wip

visgl · Oct 7, 2023 · 9708869 · 9708869
1 parent 499c01d
commit 9708869
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/modules/parquet/src/lib/parsers/parse-parquet-to-columns.ts b/modules/parquet/src/lib/parsers/parse-parquet-to-columns.ts
@@ -1,7 +1,7 @@
 // loaders.gl, MIT license
 
 import {ColumnarTable, ColumnarTableBatch, Schema} from '@loaders.gl/schema';
-import {makeReadableFile} from '@loaders.gl/loader-utils';
+import {BlobFile} from '@loaders.gl/loader-utils';
 import type {ParquetLoaderOptions} from '../../parquet-loader';
 import {ParquetReader} from '../../parquetjs/parser/parquet-reader';
 import {ParquetRowGroup} from '../../parquetjs/schema/declare';
@@ -16,7 +16,7 @@ export async function parseParquetInColumns(
 ): Promise<ColumnarTable> {
   installBufferPolyfill();
   const blob = new Blob([arrayBuffer]);
-  const file = makeReadableFile(blob);
+  const file = new BlobFile(blob);
   const reader = new ParquetReader(file);
 
   for await (const batch of parseParquetFileInColumnarBatches(reader, options)) {

diff --git a/modules/parquet/src/lib/parsers/parse-parquet-to-rows.ts b/modules/parquet/src/lib/parsers/parse-parquet-to-rows.ts
@@ -1,6 +1,6 @@
 // import type {LoaderWithParser, Loader, LoaderOptions} from '@loaders.gl/loader-utils';
 // import {ColumnarTableBatch} from '@loaders.gl/schema';
-import {makeReadableFile} from '@loaders.gl/loader-utils';
+import {BlobFile} from '@loaders.gl/loader-utils';
 import {GeoJSONTable, ObjectRowTable, ObjectRowTableBatch} from '@loaders.gl/schema';
 import type {ParquetLoaderOptions} from '../../parquet-loader';
 import type {ParquetRow} from '../../parquetjs/schema/declare';
@@ -16,7 +16,7 @@ export async function parseParquet(
   installBufferPolyfill();
 
   const blob = new Blob([arrayBuffer]);
-  const file = makeReadableFile(blob);
+  const file = new BlobFile(blob);
   const reader = new ParquetReader(file, {
     preserveBinary: options?.parquet?.preserveBinary
   });

diff --git a/modules/parquet/src/parquetjs/parser/parquet-reader.ts b/modules/parquet/src/parquetjs/parser/parquet-reader.ts
@@ -134,7 +134,8 @@ export class ParquetReader {
 
   /** Metadata is stored in the footer */
   async readHeader(): Promise<void> {
-    const buffer = await this.file.read(0, PARQUET_MAGIC.length);
+    const arrayBuffer = await this.file.read(0, PARQUET_MAGIC.length);
+    const buffer = Buffer.from(arrayBuffer);
     const magic = buffer.toString();
     switch (magic) {
       case PARQUET_MAGIC: