chore(bq): update bigquery timeouts

CartoDB · Nov 13, 2023 · 55e7b21 · 55e7b21
1 parent a754b36
commit 55e7b21
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/clouds/bigquery/common/run-query.js b/clouds/bigquery/common/run-query.js
@@ -7,8 +7,7 @@ const BQ_PROJECT = process.env.BQ_PROJECT;
 const client = new BigQuery({ projectId: `${BQ_PROJECT}` });
 
 function runQuery (query) {
-    const query_options = { 'timeoutMs' : 120000 };
-    client.query(query, query_options);
+    client.query(query, { timeoutMs : 120000 });
 }
 
 const query = process.argv[2];

diff --git a/clouds/bigquery/common/run-script.js b/clouds/bigquery/common/run-script.js
@@ -14,10 +14,9 @@ const options = {
 };
 const bar = new cliProgress.SingleBar(options, cliProgress.Presets.shades_classic);
 
-const client = new BigQuery({ projectId: `${BQ_PROJECT}`, timeout: 600000 });
+const client = new BigQuery({ projectId: `${BQ_PROJECT}` });
 
 async function runQueries (queries) {
-    const query_options = { 'timeoutMs' : 600000 };
     const n = queries.length;
     bar.start(n, 0);
     for (let i = 0; i < n; i++) {
@@ -28,7 +27,10 @@ async function runQueries (queries) {
         const result = results && results.reverse()[0]
         sqlFunction = result && result.split('.').reverse()[0]
 
-        await client.query(query, query_options);
+        await client.query({
+            query,
+            jobTimeoutMs: 600000
+        });
         bar.increment();
     }
     bar.stop(n);

diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js
@@ -10,7 +10,7 @@ const BQ_DATASET = process.env.BQ_DATASET;
 const client = new BigQuery({ projectId: `${BQ_PROJECT}` });
 
 async function runQuery (query, options) {
-    options = Object.assign({}, { 'timeoutMs' : 120000 }, options);
+    options = Object.assign({}, { timeoutMs : 120000 }, options);
     query = replaceBQPrefix(query);
     const [rows] = await client.query(query, options);
     return rows;