wip

visgl · Jan 30, 2024 · 5684540 · 5684540
1 parent d4cd8fb
commit 5684540
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/modules/flatgeobuf/src/lib/get-schema-from-fgb-header.ts b/modules/flatgeobuf/src/lib/get-schema-from-fgb-header.ts
@@ -86,6 +86,7 @@ enum fgbColumnType {
 }
 
 /** Convert FGB types to arrow like types */
+// eslint-disable-next-line complexity
 function getTypeFromFGBType(fgbType: fgbColumnType /* fgb.ColumnMeta['type'] */): DataType {
   switch (fgbType) {
     case fgbColumnType.Byte:

diff --git a/modules/parquet/src/lib/wasm/encode-parquet-wasm.ts b/modules/parquet/src/lib/wasm/encode-parquet-wasm.ts
@@ -14,9 +14,9 @@ import type {ParquetWriterOptions} from '../../parquet-wasm-writer';
  */
 export async function encode(
   table: ArrowTable,
-  options?: ParquetWriterOptions
+  options: ParquetWriterOptions
 ): Promise<ArrayBuffer> {
-  const wasmUrl = options?.parquet?.wasmUrl;
+  const wasmUrl = options.parquet?.wasmUrl!;
   const wasm = await loadWasm(wasmUrl);
 
   // Serialize the table to the IPC format.

diff --git a/modules/parquet/src/lib/wasm/parse-parquet-wasm.ts b/modules/parquet/src/lib/wasm/parse-parquet-wasm.ts
@@ -11,19 +11,23 @@ import * as arrow from 'apache-arrow';
 
 export async function parseParquetWasm(
   arrayBuffer: ArrayBuffer,
-  options?: ParquetWasmLoaderOptions
+  options: ParquetWasmLoaderOptions
 ): Promise<ArrowTable> {
+  const arr = new Uint8Array(arrayBuffer);
+
   const wasmUrl = options?.parquet?.wasmUrl;
   const wasm = await loadWasm(wasmUrl);
-
-  const arr = new Uint8Array(arrayBuffer);
   const wasmTable = wasm.readParquet(arr);
-  const ipcStream = wasmTable.intoIPCStream();
-  const arrowTable = arrow.tableFromIPC(ipcStream);
+  try {
+    const ipcStream = wasmTable.intoIPCStream();
+    const arrowTable = arrow.tableFromIPC(ipcStream);
 
-  return {
-    shape: 'arrow-table',
-    schema: serializeArrowSchema(arrowTable.schema),
-    data: arrowTable
-  };
+    return {
+      shape: 'arrow-table',
+      schema: serializeArrowSchema(arrowTable.schema),
+      data: arrowTable
+    };
+  } finally {
+    wasmTable.free();
+  }
 }