chore: migrate duckdb wasm

devrev · Sep 14, 2024 · e25e862 · e25e862
1 parent 1af8a13
commit e25e862
Show file tree

Hide file tree

Showing 16 changed files with 147 additions and 161 deletions.
diff --git a/benchmarking/public/runner/indexeddb-runner.html b/benchmarking/public/runner/indexeddb-runner.html
diff --git a/benchmarking/public/runner/memory-runner.html b/benchmarking/public/runner/memory-runner.html
diff --git a/benchmarking/src/app/dbm-context/instance-manager.ts b/benchmarking/src/app/dbm-context/instance-manager.ts
@@ -1,6 +1,6 @@
-import * as duckdb from '@devrev/duckdb-wasm';
-import { AsyncDuckDB, LogEntryVariant } from '@devrev/duckdb-wasm';
 import { InstanceManagerType } from '@devrev/meerkat-dbm';
+import * as duckdb from '@duckdb/duckdb-wasm';
+import { AsyncDuckDB, LogEntryVariant } from '@duckdb/duckdb-wasm';
 const JSDELIVR_BUNDLES = duckdb.getJsDelivrBundles();
 
 export class InstanceManager implements InstanceManagerType {

diff --git a/benchmarking/src/app/dbm-context/use-async-duckdb.tsx b/benchmarking/src/app/dbm-context/use-async-duckdb.tsx
@@ -1,6 +1,6 @@
-import * as duckdb from '@devrev/duckdb-wasm';
-import { AsyncDuckDB } from '@devrev/duckdb-wasm';
 import { DBM, FileManagerType } from '@devrev/meerkat-dbm';
+import * as duckdb from '@duckdb/duckdb-wasm';
+import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
 import React, { useState } from 'react';
 import { useClassicEffect } from '../hooks/use-classic-effect';
 const JSDELIVR_BUNDLES = duckdb.getJsDelivrBundles();

diff --git a/meerkat-browser-runner/src/app/app.tsx b/meerkat-browser-runner/src/app/app.tsx
@@ -6,7 +6,7 @@ import {
   FileManagerType,
   getMainAppName,
   getRunnerAppName,
-  RunnerMemoryDBFileManager,
+  RunnerIndexedDBFileManager,
   WindowCommunication,
 } from '@devrev/meerkat-dbm';
 
@@ -72,7 +72,7 @@ export function App() {
   }
 
   if (!fileManagerRef.current) {
-    fileManagerRef.current = new RunnerMemoryDBFileManager({
+    fileManagerRef.current = new RunnerIndexedDBFileManager({
       instanceManager: instanceManagerRef.current,
       fetchTableFileBuffers: async () => [],
       logger: log,
@@ -82,7 +82,6 @@ export function App() {
           payload: event,
         });
       },
-      communication: communicationRef.current,
     });
   }
 

diff --git a/meerkat-browser-runner/src/app/duck-db/instance-manager.ts b/meerkat-browser-runner/src/app/duck-db/instance-manager.ts
@@ -1,6 +1,6 @@
-import * as duckdb from '@devrev/duckdb-wasm';
-import { AsyncDuckDB, LogEntryVariant } from '@devrev/duckdb-wasm';
 import { InstanceManagerType } from '@devrev/meerkat-dbm';
+import * as duckdb from '@duckdb/duckdb-wasm';
+import { AsyncDuckDB, LogEntryVariant } from '@duckdb/duckdb-wasm';
 const JSDELIVR_BUNDLES = duckdb.getJsDelivrBundles();
 
 export class InstanceManager implements InstanceManagerType {

diff --git a/meerkat-browser/package.json b/meerkat-browser/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@devrev/meerkat-browser",
-  "version": "0.0.76",
+  "version": "0.0.77",
   "dependencies": {
     "@swc/helpers": "~0.5.0",
     "@devrev/meerkat-core": "*",
-    "@devrev/duckdb-wasm": "1.14.3"
+    "@duckdb/duckdb-wasm": "1.14.3"
   },
   "scripts": {
     "release": "semantic-release"

diff --git a/meerkat-browser/src/browser-cube-to-sql/browser-cube-to-sql.ts b/meerkat-browser/src/browser-cube-to-sql/browser-cube-to-sql.ts
@@ -1,4 +1,3 @@
-import { AsyncDuckDBConnection } from '@devrev/duckdb-wasm';
 import {
   BASE_TABLE_NAME,
   ContextParams,
@@ -15,6 +14,7 @@ import {
   getFilterParamsAST,
   getWrappedBaseQueryWithProjections,
 } from '@devrev/meerkat-core';
+import { AsyncDuckDBConnection } from '@duckdb/duckdb-wasm';
 
 const getFilterParamsSQL = async ({
   cubeQuery,

diff --git a/meerkat-dbm/package.json b/meerkat-dbm/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@devrev/meerkat-dbm",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "dependencies": {
     "tslib": "^2.3.0",
-    "@devrev/duckdb-wasm": "1.14.3",
+    "@duckdb/duckdb-wasm": "1.14.3",
     "dexie": "^3.2.4",
     "loglevel": "^1.8.1",
     "uuid": "^9.0.1",
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": "^17.0.0",
     "lodash": "^4.17.21"
   },
   "repository": {

diff --git a/meerkat-dbm/src/dbm/__test__/mock.ts b/meerkat-dbm/src/dbm/__test__/mock.ts
@@ -1,4 +1,4 @@
-import { AsyncDuckDB } from '@devrev/duckdb-wasm';
+import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
 import { InstanceManagerType } from '../instance-manager';
 
 export const mockDB = {

diff --git a/meerkat-dbm/src/dbm/dbm.ts b/meerkat-dbm/src/dbm/dbm.ts
@@ -1,4 +1,4 @@
-import { AsyncDuckDBConnection } from '@devrev/duckdb-wasm';
+import { AsyncDuckDBConnection } from '@duckdb/duckdb-wasm';
 import { Table } from 'apache-arrow/table';
 import { v4 as uuidv4 } from 'uuid';
 import { FileManagerType } from '../file-manager/file-manager-type';

diff --git a/meerkat-dbm/src/dbm/instance-manager.ts b/meerkat-dbm/src/dbm/instance-manager.ts
@@ -1,4 +1,4 @@
-import { AsyncDuckDB } from '@devrev/duckdb-wasm';
+import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
 
 export interface InstanceManagerType {
   /**

diff --git a/meerkat-dbm/src/file-manager/__tests__/indexed-db-file-manager.spec.ts b/meerkat-dbm/src/file-manager/__tests__/indexed-db-file-manager.spec.ts
@@ -1,4 +1,4 @@
-import { AsyncDuckDB } from '@devrev/duckdb-wasm';
+import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
 import 'fake-indexeddb/auto';
 import { InstanceManagerType } from '../../dbm/instance-manager';
 import { FILE_TYPES } from '../../types';

diff --git a/meerkat-dbm/src/file-manager/file-registerer.ts b/meerkat-dbm/src/file-manager/file-registerer.ts
@@ -1,4 +1,4 @@
-import { AsyncDuckDB } from '@devrev/duckdb-wasm';
+import { AsyncDuckDB } from '@duckdb/duckdb-wasm';
 import { InstanceManagerType } from '../dbm/instance-manager';
 
 interface FileRegistererConstructorOptions {