@transitive-sdk/clickhouse 0.4.1 → 0.4.3

package/index.js

@@ -415,7 +415,12 @@ class ClickHouse {
       // SQL sub-string to extract the desired value from the JSON payload
       // const wildParts = wildIndices.map(i => `TopicParts[${i + 1}]`);
       // update SELECT statement with aggregations
-      select = [`${agg}(${extractValue}) as aggValue`,
+
+      select = [
+        // Cast `count` result to Float64 to avoid UInt64 which ClickHouse turns
+        // into a string in JSON.
+        agg == 'count' ? `CAST(${agg}(${extractValue}), 'Float64') as aggValue`
+        : `${agg}(${extractValue}) as aggValue`,
         // ...wildParts,
         'TopicParts',
         `toStartOfInterval(Timestamp, INTERVAL ${aggSeconds} SECOND) as time`
@@ -428,14 +433,13 @@ class ClickHouse {
       whereStatement} ${group} ORDER BY ${orderBy} ${limit ? ` LIMIT ${limit}` : ''}`;
     // console.log(query);
     const result = await this.client.query({ query, format: 'JSONEachRow' });
-
     const rows = await result.json();
 
     // map payloads back from JSON; this is the inverse of what we do in
     // registerMqttTopicForStorage
     return rows.map(row => {
       row.Payload = row.Payload ? JSON.parse(row.Payload) : null;
-      row.Timestamp = new Date(row.Timestamp);
+      row.Timestamp = new Date(`${row.time}Z`);
       row.OrgId = row.TopicParts[0];
       row.DeviceId = row.TopicParts[1];
       row.Scope = row.TopicParts[2];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transitive-sdk/clickhouse",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "A tiny ClickHouse utility class for use in the Transitive framework.",
   "homepage": "https://transitiverobotics.com",
   "repository": {
@@ -24,7 +24,7 @@
     "test": "node --test --watch"
   },
   "dependencies": {
-    "@clickhouse/client": "^1.12.1",
+    "@clickhouse/client": "^1.16.0",
     "@transitive-sdk/datacache": "^0.14.1",
     "wait-port": "^1.1.0"
   },

package/test/clickhouse.test.js

@@ -443,6 +443,7 @@ describe('ClickHouse', function() {
         limit: 2 * ROWS,
       });
       // there can be one-off errors due to rounding down to start of interval:
+      assert.strictEqual(typeof rows[0].aggValue, 'number');
       assert(Math.abs(rows.length - 60) < 2);
       assertTimelimit(ROWS / 10000);
     });
@@ -470,6 +471,8 @@ describe('ClickHouse', function() {
         agg: 'avg',
         limit: 2 * ROWS,
       });
+      console.log(rows[0]);
+      assert.strictEqual(typeof rows[0].aggValue, 'number');
       assert.equal(rows.length, 10000);
       assertTimelimit(ROWS / 1000);
     });