Skip to content

Commit 47e5c46

Browse files
committed
refactor + use onPage
1 parent d651830 commit 47e5c46

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/lib/tableProvider.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,9 @@ export function parquetDataFrame(from: AsyncBufferFrom, metadata: FileMetaData):
3939
}
4040
}
4141

42-
async function fetchVirtualRowGroup({ virtualGroupIndex, columns }: {
43-
virtualGroupIndex: number, columns: string[]
42+
async function fetchVirtualRowGroup({ group, columns }: {
43+
group: VirtualRowGroup, columns: string[]
4444
}): Promise<void> {
45-
const group = groups[virtualGroupIndex]
46-
if (!group) {
47-
throw new Error(`Virtual row group ${virtualGroupIndex} not found`)
48-
}
4945
const { groupStart, groupEnd, fetching, fetched } = group
5046
const columnsToFetch = columns.filter(column => !fetching.get(column) && !fetched.get(column))
5147

@@ -107,11 +103,12 @@ export function parquetDataFrame(from: AsyncBufferFrom, metadata: FileMetaData):
107103

108104
const promises: Promise<void>[] = []
109105

110-
groups.forEach(({ groupStart, groupEnd }, i) => {
106+
groups.forEach((group) => {
107+
const { groupStart, groupEnd } = group
111108
if (groupStart < rowEnd && groupEnd > rowStart) {
112109
promises.push(
113110
fetchVirtualRowGroup({
114-
virtualGroupIndex: i,
111+
group,
115112
columns,
116113
}).then(() => {
117114
checkSignal(signal)

src/lib/workers/parquetWorker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ self.onmessage = async ({ data }: { data: ClientMessage }) => {
1818
const { rowStart, rowEnd, columns, metadata, from, queryId } = data
1919
const file = await asyncBufferFrom(from)
2020
try {
21-
await parquetRead({ metadata, file, rowStart, rowEnd, columns, compressors, onChunk })
21+
await parquetRead({ metadata, file, rowStart, rowEnd, columns, compressors, onPage: onChunk })
2222
postResultMessage({ queryId })
2323
} catch (error) {
2424
postErrorMessage({ error: error as Error, queryId })

0 commit comments

Comments
 (0)