Skip to content

Commit bb824e5

Browse files
vpbs2ujaval403
andauthored
chore: change duckdb wasm package (#97)
* update: runner package * update: index html * update: instance manager * fix: move to public version * update: public version * fix: package lock * update: imports * update: changes * remove: log * remove: vite changes * remove: duckdb manager * resolve: comments --------- Co-authored-by: ujaval403 <[email protected]>
1 parent 27f1c95 commit bb824e5

File tree

13 files changed

+61
-42
lines changed

13 files changed

+61
-42
lines changed

benchmarking/public/runner/index.html

Lines changed: 15 additions & 15 deletions
Large diffs are not rendered by default.

benchmarking/src/app/dbm-context/instance-manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import * as duckdb from '@devrev/duckdb-wasm';
2+
import { AsyncDuckDB, LogEntryVariant } from '@devrev/duckdb-wasm';
13
import { InstanceManagerType } from '@devrev/meerkat-dbm';
2-
import * as duckdb from '@duckdb/duckdb-wasm';
3-
import { AsyncDuckDB, LogEntryVariant } from '@duckdb/duckdb-wasm';
44
const JSDELIVR_BUNDLES = duckdb.getJsDelivrBundles();
55

66
export class InstanceManager implements InstanceManagerType {

benchmarking/src/app/dbm-context/use-async-duckdb.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import * as duckdb from '@devrev/duckdb-wasm';
2+
import { AsyncDuckDB } from '@devrev/duckdb-wasm';
13
import { DBM, FileManagerType } from '@devrev/meerkat-dbm';
2-
import * as duckdb from '@duckdb/duckdb-wasm';
3-
import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
44
import React, { useState } from 'react';
55
import { useClassicEffect } from '../hooks/use-classic-effect';
66
const JSDELIVR_BUNDLES = duckdb.getJsDelivrBundles();

meerkat-browser-runner/src/app/app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
import log from 'loglevel';
1414
import { TableWiseFiles } from 'meerkat-dbm/src/types';
1515
import { useEffect, useRef, useState } from 'react';
16-
import { InstanceManager } from './instance-manager';
16+
import { InstanceManager } from './duck-db/instance-manager';
1717

1818
type EffectCallback = () => void | (() => void | undefined);
1919

meerkat-browser-runner/src/app/instance-manager.ts renamed to meerkat-browser-runner/src/app/duck-db/instance-manager.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1+
import * as duckdb from '@devrev/duckdb-wasm';
2+
import { AsyncDuckDB, LogEntryVariant } from '@devrev/duckdb-wasm';
13
import { InstanceManagerType } from '@devrev/meerkat-dbm';
2-
import * as duckdb from '@duckdb/duckdb-wasm';
3-
import { AsyncDuckDB, LogEntryVariant } from '@duckdb/duckdb-wasm';
44
const JSDELIVR_BUNDLES = duckdb.getJsDelivrBundles();
55

66
export class InstanceManager implements InstanceManagerType {
77
private db: AsyncDuckDB | null = null;
8-
98
private async initDB() {
109
const bundle = await duckdb.selectBundle(JSDELIVR_BUNDLES);
1110

meerkat-dbm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.1",
44
"dependencies": {
55
"tslib": "^2.3.0",
6-
"@duckdb/duckdb-wasm": "^1.28.0",
6+
"@devrev/duckdb-wasm": "1.14.3",
77
"dexie": "^3.2.4",
88
"loglevel": "^1.8.1",
99
"uuid": "^9.0.1",

meerkat-dbm/src/dbm/__test__/mock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
1+
import { AsyncDuckDB } from '@devrev/duckdb-wasm';
22
import { InstanceManagerType } from '../instance-manager';
33

44
export const mockDB = {

meerkat-dbm/src/dbm/dbm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AsyncDuckDBConnection } from '@duckdb/duckdb-wasm';
1+
import { AsyncDuckDBConnection } from '@devrev/duckdb-wasm';
22
import { Table } from 'apache-arrow/table';
33
import { v4 as uuidv4 } from 'uuid';
44
import { FileManagerType } from '../file-manager/file-manager-type';

meerkat-dbm/src/dbm/instance-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
1+
import { AsyncDuckDB } from '@devrev/duckdb-wasm';
22

33
export interface InstanceManagerType {
44
/**

meerkat-dbm/src/file-manager/__tests__/indexed-db-file-manager.spec.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
1+
import { AsyncDuckDB } from '@devrev/duckdb-wasm';
22
import 'fake-indexeddb/auto';
33
import { InstanceManagerType } from '../../dbm/instance-manager';
44
import { FILE_TYPES } from '../../types';
@@ -15,9 +15,9 @@ const mockDB = {
1515
return {
1616
query: jest.fn(),
1717
insertJSONFromPath: jest.fn(),
18-
close: jest.fn()
18+
close: jest.fn(),
1919
};
20-
}
20+
},
2121
};
2222

2323
describe('IndexedDBFileManager', () => {
@@ -194,9 +194,9 @@ describe('IndexedDBFileManager', () => {
194194
files: [
195195
{
196196
fileName: 'taxi2.parquet',
197-
fileType: 'parquet'
198-
}
199-
]
197+
fileType: 'parquet',
198+
},
199+
],
200200
});
201201

202202
expect(
@@ -212,7 +212,7 @@ describe('IndexedDBFileManager', () => {
212212
// Verify that the file is dropped
213213
expect(tableData2[0]).toEqual({
214214
tableName: 'taxi1',
215-
files: []
215+
files: [],
216216
});
217217

218218
expect(
@@ -233,8 +233,8 @@ describe('IndexedDBFileManager', () => {
233233
tableName: 'taxi-json',
234234
fileName: 'taxi-json.parquet',
235235
json: {
236-
test: 'test'
237-
}
236+
test: 'test',
237+
},
238238
};
239239

240240
await fileManager.registerJSON(jsonFile);
@@ -257,16 +257,16 @@ describe('IndexedDBFileManager', () => {
257257
tableName: 'taxi-json-bulk',
258258
fileName: 'taxi-json1.parquet',
259259
json: {
260-
test: 'test'
261-
}
260+
test: 'test',
261+
},
262262
},
263263
{
264264
tableName: 'taxi-json-bulk',
265265
fileName: 'taxi-json2.parquet',
266266
json: {
267-
test: 'test'
268-
}
269-
}
267+
test: 'test',
268+
},
269+
},
270270
];
271271

272272
await fileManager.bulkRegisterJSON(jsonFiles);

0 commit comments

Comments
 (0)