@transitive-sdk/clickhouse 0.3.1 → 0.3.3

package/index.js

@@ -26,7 +26,7 @@ const path2where = (path) => {
   _.forEach(path, (value, i) => {
     if (!['+','#'].includes(value[0])) {
       // it's a constant, filter by it
-      where.push(`((TopicParts[${i + 1}]) = '${value}')`);
+      where.push(`TopicParts[${i + 1}] = '${value}'`);
       // Note that ClickHouse/SQL index starting at 1, not 0
     }
   });
@@ -260,36 +260,26 @@ class ClickHouse {
   * @param {string} topic - MQTT topic to register
   */
   async registerMqttTopicForStorage(selector, ttlDays = DEFAULT_TTL_DAYS) {
-    this.topics[selector] = true;
-
-    // ---------------------------------------------------------------
-    // Set/update TTL for this capability and sub-topic
 
     const path = topicToPath(selector);
 
     if (path.length < 4) {
       // underspecified, don't set TTL
+      console.warn('Not registering topic as it is too short', selector);
       return;
     }
 
-    // list of TopicParts indices and selected value to use in WHERE statement
-    // const topicPartSelectors = [
-    //   [2, path[2]],
-    //   [3, path[3]]
-    // ];
+    this.topics[selector] = true;
 
-    // path.slice(5).forEach((value, i) => topicPartSelectors.push([i + 5, value]));
+    // ---------------------------------------------------------------
+    // Set/update TTL for this capability and sub-topic
 
-    // const where = topicPartSelectors
-    //     // filter out wildcards
-    //     .filter(([i, value]) => !['+','#'].includes(value[0]))
-    //     // map to WHERE conditions
-    //     .map(([i, value]) => `((TopicParts[${i + 1}]) = '${value}')`);
+    // Derive WHERE conditions for TTL expression from non-wildcards
     const where = path2where(path);
 
-
     if (where.length == 0) {
       // underspecified, don't set TTL
+      console.warn('Not setting TTL as topic is under specified', selector);
       return;
     }
 
@@ -305,19 +295,18 @@ class ClickHouse {
     const ttls = matched ? matched[1].split(',').map(x => x.trim()) : [];
 
     const whereStatement = `WHERE ${where.join(' AND ')}`;
-    let present = false;
-
-    // check if TTL statement already present on table definiton
-    ttls.forEach((ttl, i) => {
-      if (ttl.endsWith(whereStatement)) {
-        // condition already present, just replace it to update time
-        ttls[i] = newTTLStatement;
-        present = true;
-      }
-    });
-
-    if (!present) {
-      ttls.push(`toDateTime(Timestamp) + toIntervalDay(${ttlDays}) ${whereStatement}`);
+    const newTTLStatement =
+      `toDateTime(Timestamp) + toIntervalDay(${ttlDays}) ${whereStatement}`;
+
+    const currentIndex =
+      ttls.findIndex(ttl => ttl.replace(/[()]/g, '').endsWith(whereStatement));
+
+    if (currentIndex >= 0) {
+      // replace existing
+      ttls[currentIndex] = newTTLStatement;
+    } else {
+      // add new
+      ttls.push(newTTLStatement);
     }
 
     await this.client.command({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transitive-sdk/clickhouse",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "A tiny ClickHouse utility class for use in the Transitive framework.",
   "homepage": "https://transitiverobotics.com",
   "repository": {

package/test/clickhouse.test.js

@@ -193,6 +193,10 @@ describe('ClickHouse', function() {
       assert.equal(rows.length, 1);
     });
 
+    it('updates TTL without crashing', async () => {
+      await clickhouse.registerMqttTopicForStorage('/+/+/myscope/+/+/#', 13);
+      await clickhouse.registerMqttTopicForStorage('/+/+/myscope/+/+/#', 15);
+    });
   });