@cubejs-backend/query-orchestrator - npm Package Compare versions

Comparing version 0.19.36 to 0.19.46

CHANGELOG.md

@@ -6,2 +6,13 @@ # Change Log
 
+## [0.19.46](https://github.com/cube-js/cube.js/compare/v0.19.45...v0.19.46) (2020-07-06)
+
+
+### Features
+
+* Report query usage for Athena and BigQuery ([697b53f](https://github.com/cube-js/cube.js/commit/697b53f))
+
+
+
+
+
 ## [0.19.36](https://github.com/cube-js/cube.js/compare/v0.19.35...v0.19.36) (2020-06-24)
@@ -8,0 +19,0 @@

driver/BaseDriver.js

@@ -96,8 +96,8 @@ const { reduce } = require('ramda');
 
-  loadPreAggregationIntoTable(preAggregationTableName, loadSql, params, tx) {
-    return this.query(loadSql, params, tx);
+  loadPreAggregationIntoTable(preAggregationTableName, loadSql, params, options) {
+    return this.query(loadSql, params, options);
   }
 
-  dropTable(tableName, tx) {
-    return this.query(`DROP TABLE ${tableName}`, [], tx);
+  dropTable(tableName, options) {
+    return this.query(`DROP TABLE ${tableName}`, [], options);
   }
@@ -184,4 +184,17 @@
   }
+
+  setLogger(logger) {
+    this.logger = logger;
+  }
+
+  reportQueryUsage(usage, queryOptions) {
+    if (this.logger) {
+      this.logger('SQL Query Usage', {
+        ...usage,
+        ...queryOptions
+      });
+    }
+  }
 }
 
 module.exports = BaseDriver;

orchestrator/PreAggregations.js

@@ -414,3 +414,10 @@ const crypto = require('crypto');
   logExecutingSql(invalidationKeys, query, params, targetTableName, newVersionEntry) {
-    this.logger('Executing Load Pre Aggregation SQL', {
+    this.logger(
+      'Executing Load Pre Aggregation SQL',
+      this.queryOptions(invalidationKeys, query, params, targetTableName, newVersionEntry)
+    );
+  }
+
+  queryOptions(invalidationKeys, query, params, targetTableName, newVersionEntry) {
+    return {
       queryKey: this.preAggregationQueryKey(invalidationKeys),
@@ -422,3 +429,3 @@ query,
       newVersionEntry,
-    });
+    };
   }
@@ -439,3 +446,4 @@
       query,
-      params
+      params,
+      this.queryOptions(invalidationKeys, query, params, targetTableName, newVersionEntry)
     ));
@@ -462,3 +470,4 @@ await this.createIndexes(client, newVersionEntry, saveCancelFn);
       query,
-      params
+      params,
+      this.queryOptions(invalidationKeys, query, params, targetTableName, newVersionEntry)
     ));
@@ -483,3 +492,7 @@ const tableData = await this.downloadTempExternalPreAggregation(client, newVersionEntry, saveCancelFn);
     });
-    const tableData = await saveCancelFn(client.downloadQueryResults(sql, params));
+    const tableData = await saveCancelFn(client.downloadQueryResults(
+      sql,
+      params,
+      this.queryOptions(invalidationKeys, sql, params, this.targetTableName(newVersionEntry), newVersionEntry)
+    ));
     await this.uploadExternalPreAggregation(tableData, newVersionEntry, saveCancelFn);
@@ -486,0 +499,0 @@ await this.loadCache.reset(this.preAggregation);

orchestrator/QueryCache.js

@@ -151,3 +151,3 @@ const crypto = require('crypto');
           });
-          return client.query(q.query, q.values);
+          return client.query(q.query, q.values, q);
         }, {
@@ -173,3 +173,3 @@ logger: this.logger,
           });
-          return client.query(q.query, q.values);
+          return client.query(q.query, q.values, q);
         },
@@ -176,0 +176,0 @@ {

package.json

@@ -5,3 +5,3 @@ {
   "author": "Statsbot, Inc.",
-  "version": "0.19.36",
+  "version": "0.19.46",
   "repository": {
@@ -32,3 +32,3 @@ "type": "git",
   "license": "Apache-2.0",
-  "gitHead": "0e16c22458d8bfb58e5376684515b6bcbb1632df"
+  "gitHead": "a074cf98f290b666f0c40e8e820193688becdd0b"
 }

No alert changes

Improved metrics

Total package byte prevSize

175530

increased by0.56%

Lines of code

2559

increased by0.91%

No dependency changes