@mastra/clickhouse 1.9.0-alpha.0 → 1.9.0

package/dist/index.js

@@ -2889,6 +2889,14 @@ var DELTA_MV_NAMES = [
   MV_SCORE_EVENTS_DELTA,
   MV_FEEDBACK_EVENTS_DELTA
 ];
+var DELTA_CURSOR_COUNTER_NAMES = [
+  "mastra_trace_roots_delta_cursor",
+  "mastra_trace_branches_delta_cursor",
+  "mastra_metric_events_delta_cursor",
+  "mastra_log_events_delta_cursor",
+  "mastra_score_events_delta_cursor",
+  "mastra_feedback_events_delta_cursor"
+];
 var BRANCH_SPAN_TYPE_VALUES = [
   "agent_run",
   "workflow_run",
@@ -3609,7 +3617,7 @@ CREATE TABLE IF NOT EXISTS ${TABLE_DISCOVERY_VALUES} (
   key1               String,
   value              String
 )
-ENGINE = MergeTree
+ENGINE = ReplacingMergeTree
 ORDER BY (kind, key1, value)
 `;
 var DISCOVERY_PAIRS_DDL = `
@@ -3619,7 +3627,7 @@ CREATE TABLE IF NOT EXISTS ${TABLE_DISCOVERY_PAIRS} (
   key2               String,
   value              String
 )
-ENGINE = MergeTree
+ENGINE = ReplacingMergeTree
 ORDER BY (kind, key1, key2, value)
 `;
 var SIGNAL_TABLES = [TABLE_SPAN_EVENTS, TABLE_METRIC_EVENTS, TABLE_LOG_EVENTS];
@@ -4389,7 +4397,7 @@ async function queryJson(client, query, params = {}) {
 async function getEntityTypes(client, _args) {
   const rows = await queryJson(
     client,
-    `SELECT value FROM ${TABLE_DISCOVERY_VALUES} WHERE kind = 'entityType' ORDER BY value`
+    `SELECT DISTINCT value FROM ${TABLE_DISCOVERY_VALUES} WHERE kind = 'entityType' ORDER BY value`
   );
   const validTypes = new Set(Object.values(EntityType));
   const entityTypes = [];
@@ -4409,7 +4417,7 @@ async function getEntityNames(client, args) {
   }
   const rows = await queryJson(
     client,
-    `SELECT value FROM ${TABLE_DISCOVERY_PAIRS} WHERE ${conditions.join(" AND ")} ORDER BY value`,
+    `SELECT DISTINCT value FROM ${TABLE_DISCOVERY_PAIRS} WHERE ${conditions.join(" AND ")} ORDER BY value`,
     params
   );
   return { names: rows.map((r) => r.value) };
@@ -4417,14 +4425,14 @@ async function getEntityNames(client, args) {
 async function getServiceNames(client, _args) {
   const rows = await queryJson(
     client,
-    `SELECT value FROM ${TABLE_DISCOVERY_VALUES} WHERE kind = 'serviceName' ORDER BY value`
+    `SELECT DISTINCT value FROM ${TABLE_DISCOVERY_VALUES} WHERE kind = 'serviceName' ORDER BY value`
   );
   return { serviceNames: rows.map((r) => r.value) };
 }
 async function getEnvironments(client, _args) {
   const rows = await queryJson(
     client,
-    `SELECT value FROM ${TABLE_DISCOVERY_VALUES} WHERE kind = 'environment' ORDER BY value`
+    `SELECT DISTINCT value FROM ${TABLE_DISCOVERY_VALUES} WHERE kind = 'environment' ORDER BY value`
   );
   return { environments: rows.map((r) => r.value) };
 }
@@ -4437,7 +4445,7 @@ async function getTags(client, args) {
   }
   const rows = await queryJson(
     client,
-    `SELECT value FROM ${TABLE_DISCOVERY_VALUES} WHERE ${conditions.join(" AND ")} ORDER BY value`,
+    `SELECT DISTINCT value FROM ${TABLE_DISCOVERY_VALUES} WHERE ${conditions.join(" AND ")} ORDER BY value`,
     params
   );
   return { tags: rows.map((r) => r.value) };
@@ -5717,7 +5725,7 @@ async function getMetricNames(client, args) {
   if (args.limit) params.nameLimit = args.limit;
   const rows = await queryJson3(
     client,
-    `SELECT value FROM ${TABLE_DISCOVERY_VALUES} WHERE ${conditions.join(" AND ")} ORDER BY value ${limitClause}`,
+    `SELECT DISTINCT value FROM ${TABLE_DISCOVERY_VALUES} WHERE ${conditions.join(" AND ")} ORDER BY value ${limitClause}`,
     params
   );
   return { names: rows.map((r) => r.value) };
@@ -5725,7 +5733,7 @@ async function getMetricNames(client, args) {
 async function getMetricLabelKeys(client, args) {
   const rows = await queryJson3(
     client,
-    `SELECT value FROM ${TABLE_DISCOVERY_VALUES} WHERE kind = 'metricLabelKey' AND key1 = {metricName:String} ORDER BY value`,
+    `SELECT DISTINCT value FROM ${TABLE_DISCOVERY_VALUES} WHERE kind = 'metricLabelKey' AND key1 = {metricName:String} ORDER BY value`,
     { metricName: args.metricName }
   );
   return { keys: rows.map((r) => r.value) };
@@ -5744,7 +5752,7 @@ async function getMetricLabelValues(client, args) {
   if (args.limit) params.valLimit = args.limit;
   const rows = await queryJson3(
     client,
-    `SELECT value FROM ${TABLE_DISCOVERY_PAIRS} WHERE ${conditions.join(" AND ")} ORDER BY value ${limitClause}`,
+    `SELECT DISTINCT value FROM ${TABLE_DISCOVERY_PAIRS} WHERE ${conditions.join(" AND ")} ORDER BY value ${limitClause}`,
     params
   );
   return { values: rows.map((r) => r.value) };
@@ -6979,6 +6987,30 @@ async function filterAppliedRetention(client, entries) {
     return current.column !== e.column || current.days !== e.days;
   });
 }
+async function reconcileDiscoveryTables(client) {
+  let engines;
+  try {
+    const result = await client.query({
+      query: `SELECT name, engine FROM system.tables WHERE database = currentDatabase() AND name IN ({tables:Array(String)})`,
+      query_params: { tables: [TABLE_DISCOVERY_VALUES, TABLE_DISCOVERY_PAIRS] },
+      format: "JSONEachRow"
+    });
+    const rows = await result.json();
+    engines = new Map(rows.map((r) => [r.name, r.engine]));
+  } catch {
+    return;
+  }
+  const targets = [
+    { table: TABLE_DISCOVERY_VALUES, mv: MV_DISCOVERY_VALUES },
+    { table: TABLE_DISCOVERY_PAIRS, mv: MV_DISCOVERY_PAIRS }
+  ];
+  for (const { table, mv } of targets) {
+    const engine = engines.get(table);
+    if (!engine || isReplacingMergeTreeEngine(engine)) continue;
+    await client.command({ query: `DROP VIEW IF EXISTS ${mv}` });
+    await client.command({ query: `DROP TABLE IF EXISTS ${table}` });
+  }
+}
 async function queryNamesByTable(client, query, tables) {
   const result = await client.query({
     query,
@@ -7094,6 +7126,7 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
       } else {
         this.#deltaCursorStrategy = await detectDeltaCursorStrategy(this.#client, void 0, existingStrategy);
       }
+      await reconcileDiscoveryTables(this.#client);
       const coreDdl = this.#deltaCursorStrategy === null ? [...BASE_TABLE_DDL, ...BASE_MV_DDL] : [...buildAllTableDDL(), ...buildAllMvDDL(this.#deltaCursorStrategy)];
       for (const ddl of coreDdl) {
         await this.#client.command({ query: ddl });
@@ -7108,6 +7141,15 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
           await this.#client.command({ query: entry.sql });
         }
       }
+      if (this.#deltaCursorStrategy === "serial") {
+        for (const counterName of DELTA_CURSOR_COUNTER_NAMES) {
+          await this.#client.query({
+            query: `SELECT generateSerialID({counterName:String}) AS cursorId`,
+            query_params: { counterName },
+            format: "JSONEachRow"
+          });
+        }
+      }
     } catch (error) {
       if (error instanceof MastraError) {
         throw error;