Remove prelock support.

Author: rkistner

packages/driver/src/driver-api.ts

@@ -35,9 +35,6 @@ export interface SqliteDriverConnection {
   getLastChanges(): Promise<SqliteChanges>;
 
   close(): Promise<void>;
-
-  lock?(mode: 'exclusive' | 'shared' | 'deferred'): Promise<void>;
-  release?(): void;
 }
 
 export type SqliteParameterBinding =

packages/driver/src/util/SingleConnectionPool.ts

@@ -37,7 +37,6 @@ export class SingleConnectionPool implements SqliteDriverConnectionPool {
       async () => {
         // TODO: sync
         if (this.inUse === reserved) {
-          reserved.connection.release?.();
           this.inUse = null;
           Promise.resolve().then(() => this.next());
         }
@@ -46,9 +45,6 @@ export class SingleConnectionPool implements SqliteDriverConnectionPool {
 
     if (this.inUse == null) {
       this.inUse = reserved;
-      await reserved.connection.lock?.(
-        options?.readonly ? 'shared' : 'exclusive'
-      );
       return reserved;
     } else {
       const promise = new Promise<ReservedConnection>((resolve, reject) => {
@@ -70,9 +66,6 @@ export class SingleConnectionPool implements SqliteDriverConnectionPool {
 
       return promise.then(async (r) => {
         this.inUse = reserved;
-        await reserved.connection.lock?.(
-          options?.readonly ? 'shared' : 'exclusive'
-        );
         return r;
       });
     }

packages/wa-sqlite-driver/src/OPFSCoopSyncVFS2.ts

@@ -92,20 +92,6 @@ export class OPFSCoopSyncVFS2 extends FacadeVFS {
     return (this as unknown as WithModule)._module;
   }
 
-  async prelock(fileName: string): Promise<Disposable> {
-    const file = this.persistentFiles.get('/' + fileName);
-    this.log?.('prelock', fileName, file);
-    await this.#requestAccessHandle(file);
-    this.log?.('prelocked', fileName);
-    const self = this;
-    return {
-      [Symbol.dispose]() {
-        this.log?.('prelock release', fileName);
-        self.#releaseAccessHandle(file);
-      }
-    };
-  }
-
   async #initialize(nTemporaryFiles) {
     // Delete temporary directories no longer in use.
     const root = await navigator.storage.getDirectory();

packages/wa-sqlite-driver/src/wa-sqlite-driver.ts

@@ -257,7 +257,6 @@ export class WaSqliteConnection implements SqliteDriverConnection {
   vfs: OPFSCoopSyncVFS2;
 
   statements = new Set<StatementImpl>();
-  lockDisposer: Disposable | null = null;
 
   static async open(
     filename: string,
@@ -277,15 +276,6 @@ export class WaSqliteConnection implements SqliteDriverConnection {
     this.vfs = vfs;
   }
 
-  async lock() {
-    this.lockDisposer = await this.vfs.prelock(this.path);
-  }
-
-  release() {
-    this.lockDisposer[Symbol.dispose]();
-    this.lockDisposer = null;
-  }
-
   async close() {
     await m.runExclusive(async () => {
       console.log('closing...', this.path);

packages/wa-sqlite-driver/src/worker_threads/WorkerDriverAdapter.ts

@@ -115,10 +115,6 @@ export class WorkerConnectionAdapter implements WorkerDriver {
         return this._parse(command);
       case SqliteCommandType.changes:
         return this.connnection.getLastChanges();
-      case SqliteCommandType.lock:
-        return this.connnection.lock?.(command.mode);
-      case SqliteCommandType.release:
-        return this.connnection.release?.();
       default:
         throw new Error(`Unknown command: ${command.type}`);
     }

packages/wa-sqlite-driver/src/worker_threads/async-commands.ts

@@ -91,15 +91,6 @@ export interface SqliteGetChanges {
   type: SqliteCommandType.changes;
 }
 
-export interface SqliteLock {
-  type: SqliteCommandType.lock;
-  mode: 'exclusive' | 'shared' | 'deferred';
-}
-
-export interface SqliteRelease {
-  type: SqliteCommandType.release;
-}
-
 export type SqliteCommand =
   | SqlitePrepare
   | SqliteBind
@@ -109,9 +100,7 @@ export type SqliteCommand =
   | SqliteFinalize
   | SqliteSync
   | SqliteParse
-  | SqliteGetChanges
-  | SqliteLock
-  | SqliteRelease;
+  | SqliteGetChanges;
 
 export type InferCommandResult<T extends SqliteCommand> = T extends SqliteRun
   ? SqliteChanges

packages/wa-sqlite-driver/src/worker_threads/worker-driver.ts

@@ -70,14 +70,6 @@ export class WorkerDriverConnection implements SqliteDriverConnection {
     return this.post('open', this.options);
   }
 
-  async lock(mode: 'exclusive' | 'shared' | 'deferred'): Promise<void> {
-    await this._send({ type: SqliteCommandType.lock, mode: mode });
-  }
-
-  release(): void {
-    this._send({ type: SqliteCommandType.release });
-  }
-
   prepare(sql: string, options?: PrepareOptions): WorkerDriverStatement {
     const id = this.nextId++;
     this.buffer.push({