From 4dbfc9ce3fd392f21b6f5d7c1f0e88b344881661 Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Tue, 24 Sep 2024 15:47:21 +0200 Subject: [PATCH 1/9] update run query --- clouds/bigquery/common/run-query.js | 2 +- clouds/bigquery/common/test-utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clouds/bigquery/common/run-query.js b/clouds/bigquery/common/run-query.js index 51aa90440..eaacdb926 100755 --- a/clouds/bigquery/common/run-query.js +++ b/clouds/bigquery/common/run-query.js @@ -7,7 +7,7 @@ const BQ_PROJECT = process.env.BQ_PROJECT; const client = new BigQuery({ projectId: `${BQ_PROJECT}` }); function runQuery (query) { - client.query(query, { timeoutMs : 120000 }); + client.query(query, { timeoutMs : 150000 }); } const query = process.argv[2]; diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js index 76f0d70da..e281172dd 100644 --- 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 : 150000 }, options); query = replaceBQPrefix(query); const [rows] = await client.query(query, options); return rows; From a33bae80fd620c88f46b9ca37f98df7bb299f932 Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Tue, 24 Sep 2024 16:11:56 +0200 Subject: [PATCH 2/9] increase timeout --- clouds/bigquery/common/run-query.js | 2 +- clouds/bigquery/common/test-utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clouds/bigquery/common/run-query.js b/clouds/bigquery/common/run-query.js index eaacdb926..557ef9c53 100755 --- a/clouds/bigquery/common/run-query.js +++ b/clouds/bigquery/common/run-query.js @@ -7,7 +7,7 @@ const BQ_PROJECT = process.env.BQ_PROJECT; const client = new BigQuery({ projectId: `${BQ_PROJECT}` }); function runQuery (query) { - client.query(query, { timeoutMs : 150000 }); + client.query(query, { timeoutMs : 200000 }); } const query = process.argv[2]; diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js index e281172dd..b88889b55 100644 --- 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 : 150000 }, options); + options = Object.assign({}, { timeoutMs : 200000 }, options); query = replaceBQPrefix(query); const [rows] = await client.query(query, options); return rows; From aa24c492c33f3ee819ecbd9dd62f23cfc245d3aa Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Tue, 24 Sep 2024 16:56:59 +0200 Subject: [PATCH 3/9] update timeouts --- clouds/bigquery/common/run-query.js | 2 +- clouds/bigquery/common/test-utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clouds/bigquery/common/run-query.js b/clouds/bigquery/common/run-query.js index 557ef9c53..51aa90440 100755 --- a/clouds/bigquery/common/run-query.js +++ b/clouds/bigquery/common/run-query.js @@ -7,7 +7,7 @@ const BQ_PROJECT = process.env.BQ_PROJECT; const client = new BigQuery({ projectId: `${BQ_PROJECT}` }); function runQuery (query) { - client.query(query, { timeoutMs : 200000 }); + client.query(query, { timeoutMs : 120000 }); } const query = process.argv[2]; diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js index b88889b55..a6dabf3da 100644 --- 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 : 200000 }, options); + options = Object.assign({}, { timeoutMs : 240000 }, options); query = replaceBQPrefix(query); const [rows] = await client.query(query, options); return rows; From 64d42e5f7535fa4bb870a060e0fd2411c8a0c8ec Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Tue, 24 Sep 2024 17:39:32 +0200 Subject: [PATCH 4/9] increase timeout --- clouds/bigquery/common/test-utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js index a6dabf3da..63b7e5ae6 100644 --- 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 : 240000 }, options); + options = Object.assign({}, { timeoutMs : 300000 }, options); query = replaceBQPrefix(query); const [rows] = await client.query(query, options); return rows; From 9f2799f0581650b72dac5d56411fbbcd986539ea Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Wed, 25 Sep 2024 18:34:29 +0200 Subject: [PATCH 5/9] increase timeout a lot --- clouds/bigquery/common/test-utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js index 63b7e5ae6..33ae77773 100644 --- 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 : 300000 }, options); + options = Object.assign({}, { timeoutMs : 600000 }, options); query = replaceBQPrefix(query); const [rows] = await client.query(query, options); return rows; From 8413ac43f01ccc5da2ae85ece772b989ff755273 Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Wed, 25 Sep 2024 20:37:40 +0200 Subject: [PATCH 6/9] increase timeout time --- clouds/bigquery/common/test-utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js index 33ae77773..2f10bbc0f 100644 --- 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 : 600000 }, options); + options = Object.assign({}, { timeoutMs : 1200000 }, options); query = replaceBQPrefix(query); const [rows] = await client.query(query, options); return rows; From 9525ee1965658014fac1b0e6455878fea5a002d9 Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Wed, 25 Sep 2024 20:38:41 +0200 Subject: [PATCH 7/9] fix bq package json version --- clouds/bigquery/common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clouds/bigquery/common/package.json b/clouds/bigquery/common/package.json index cb669992e..8b7bd1a6e 100644 --- a/clouds/bigquery/common/package.json +++ b/clouds/bigquery/common/package.json @@ -1,7 +1,7 @@ { "license": "BSD-3-Clause", "devDependencies": { - "@google-cloud/bigquery": "^7.3.0", + "@google-cloud/bigquery": "7.3.0", "@rollup/plugin-commonjs": "^17.1.0", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.0.0", From 1a74b516861a86f6d1f544e2de124982ce3bfb69 Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Wed, 25 Sep 2024 21:06:41 +0200 Subject: [PATCH 8/9] reduce timeout --- clouds/bigquery/common/test-utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js index 2f10bbc0f..63b7e5ae6 100644 --- 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 : 1200000 }, options); + options = Object.assign({}, { timeoutMs : 300000 }, options); query = replaceBQPrefix(query); const [rows] = await client.query(query, options); return rows; From 12985a8c50d989e5cd2df6ef0e841c7bc77b06f3 Mon Sep 17 00:00:00 2001 From: vdelacruzb Date: Thu, 26 Sep 2024 11:01:17 +0200 Subject: [PATCH 9/9] restore timeout --- clouds/bigquery/common/package.json | 2 +- clouds/bigquery/common/test-utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clouds/bigquery/common/package.json b/clouds/bigquery/common/package.json index 8b7bd1a6e..0343e37c9 100644 --- a/clouds/bigquery/common/package.json +++ b/clouds/bigquery/common/package.json @@ -1,7 +1,7 @@ { "license": "BSD-3-Clause", "devDependencies": { - "@google-cloud/bigquery": "7.3.0", + "@google-cloud/bigquery": "7.9.0", "@rollup/plugin-commonjs": "^17.1.0", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.0.0", diff --git a/clouds/bigquery/common/test-utils.js b/clouds/bigquery/common/test-utils.js index 63b7e5ae6..76f0d70da 100644 --- 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 : 300000 }, options); + options = Object.assign({}, { timeoutMs : 120000 }, options); query = replaceBQPrefix(query); const [rows] = await client.query(query, options); return rows;