orez 0.4.3 → 0.4.5

package/dist/pg-proxy-do-backend.d.ts

@@ -16,6 +16,7 @@ export declare class DoBackend {
     private rewriteCache;
     private preparedStatements;
     private portals;
+    private publicationTableInfoCache;
     private readyPromise;
     private inTransaction;
     private txID;
@@ -98,6 +99,8 @@ export declare class DoBackend {
     private dropTransactionSnapshots;
     private restoreTransactionDataSnapshots;
     private doRawBatch;
+    /** run read statements in one /batch round-trip and return per-statement results. */
+    private doBatchResults;
     private shouldSkipStatement;
     private executeRewrittenStatement;
     private executeRewrittenStatements;
@@ -109,11 +112,12 @@ export declare class DoBackend {
     private zeroInternalTableRefForSqliteTable;
     private generatedIndexName;
     private uniqueIndexName;
-    private sqliteIndexColumns;
+    private sqliteIndexColumnsFromRows;
     private tableIndexInfos;
     private publicationContainsTable;
     private publicationsForTable;
     private publicationTableInfos;
+    private loadPublicationTableInfos;
     private projectCatalogRow;
     private pgTablesResult;
     private informationSchemaColumnsResult;

package/dist/pg-proxy-do-backend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg-proxy-do-backend.d.ts","sourceRoot":"","sources":["../src/pg-proxy-do-backend.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pg-proxy-do-backend.d.ts","sourceRoot":"","sources":["../src/pg-proxy-do-backend.ts"],"names":[],"mappings":"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"}

package/dist/pg-proxy-do-backend.js

@@ -473,6 +473,18 @@ function expressionOid(value) {
                 return oid;
         }
     }
+    // json access operators `->` and `#>` return a json/jsonb VALUE in postgres
+    // (vs `->>`/`#>>` which return text). sqlite's `->` returns the json text
+    // representation (e.g. `"begin"` with quotes), so the column must carry a
+    // json oid for the driver to JSON.parse it back into a value — otherwise
+    // zero-cache's changeLog catchup reads `change->'tag'` as the literal
+    // string `"begin"` and its `case "begin"` switch never matches, mis-tagging
+    // every begin/commit as a `data` change and poisoning the change stream.
+    if (node.A_Expr?.kind === 'AEXPR_OP') {
+        const op = operatorName(node.A_Expr);
+        if (op === '->' || op === '#>')
+            return PG_TYPE_JSON;
+    }
     return undefined;
 }
 function selectResultColumnMetadata(sql) {
@@ -4546,6 +4558,13 @@ export class DoBackend {
     rewriteCache;
     preparedStatements = new Map();
     portals = new Map();
+    // catalog-query answers (pg_tables, information_schema, published-schema)
+    // introspect every sqlite table via PRAGMAs. on a remote DO each PRAGMA is a
+    // round-trip, and zero-cache fires several catalog queries per pg session —
+    // uncached this serialized ~200 round-trips per query and starved /sync
+    // connects past the client's connect budget. cache per instance, invalidated
+    // on DDL / metadata / publication changes and on rollback.
+    publicationTableInfoCache = null;
     readyPromise = null;
     // Transaction state. The Durable Object refuses raw SQL BEGIN/COMMIT/SAVEPOINT
     // (Cloudflare requires ctx.storage.transaction()), so PG-style multi-call
@@ -4805,6 +4824,7 @@ export class DoBackend {
         }
         // Cached rewrites may reference metadata that the rollback just invalidated.
         this.rewriteCache.clear();
+        this.publicationTableInfoCache = null;
     }
     clearTransactionState() {
         this.inTransaction = false;
@@ -5048,6 +5068,7 @@ export class DoBackend {
             }
         }
         if (changed) {
+            this.publicationTableInfoCache = null;
             // inside an explicit tx we batch the persist to commit time. chat's
             // migrations open one tx and run dozens of DDL statements; persisting
             // after every one was the hot path.
@@ -5710,6 +5731,24 @@ export class DoBackend {
             'Content-Type': 'application/json',
         });
     }
+    /** run read statements in one /batch round-trip and return per-statement results. */
+    async doBatchResults(statements) {
+        if (statements.length === 0)
+            return [];
+        const resp = await this.httpClient.post(this.url('/batch'), JSON.stringify({ statements }), { 'Content-Type': 'application/json' });
+        const parsed = JSON.parse(resp);
+        const results = Array.isArray(parsed.results) ? parsed.results : [];
+        return statements.map((_, index) => {
+            const result = results[index] ?? {};
+            const rows = (result.rows ?? []);
+            const columns = Array.isArray(result.columns) && result.columns.length > 0
+                ? result.columns.map(String)
+                : rows.length > 0
+                    ? Object.keys(rows[0])
+                    : [];
+            return { rows, columns, affectedRows: result.affectedRows };
+        });
+    }
     async shouldSkipStatement(statement) {
         if (statement.skipIfColumnExists &&
             (await this.columnExists(statement.skipIfColumnExists.table, statement.skipIfColumnExists.column))) {
@@ -5730,6 +5769,8 @@ export class DoBackend {
             return { rows: [], columns: [] };
         if (await this.shouldSkipStatement(statement))
             return { rows: [], columns: [] };
+        if (statement.isDDL)
+            this.publicationTableInfoCache = null;
         await this.snapshotTransactionWrite(statement);
         const tracking = this.trackingForStatement(statement);
         const exec = await this.materializePublishedSchemaFunctions(tracking?.returningSQL ?? statement.sql, statement);
@@ -5761,6 +5802,8 @@ export class DoBackend {
                 : statement;
             if (!item.sql.trim())
                 continue;
+            if (item.isDDL)
+                this.publicationTableInfoCache = null;
             if (item.skipIfColumnExists || item.skipIfColumnMissing || item.skipIfTableEmpty) {
                 await flush();
                 if (item.skipIfColumnExists &&
@@ -5874,9 +5917,8 @@ export class DoBackend {
         usedNames.add(unique);
         return unique;
     }
-    async sqliteIndexColumns(indexName) {
-        const result = await this.doExecResult(`PRAGMA index_xinfo(${quoteIdentifier(indexName)})`);
-        const rows = result.rows
+    sqliteIndexColumnsFromRows(xinfoRows) {
+        const rows = xinfoRows
             .map((row) => ({
             seqno: Number(row.seqno ?? 0),
             cid: Number(row.cid ?? -1),
@@ -5891,7 +5933,7 @@ export class DoBackend {
             columns[row.name] = row.desc === 1 ? 'DESC' : 'ASC';
         return columns;
     }
-    async tableIndexInfos(table, columns, primaryKey) {
+    tableIndexInfos(table, columns, primaryKey, indexListRows, indexColumnsByName) {
         const usedNames = new Set();
         const seenSignatures = new Set();
         const indexes = [];
@@ -5926,8 +5968,7 @@ export class DoBackend {
                 continue;
             addIndex(this.generatedIndexName(table, [column.name], 'key'), { [column.name]: 'ASC' }, true, false);
         }
-        const result = await this.doExecResult(`PRAGMA index_list(${quoteIdentifier(table.table)})`);
-        const rawIndexes = result.rows
+        const rawIndexes = indexListRows
             .map((row) => ({
             seq: Number(row.seq ?? 0),
             name: String(row.name ?? ''),
@@ -5940,7 +5981,7 @@ export class DoBackend {
         for (const raw of rawIndexes) {
             if (raw.partial)
                 continue;
-            const indexColumns = await this.sqliteIndexColumns(raw.name);
+            const indexColumns = indexColumnsByName.get(raw.name) ?? {};
             const names = Object.keys(indexColumns);
             if (raw.origin === 'pk' && primaryKey.length > 0)
                 continue;
@@ -5965,15 +6006,44 @@ export class DoBackend {
         });
     }
     async publicationTableInfos(publications) {
-        const allTables = await this.listSqliteTables();
+        if (!this.publicationTableInfoCache) {
+            this.publicationTableInfoCache = await this.loadPublicationTableInfos();
+        }
         const requested = publications?.filter((name) => this.publications.has(name)) ?? [];
+        return this.publicationTableInfoCache.filter((info) => {
+            if (requested.length > 0) {
+                return requested.some((publicationName) => this.publicationContainsTable(this.publications.get(publicationName), info));
+            }
+            return !publications?.length;
+        });
+    }
+    async loadPublicationTableInfos() {
+        const allTables = (await this.listSqliteTables()).filter((table) => !isSystemSqliteTable(table.name));
+        // batch table_info + index_list for every table into ONE round-trip, then
+        // every index_xinfo into a second — per-PRAGMA round-trips to the SQL DO
+        // made each full scan cost seconds and starve concurrent sessions.
+        const pragmaResults = await this.doBatchResults(allTables.flatMap((table) => [
+            `PRAGMA table_info(${quoteIdentifier(table.name)})`,
+            `PRAGMA index_list(${quoteIdentifier(table.name)})`,
+        ]));
+        const indexNames = [];
+        for (let i = 0; i < allTables.length; i++) {
+            for (const row of pragmaResults[i * 2 + 1]?.rows ?? []) {
+                const name = String(row.name ?? '');
+                if (name && !Number(row.partial ?? 0))
+                    indexNames.push(name);
+            }
+        }
+        const xinfoResults = await this.doBatchResults(indexNames.map((name) => `PRAGMA index_xinfo(${quoteIdentifier(name)})`));
+        const indexColumnsByName = new Map();
+        for (let i = 0; i < indexNames.length; i++) {
+            indexColumnsByName.set(indexNames[i], this.sqliteIndexColumnsFromRows(xinfoResults[i]?.rows ?? []));
+        }
         const infos = [];
-        for (const table of allTables) {
-            if (isSystemSqliteTable(table.name))
-                continue;
+        for (let i = 0; i < allTables.length; i++) {
+            const table = allTables[i];
             const ref = this.tableRefForSqliteTable(table.name);
-            const result = await this.doExecResult(`PRAGMA table_info(${quoteIdentifier(table.name)})`);
-            const columns = result.rows.map((row) => ({
+            const columns = (pragmaResults[i * 2]?.rows ?? []).map((row) => ({
                 cid: Number(row.cid ?? 0),
                 name: String(row.name ?? ''),
                 type: String(row.type ?? ''),
@@ -6001,12 +6071,7 @@ export class DoBackend {
                         .map((column) => column.name),
                 indexes: [],
             };
-            info.indexes = await this.tableIndexInfos(ref, columns, info.primaryKey);
-            if (requested.length > 0 &&
-                !requested.some((publicationName) => this.publicationContainsTable(this.publications.get(publicationName), info)))
-                continue;
-            if (requested.length === 0 && publications?.length)
-                continue;
+            info.indexes = this.tableIndexInfos(ref, columns, info.primaryKey, pragmaResults[i * 2 + 1]?.rows ?? [], indexColumnsByName);
             infos.push(info);
         }
         return infos;