@mastra/clickhouse 1.26.0-alpha.5 → 1.26.0

package/dist/index.js

@@ -1587,6 +1587,7 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
 					metadataIndex++;
 				}
 			}
+			const idScope = filter?.resourceId ? `WHERE id IN (SELECT id FROM ${TABLE_THREADS} WHERE resourceId = {resourceId:String})` : "";
 			const latestThreads = `
         latest_threads AS (
           SELECT
@@ -1597,7 +1598,7 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
             toDateTime64(createdAt, 3) as createdAt,
             toDateTime64(updatedAt, 3) as updatedAt
           FROM ${TABLE_THREADS}
-          ${filter?.resourceId ? `WHERE id IN (SELECT id FROM ${TABLE_THREADS} WHERE resourceId = {resourceId:String})` : ""}
+          ${idScope}
           ORDER BY updatedAt DESC
           LIMIT 1 BY id
         )`;
@@ -2418,9 +2419,7 @@ var ObservabilityStorageClickhouse = class extends ObservabilityStorage {
 					case TraceStatus.RUNNING:
 						conditions.push(`endedAt IS NULL AND (error IS NULL OR error = '')`);
 						break;
-					case TraceStatus.SUCCESS:
-						conditions.push(`endedAt IS NOT NULL AND (error IS NULL OR error = '')`);
-						break;
+					case TraceStatus.SUCCESS: conditions.push(`endedAt IS NOT NULL AND (error IS NULL OR error = '')`);
 				}
 				if (filters.hasChildError !== void 0) {
 					const finalClause = (TABLE_ENGINES[TABLE_SPANS] ?? "MergeTree()").startsWith("ReplacingMergeTree") ? "FINAL" : "";
@@ -5261,7 +5260,8 @@ async function getFeedbackAggregate(client, args) {
 	const aggSql = getAggregationSql$2(args.aggregation);
 	const identity = buildFeedbackIdentityFilter(args);
 	const combined = mergeFilters$2(identity, buildFeedbackFilterConditions(args.filters));
-	const result = await queryJson$2(client, `SELECT ${aggSql} AS value FROM ${TABLE_FEEDBACK_EVENTS} FINAL ${toWhereClause$2(combined)}`, combined.params);
+	const whereClause = toWhereClause$2(combined);
+	const result = await queryJson$2(client, `SELECT ${aggSql} AS value FROM ${TABLE_FEEDBACK_EVENTS} FINAL ${whereClause}`, combined.params);
 	const value = result[0]?.value == null ? null : Number(result[0]?.value);
 	if (args.comparePeriod && args.filters?.timestamp) {
 		const ts = args.filters.timestamp;
@@ -5295,7 +5295,8 @@ async function getFeedbackAggregate(client, args) {
 					endExclusive: ts.endExclusive
 				}
 			}));
-			const prevResult = await queryJson$2(client, `SELECT ${aggSql} AS value FROM ${TABLE_FEEDBACK_EVENTS} FINAL ${toWhereClause$2(prevCombined)}`, prevCombined.params);
+			const prevWhereClause = toWhereClause$2(prevCombined);
+			const prevResult = await queryJson$2(client, `SELECT ${aggSql} AS value FROM ${TABLE_FEEDBACK_EVENTS} FINAL ${prevWhereClause}`, prevCombined.params);
 			const previousValue = prevResult[0]?.value == null ? null : Number(prevResult[0]?.value);
 			let changePercent = null;
 			if (previousValue !== null && previousValue !== 0 && value !== null) changePercent = (value - previousValue) / Math.abs(previousValue) * 100;
@@ -6202,8 +6203,10 @@ function buildLegacySpanSelectExprs(legacyColumnTypes) {
 	const promotedIn = PROMOTED_METADATA_KEYS.map((k) => `'${k}'`).join(", ");
 	const metadataSearchExpr = has("metadata") ? `CAST(arrayFilter(x -> x.1 NOT IN (${promotedIn}) AND trim(BOTH ' ' FROM x.2) != '', arrayMap(x -> (x.1, trim(BOTH ' ' FROM x.2)), JSONExtractKeysAndValues(COALESCE("metadata", '{}'), 'String'))), 'Map(String, String)')` : `CAST(map(), 'Map(String, String)')`;
 	let tagsExpr = "[]";
-	if (has("tags")) if (legacyColumnTypes.get("tags").includes("Array")) tagsExpr = `arrayFilter(x -> x != '', arrayDistinct(arrayMap(x -> trim(BOTH ' ' FROM x), "tags")))`;
-	else tagsExpr = `arrayFilter(x -> x != '', arrayDistinct(arrayMap(x -> trim(BOTH ' ' FROM x), JSONExtract(COALESCE("tags", '[]'), 'Array(String)'))))`;
+	if (has("tags")) {
+		if (legacyColumnTypes.get("tags").includes("Array")) tagsExpr = `arrayFilter(x -> x != '', arrayDistinct(arrayMap(x -> trim(BOTH ' ' FROM x), "tags")))`;
+		else tagsExpr = `arrayFilter(x -> x != '', arrayDistinct(arrayMap(x -> trim(BOTH ' ' FROM x), JSONExtract(COALESCE("tags", '[]'), 'Array(String)'))))`;
+	}
 	const exprs = {
 		dedupeKey: `concat("traceId", ':', "spanId")`,
 		traceId: `"traceId"`,
@@ -6450,10 +6453,11 @@ function toWhereClause(filter) {
 	return filter.conditions.length ? `WHERE ${filter.conditions.join(" AND ")}` : "";
 }
 function currentScoresRelation(sourcePredicate) {
+	const whereClause = sourcePredicate ? `WHERE ${sourcePredicate}` : "";
 	return `(
     SELECT *
     FROM ${TABLE_SCORE_EVENTS_CURRENT} FINAL
-    ${sourcePredicate ? `WHERE ${sourcePredicate}` : ""}
+    ${whereClause}
   )`;
 }
 /**
@@ -8158,7 +8162,7 @@ async function querySpans(client, plan, timeoutMs) {
 		if (remaining <= 0) throw new coreStorage.TraceQueryExecutionError();
 		return await runWithClickHouseTraceQueryTimeout(client, {
 			timeoutMs: remaining,
-			memoryLimitBytes: 512 * 1024 * 1024
+			memoryLimitBytes: 536870912
 		}, compiled);
 	};
 	const selected = (await run(compileClickHouseSpanQuery(plan))).map((row) => ({
@@ -8275,14 +8279,14 @@ function afterCursor(plan, parameters) {
 	return `(${terms.join(" OR ")})`;
 }
 const THREAD_QUERY_EXECUTION_LIMITS = {
-	memoryLimitBytes: 512 * 1024 * 1024,
+	memoryLimitBytes: 536870912,
 	maxThreads: 2,
 	maxBlockSize: 4096,
-	spillThresholdBytes: 32 * 1024 * 1024
+	spillThresholdBytes: 33554432
 };
 const MAX_CANDIDATE_THREADS = 16384;
 const MAX_CANDIDATE_TRACES = 1e5;
-const MAX_CANDIDATE_ID_BYTES = 4 * 1024 * 1024;
+const MAX_CANDIDATE_ID_BYTES = 4194304;
 const MAX_FULL_HISTORY_ROOTS = 25e4;
 function canUseThreadCandidates(probe) {
 	return Number(probe.threadCount) <= MAX_CANDIDATE_THREADS && Number(probe.traceCount) <= MAX_CANDIDATE_TRACES && Number(probe.threadBytes) + Number(probe.traceBytes) <= MAX_CANDIDATE_ID_BYTES;
@@ -8392,7 +8396,7 @@ function* batches(rows, maxRows = 256) {
 	let bytes = 0;
 	for (const row of rows) {
 		const size = Buffer.byteLength(JSON.stringify(row), "utf8") * 2;
-		if (batch.length && (batch.length >= maxRows || bytes + size > 48 * 1024)) {
+		if (batch.length && (batch.length >= maxRows || bytes + size > 49152)) {
 			yield batch;
 			batch = [];
 			bytes = 0;
@@ -9962,7 +9966,7 @@ async function detectExistingDeltaCursorStrategy(client) {
 	}
 }
 const TRACE_QUERY_DISCOVERY_DEFAULT_TIMEOUT_MS = 5e3;
-const TRACE_QUERY_DISCOVERY_DEFAULT_MEMORY_LIMIT_BYTES = 256 * 1024 * 1024;
+const TRACE_QUERY_DISCOVERY_DEFAULT_MEMORY_LIMIT_BYTES = 268435456;
 function resolveTraceQueryDiscoveryMemoryLimitBytes(memoryLimitBytes = TRACE_QUERY_DISCOVERY_DEFAULT_MEMORY_LIMIT_BYTES) {
 	if (!Number.isSafeInteger(memoryLimitBytes) || memoryLimitBytes <= 0) throw new RangeError("traceQuery.discovery.memoryLimitBytes must be a positive safe integer");
 	return memoryLimitBytes;
@@ -11355,10 +11359,12 @@ var WorkflowsStorageClickhouse = class extends WorkflowsStorage {
 				conditions.push(`JSONExtractString(snapshot, 'status') = {var_status:String}`);
 				values.var_status = status;
 			}
-			if (resourceId) if (await this.#db.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId")) {
-				conditions.push(`resourceId = {var_resourceId:String}`);
-				values.var_resourceId = resourceId;
-			} else this.logger.warn(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
+			if (resourceId) {
+				if (await this.#db.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId")) {
+					conditions.push(`resourceId = {var_resourceId:String}`);
+					values.var_resourceId = resourceId;
+				} else this.logger.warn(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
+			}
 			if (fromDate) {
 				conditions.push(`createdAt >= {var_from_date:DateTime64(3)}`);
 				values.var_from_date = fromDate.getTime() / 1e3;