@mastra/clickhouse 1.20.1 → 1.21.0-alpha.0

package/dist/index.js

@@ -6790,9 +6790,20 @@ function compileThreadPredicate(predicate, parameters) {
 	if (predicate.type === "boolean") return predicate.args.map((arg) => `(${compileThreadPredicate(arg, parameters)})`).join(predicate.operator === "and" ? " AND " : " OR ");
 	return `NOT (${compileThreadPredicate(predicate.arg, parameters)})`;
 }
-function compileClickHouseTraceScope(selection, relationCollections, parameters) {
+/**
+* Tenant conditions ANDed into every root and related-signal scan. Columns are
+* `Nullable(String)`, so rows without a tenant never match a scope.
+*/
+function compileTenantScope(scope, parameters) {
+	if (!scope) return "";
+	let sql = `\n      AND organizationId = ${parameters.add(scope.organizationId, "String")}`;
+	if (scope.resourceId !== void 0) sql += `\n      AND resourceId = ${parameters.add(scope.resourceId, "String")}`;
+	return sql;
+}
+function compileClickHouseTraceScope(selection, relationCollections, parameters, scope) {
 	const from = parameters.add(selection.timeRange.from, "DateTime64(3, 'UTC')");
 	const to = parameters.add(selection.timeRange.to, "DateTime64(3, 'UTC')");
+	const tenant = compileTenantScope(scope, parameters);
 	const ctes = [`current_roots AS (
     SELECT * FROM (
       SELECT *
@@ -6806,7 +6817,7 @@ function compileClickHouseTraceScope(selection, relationCollections, parameters)
     SELECT *
     FROM current_roots
     WHERE startedAt >= ${from}
-      AND startedAt < ${to}
+      AND startedAt < ${to}${tenant}
   )`];
 	if (relationCollections.has("spans")) ctes.push(`current_spans AS (
     SELECT
@@ -6828,7 +6839,7 @@ function compileClickHouseTraceScope(selection, relationCollections, parameters)
       rootEntityVersionId
     FROM ${TABLE_SPAN_EVENTS}
     WHERE isNotNull(traceId)
-      AND traceId IN (SELECT traceId FROM root_scope)
+      AND traceId IN (SELECT traceId FROM root_scope)${tenant}
     ORDER BY dedupeKey
     LIMIT 1 BY dedupeKey
   )`);
@@ -6846,7 +6857,7 @@ function compileClickHouseTraceScope(selection, relationCollections, parameters)
       rootEntityVersionId
     FROM ${currentScoresRelation()} AS current
     WHERE isNotNull(current.traceId)
-      AND current.traceId IN (SELECT traceId FROM root_scope)
+      AND current.traceId IN (SELECT traceId FROM root_scope)${tenant}
   )`);
 	if (relationCollections.has("feedback")) ctes.push(`current_feedback AS (
     SELECT
@@ -6869,7 +6880,7 @@ function compileClickHouseTraceScope(selection, relationCollections, parameters)
       LIMIT 1 BY feedbackId
     ) AS current
     WHERE isNotNull(traceId)
-      AND traceId IN (SELECT traceId FROM root_scope)
+      AND traceId IN (SELECT traceId FROM root_scope)${tenant}
   )`);
 	return ctes;
 }
@@ -6886,7 +6897,7 @@ function parseDeltaWatermark(value) {
 }
 function compileClickHouseTraceQuery(plan, deltaHead) {
 	const parameters = new ParameterBuilder();
-	const ctes = compileClickHouseTraceScope(plan, collectRelationCollections(plan.where), parameters);
+	const ctes = compileClickHouseTraceScope(plan, collectRelationCollections(plan.where), parameters, plan.scope);
 	const predicate = plan.where ? compilePredicate(plan.where, parameters) : "1";
 	ctes.push(`candidates AS (
     SELECT ${TRACE_SELECT}
@@ -6989,7 +7000,7 @@ function compileClickHouseThreadQuery(plan) {
 	const parameters = new ParameterBuilder();
 	const relationCollections = collectRelationCollections(plan.traces.where);
 	collectThreadRelationCollections(plan.where, relationCollections);
-	const ctes = compileClickHouseTraceScope(plan.traces, relationCollections, parameters);
+	const ctes = compileClickHouseTraceScope(plan.traces, relationCollections, parameters, plan.scope);
 	const eligibility = plan.traces.where ? compilePredicate(plan.traces.where, parameters) : "1";
 	ctes.push(`eligible_roots AS (
     SELECT *
@@ -7037,7 +7048,7 @@ function discoveryCollections(scope) {
 }
 function compileClickHouseTraceQueryObservedFields(plan) {
 	const parameters = new ParameterBuilder();
-	const ctes = compileClickHouseTraceScope(plan, /* @__PURE__ */ new Set(), parameters);
+	const ctes = compileClickHouseTraceScope(plan, /* @__PURE__ */ new Set(), parameters, plan.scope);
 	const search = plan.search ? `AND positionCaseInsensitiveUTF8(concat('metadata.', key), ${parameters.add(plan.search, "String")}) > 0` : "";
 	const limit = parameters.add(plan.limit + 1, "UInt64");
 	ctes.push(`metadata_entries AS (
@@ -7067,7 +7078,7 @@ LIMIT ${limit}`,
 }
 function compileClickHouseTraceQueryValues(plan) {
 	const parameters = new ParameterBuilder();
-	const ctes = compileClickHouseTraceScope(plan, discoveryCollections(plan.predicateScope), parameters);
+	const ctes = compileClickHouseTraceScope(plan, discoveryCollections(plan.predicateScope), parameters, plan.scope);
 	let field;
 	if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
 		const key = parameters.add(plan.path.slice(9), "String");
@@ -8522,7 +8533,8 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
 			"logs",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 		return [
 			"metrics",
@@ -8530,7 +8542,8 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
 			"delta-polling",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 	}
 	async createSpan(args) {