Skip to content

Commit

Permalink
fix: Revert parquet-wasm integration (#2781)
Browse files Browse the repository at this point in the history
  • Loading branch information
ibgreen authored Nov 9, 2023
1 parent d29fd1e commit d3e1f0b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
23 changes: 10 additions & 13 deletions modules/parquet/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ import type {
GeoJSONTableBatch
} from '@loaders.gl/schema';

import {
ArrowTable
// ArrowTableBatch
} from '@loaders.gl/arrow';
// import {ArrowTable, ArrowTableBatch} from '@loaders.gl/arrow';

// ParquetLoader

Expand All @@ -32,12 +29,12 @@ import {
parseParquetFileInColumnarBatches
} from './lib/parsers/parse-parquet-to-columns';

import type {ParquetWasmLoaderOptions} from './lib/wasm/parse-parquet-wasm';
import {parseParquetWasm} from './lib/wasm/parse-parquet-wasm';
import {ParquetWasmLoader as ParquetWasmWorkerLoader} from './parquet-wasm-loader';
// import type {ParquetWasmLoaderOptions} from './lib/wasm/parse-parquet-wasm';
// import {parseParquetWasm} from './lib/wasm/parse-parquet-wasm';
// import {ParquetWasmLoader as ParquetWasmWorkerLoader} from './parquet-wasm-loader';

export {ParquetWorkerLoader};
export {ParquetWasmWorkerLoader};
// export {ParquetWasmWorkerLoader};

/** ParquetJS table loader */
export const ParquetLoader: LoaderWithParser<
Expand Down Expand Up @@ -67,15 +64,15 @@ export const ParquetColumnarLoader: LoaderWithParser<
parseFileInBatches: parseParquetFileInColumnarBatches
};

export const ParquetWasmLoader: LoaderWithParser<ArrowTable, never, ParquetWasmLoaderOptions> = {
...ParquetWasmWorkerLoader,
parse: parseParquetWasm
};
// export const ParquetWasmLoader: LoaderWithParser<ArrowTable, never, ParquetWasmLoaderOptions> = {
// ...ParquetWasmWorkerLoader,
// parse: parseParquetWasm
// };

// ParquetWriter

export {ParquetWriter as _ParquetWriter} from './parquet-writer';
export {ParquetWasmWriter} from './parquet-wasm-writer';
// export {ParquetWasmWriter} from './parquet-wasm-writer';

// EXPERIMENTAL - expose the internal parquetjs API

Expand Down
2 changes: 1 addition & 1 deletion modules/parquet/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ import './parquet-writer.spec';
import './geoparquet-loader.spec';

import './parquet-columnar-loader.spec';
import './parquet-wasm-loader.spec';
// import './parquet-wasm-loader.spec';

0 comments on commit d3e1f0b

Please sign in to comment.