@malloydata/db-bigquery 0.0.103-dev231115200636 → 0.0.103

package/dist/bigquery_connection.d.ts

@@ -1,7 +1,7 @@
 import { RowMetadata } from '@google-cloud/bigquery';
 import bigquery from '@google-cloud/bigquery/build/src/types';
 import { ResourceStream } from '@google-cloud/paginator';
-import { Connection, MalloyQueryData, PersistSQLResults, PooledConnection, QueryData, QueryDataRow, QueryRunStats, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
+import { Connection, MalloyQueryData, PersistSQLResults, PooledConnection, QueryData, QueryDataRow, QueryRunStats, RunSQLOptions, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
 import { FetchSchemaOptions } from '@malloydata/malloy-interfaces';
 export interface BigQueryManagerOptions {
     credentials?: {
@@ -93,7 +93,7 @@ export declare class BigQueryConnection implements Connection, PersistSQLResults
     private createBigQueryJobAndGetResults;
     private createBigQueryJob;
     initiateJobAndGetLinkToConsole(sqlCommand: string, dryRun?: boolean): Promise<string>;
-    runSQLStream(sqlCommand: string, options?: Partial<BigQueryQueryOptions>): AsyncIterableIterator<QueryDataRow>;
+    runSQLStream(sqlCommand: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
     close(): Promise<void>;
 }
 export {};

package/dist/bigquery_connection.js

@@ -137,21 +137,21 @@ class BigQueryConnection {
     get supportsNesting() {
         return true;
     }
-    async _runSQL(sqlCommand, options = {}, rowIndex = 0) {
-        var _a, _b, _c, _d;
+    async _runSQL(sqlCommand, { rowLimit, abortSignal } = {}, rowIndex = 0) {
+        var _a, _b, _c;
         const defaultOptions = this.readQueryOptions();
-        const pageSize = (_a = options.rowLimit) !== null && _a !== void 0 ? _a : defaultOptions.rowLimit;
+        const pageSize = rowLimit !== null && rowLimit !== void 0 ? rowLimit : defaultOptions.rowLimit;
         try {
             const queryResultsOptions = {
                 maxResults: pageSize,
                 startIndex: rowIndex.toString(),
             };
-            const jobResult = await this.createBigQueryJobAndGetResults(sqlCommand, undefined, queryResultsOptions);
-            const totalRows = +(((_b = jobResult[2]) === null || _b === void 0 ? void 0 : _b.totalRows)
+            const jobResult = await this.createBigQueryJobAndGetResults(sqlCommand, undefined, queryResultsOptions, abortSignal);
+            const totalRows = +(((_a = jobResult[2]) === null || _a === void 0 ? void 0 : _a.totalRows)
                 ? jobResult[2].totalRows
                 : '0');
             // TODO even though we have 10 minute timeout limit, we still should confirm that resulting metadata has "jobComplete: true"
-            const queryCostBytes = (_c = jobResult[2]) === null || _c === void 0 ? void 0 : _c.totalBytesProcessed;
+            const queryCostBytes = (_b = jobResult[2]) === null || _b === void 0 ? void 0 : _b.totalBytesProcessed;
             const data = {
                 rows: jobResult[0],
                 totalRows,
@@ -159,7 +159,7 @@ class BigQueryConnection {
                     queryCostBytes: queryCostBytes ? +queryCostBytes : undefined,
                 },
             };
-            const schema = (_d = jobResult[2]) === null || _d === void 0 ? void 0 : _d.schema;
+            const schema = (_c = jobResult[2]) === null || _c === void 0 ? void 0 : _c.schema;
             return { data, schema };
         }
         catch (e) {
@@ -517,12 +517,16 @@ class BigQueryConnection {
     // TODO this needs to extend the wait for results using a timeout set by the user,
     // and probably needs to loop to check for results - BQ docs now say that after ~2min of waiting,
     // no matter what you set for timeoutMs, they will probably just return.
-    async createBigQueryJobAndGetResults(sqlCommand, createQueryJobOptions, getQueryResultsOptions) {
+    async createBigQueryJobAndGetResults(sqlCommand, createQueryJobOptions, getQueryResultsOptions, abortSignal) {
         try {
             const job = await this.createBigQueryJob({
                 query: sqlCommand,
                 ...createQueryJobOptions,
             });
+            const cancel = () => {
+                job.cancel();
+            };
+            abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', cancel);
             // TODO we should check if this is still required?
             // We do a simple retry-loop here, as a temporary fix for a transient
             // error in which sometimes requesting results from a job yields an
@@ -540,6 +544,9 @@ class BigQueryConnection {
                 catch (fetchError) {
                     lastFetchError = fetchError;
                 }
+                finally {
+                    abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', cancel);
+                }
             }
             throw lastFetchError;
         }
@@ -564,23 +571,23 @@ class BigQueryConnection {
         const url = `https://console.cloud.google.com/bigquery?project=${this.projectId}&j=bq:${this.location}:${job.id}&page=queryresults`;
         return url;
     }
-    runSQLStream(sqlCommand, options = {}) {
-        const bigQuery = this.bigQuery;
-        function streamBigQuery(onError, onData, onEnd) {
+    runSQLStream(sqlCommand, { rowLimit, abortSignal } = {}) {
+        const streamBigQuery = (onError, onData, onEnd) => {
             let index = 0;
             function handleData(rowMetadata) {
                 onData(rowMetadata);
                 index += 1;
-                if (options.rowLimit !== undefined && index >= options.rowLimit) {
+                if ((rowLimit !== undefined && index >= rowLimit) ||
+                    (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)) {
                     this.end();
                 }
             }
-            bigQuery
+            this.bigQuery
                 .createQueryStream(sqlCommand)
                 .on('error', onError)
                 .on('data', handleData)
                 .on('end', onEnd);
-        }
+        };
         return (0, malloy_1.toAsyncGenerator)(streamBigQuery);
     }
     async close() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.103-dev231115200636",
+  "version": "0.0.103",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@google-cloud/bigquery": "^7.3.0",
     "@google-cloud/common": "^5.0.1",
     "@google-cloud/paginator": "^5.0.0",
-    "@malloydata/malloy": "^0.0.103-dev231115200636",
-    "@malloydata/malloy-interfaces": "^0.0.103-dev231115200636",
+    "@malloydata/malloy": "^0.0.103",
+    "@malloydata/malloy-interfaces": "^0.0.103",
     "gaxios": "^4.2.0"
   }
 }