@mastra/pg 1.32.0-alpha.3 → 1.32.0-alpha.5

package/dist/index.js

@@ -19187,7 +19187,26 @@ async function getScorePercentiles(client, schema, args) {
 const TRACE_STATUS_SQL = `CASE WHEN r."error" IS NOT NULL THEN 'error' ELSE 'success' END`;
 /** Core versions without the field reject it in strict query results, so it is only returned when core knows it. */
 const timeToFirstChunkSupported = "timeToFirstChunkMs" in coreStorage.TRACE_QUERY_FIELD_REGISTRY.trace;
-const timeToFirstChunkFeatures = timeToFirstChunkSupported ? ["trace-query-time-to-first-chunk"] : [];
+/** Core before the sort rejects `orderBy` on the field, so the sort is only declared when core plans it. */
+const timeToFirstChunkSortSupported = coreStorage.TRACE_QUERY_ORDER_FIELDS?.includes("timeToFirstChunkMs") === true;
+const timeToFirstChunkFeatures = [...timeToFirstChunkSupported ? ["trace-query-time-to-first-chunk"] : [], ...timeToFirstChunkSortSupported ? ["trace-query-time-to-first-chunk-sort"] : []];
+/**
+* Keyset bounds for a cursor's sort value: terms for rows strictly past it in `direction`, and the
+* condition for rows level with it. Empty values sort last in both directions, so they are past
+* every value and level only with each other.
+*/
+function keysetSortBounds(field, direction, sortValue, values) {
+	if (sortValue === null) return {
+		past: [],
+		level: `${field} IS NULL`
+	};
+	values.push(sortValue);
+	const parameter = `$${values.length}::${typeof sortValue === "number" ? "float8" : "timestamptz"}`;
+	return {
+		past: [`${field} ${direction === "asc" ? ">" : "<"} ${parameter}`, `${field} IS NULL`],
+		level: `${field} = ${parameter}`
+	};
+}
 function durationMsSql(startedAt, endedAt) {
 	return `EXTRACT(EPOCH FROM (${endedAt} - ${startedAt}))::numeric * 1000`;
 }
@@ -19203,6 +19222,7 @@ const TRACE_FIELDS = {
 	endedAt: "r.\"endedAt\"",
 	durationMs: durationMsSql("r.\"startedAt\"", "r.\"endedAt\""),
 	timeToFirstChunkMs: "r.\"timeToFirstChunkMs\"",
+	entityId: "r.\"entityId\"",
 	entityName: "r.\"entityName\"",
 	entityType: "r.\"entityType\"",
 	name: "r.\"name\"",
@@ -19504,6 +19524,7 @@ const ROOT_PUSHDOWN_FIELDS = /* @__PURE__ */ new Set([
 	"organizationId",
 	"startedAt",
 	"endedAt",
+	"entityId",
 	"entityName",
 	"entityType",
 	"name",
@@ -19779,8 +19800,8 @@ LIMIT $${values.length}`,
 			values
 		};
 	}
-	const orderField = plan.orderBy.field === "startedAt" ? "\"startedAt\"" : "\"endedAt\"";
-	const direction = plan.orderBy.direction === "asc" ? "ASC" : "DESC";
+	const orderField = `"${plan.orderBy.field}"`;
+	const direction = `${plan.orderBy.direction === "asc" ? "ASC" : "DESC"} NULLS LAST`;
 	if (plan.paginationMode === "page") {
 		values.push(plan.perPage, plan.page * plan.perPage);
 		return {
@@ -19794,10 +19815,9 @@ LIMIT $${values.length - 1} OFFSET $${values.length}`,
 	}
 	let pageCondition = "";
 	if (plan.cursor) {
-		const comparison = plan.orderBy.direction === "asc" ? ">" : "<";
-		const sortParameter = `$${values.length + 1}`;
-		pageCondition = `WHERE (${orderField} ${comparison} ${sortParameter} OR (${orderField} = ${sortParameter} AND "traceId" > ${`$${values.length + 2}`}))`;
-		values.push(plan.cursor.sortValue, plan.cursor.traceId);
+		const { past, level } = keysetSortBounds(orderField, plan.orderBy.direction, plan.cursor.sortValue, values);
+		values.push(plan.cursor.traceId);
+		pageCondition = `WHERE (${[...past, `(${level} AND "traceId" > $${values.length})`].join(" OR ")})`;
 	}
 	values.push(plan.limit + 1);
 	return {
@@ -20130,7 +20150,7 @@ async function queryTraces(client, schema, plan, timeoutMs) {
 		traces,
 		page: { next: rows.length > plan.limit && last ? coreStorage.encodeTraceQueryCursor(plan, {
 			result: "traces",
-			sortValue: last[plan.orderBy.field],
+			sortValue: last[plan.orderBy.field] ?? null,
 			traceId: last.traceId
 		}) : null }
 	});
@@ -20202,11 +20222,8 @@ function selectedKeys(rows, values) {
 function afterCursor(plan, values) {
 	if (!plan.cursor) return "TRUE";
 	const cursor = plan.cursor;
-	values.push(cursor.sortValue);
-	const timestamp = `$${values.length}::timestamptz`;
-	const field = `s."${plan.orderBy.field}"`;
-	const terms = [`${field} ${plan.orderBy.direction === "asc" ? ">" : "<"} ${timestamp}`];
-	const equal = [`${field} = ${timestamp}`];
+	const { past: terms, level } = keysetSortBounds(`s."${plan.orderBy.field}"`, plan.orderBy.direction, cursor.sortValue, values);
+	const equal = [level];
 	for (const key of identityFields) {
 		const ref = `s."${key}" COLLATE "C"`;
 		const value = cursor[key];
@@ -20272,7 +20289,7 @@ function compilePostgresSpanQuery(schema, plan) {
 			"version"
 		].map((field) => `s."${field}"`).join(", ")}
   FROM candidates s WHERE s."startedAt" >= $1 AND s."startedAt" < $2 AND (${predicate.sql}) AND ${after}
-  ORDER BY s."${plan.orderBy.field}" ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"}, ${identityOrder}
+  ORDER BY s."${plan.orderBy.field}" ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"} NULLS LAST, ${identityOrder}
   LIMIT $${values.length}`,
 		values
 	};
@@ -20593,6 +20610,7 @@ const DIMENSION_SQL = {
 	entityName: "r.\"entityName\"",
 	name: "r.\"name\"",
 	spanType: "r.\"spanType\"",
+	entityId: "r.\"entityId\"",
 	environment: "r.\"environment\"",
 	status: TRACE_STATUS_SQL,
 	serviceName: "r.\"serviceName\"",
@@ -21827,7 +21845,8 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"feedback",
 			"trace-query-context-ids",
 			...timeToFirstChunkFeatures,
-			"trace-query-root-span-fields"
+			"trace-query-root-span-fields",
+			"trace-query-root-entity-id"
 		];
 		return [
 			"metrics",
@@ -21850,7 +21869,8 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"feedback",
 			"trace-query-context-ids",
 			...timeToFirstChunkFeatures,
-			"trace-query-root-span-fields"
+			"trace-query-root-span-fields",
+			"trace-query-root-entity-id"
 		];
 	}
 	async #run(op, fn, details) {