Skip to content

Commit b632a3c

Browse files
committed
Renaming some logs variables
1 parent 882154e commit b632a3c

5 files changed

Lines changed: 10 additions & 14 deletions

File tree

apps/webapp/app/presenters/v3/LogsListPresenter.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type ClickHouse, type LogsListV2Result } from "@internal/clickhouse";
1+
import { type ClickHouse, type LogsListResult } from "@internal/clickhouse";
22
import { MachinePresetName } from "@trigger.dev/core/v3";
33
import {
44
type PrismaClient,

apps/webapp/app/utils/pathBuilder.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,10 +436,7 @@ export function v3LogsPath(
436436
organization: OrgForPath,
437437
project: ProjectForPath,
438438
environment: EnvironmentForPath,
439-
// deployment: DeploymentForPath,
440-
// currentPage: number
441439
) {
442-
// const query = currentPage ? `?page=${currentPage}` : "";
443440
return `${v3EnvironmentPath(organization, project, environment)}/logs`;
444441
}
445442

internal-packages/clickhouse/src/client/queryBuilder.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ export class ClickhouseQueryFastBuilder<TOutput extends Record<string, any>> {
122122
/**
123123
* Add a PREWHERE clause - filters applied before reading columns.
124124
* Use for primary key columns (environment_id, start_time) to reduce I/O.
125-
* PREWHERE is evaluated before WHERE and significantly reduces data read.
126125
*/
127126
prewhere(clause: string, params?: QueryParams): this {
128127
this.prewhereClauses.push(clause);

internal-packages/clickhouse/src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import {
2222
getTraceSummaryQueryBuilderV2,
2323
insertTaskEvents,
2424
insertTaskEventsV2,
25-
getLogsListQueryBuilderV2,
26-
getLogDetailQueryBuilderV2,
25+
getLogsListQueryBuilder,
26+
getLogDetailQueryBuilder,
2727
} from "./taskEvents.js";
2828
import { Logger, type LogLevel } from "@trigger.dev/core/logger";
2929
import type { Agent as HttpAgent } from "http";
@@ -184,8 +184,8 @@ export class ClickHouse {
184184
traceSummaryQueryBuilder: getTraceSummaryQueryBuilderV2(this.reader),
185185
traceDetailedSummaryQueryBuilder: getTraceDetailedSummaryQueryBuilderV2(this.reader),
186186
spanDetailsQueryBuilder: getSpanDetailsQueryBuilderV2(this.reader),
187-
logsListQueryBuilder: getLogsListQueryBuilderV2(this.reader),
188-
logDetailQueryBuilder: getLogDetailQueryBuilderV2(this.reader),
187+
logsListQueryBuilder: getLogsListQueryBuilder(this.reader),
188+
logDetailQueryBuilder: getLogDetailQueryBuilder(this.reader),
189189
};
190190
}
191191
}

internal-packages/clickhouse/src/taskEvents.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ export function getSpanDetailsQueryBuilderV2(
235235
// Logs List Query Builders (for aggregated logs page)
236236
// ============================================================================
237237

238-
export const LogsListV2Result = z.object({
238+
export const LogsListResult = z.object({
239239
environment_id: z.string(),
240240
organization_id: z.string(),
241241
project_id: z.string(),
@@ -251,10 +251,10 @@ export const LogsListV2Result = z.object({
251251
duration: z.number().or(z.string()),
252252
});
253253

254-
export type LogsListV2Result = z.output<typeof LogsListV2Result>;
254+
export type LogsListResult = z.output<typeof LogsListResult>;
255255

256-
export function getLogsListQueryBuilderV2(ch: ClickhouseReader, settings?: ClickHouseSettings) {
257-
return ch.queryBuilderFast<LogsListV2Result>({
256+
export function getLogsListQueryBuilder(ch: ClickhouseReader, settings?: ClickHouseSettings) {
257+
return ch.queryBuilderFast<LogsListResult>({
258258
name: "getLogsList",
259259
table: "trigger_dev.task_events_v2",
260260
columns: [
@@ -302,7 +302,7 @@ export const LogDetailV2Result = z.object({
302302

303303
export type LogDetailV2Result = z.output<typeof LogDetailV2Result>;
304304

305-
export function getLogDetailQueryBuilderV2(ch: ClickhouseReader, settings?: ClickHouseSettings) {
305+
export function getLogDetailQueryBuilder(ch: ClickhouseReader, settings?: ClickHouseSettings) {
306306
return ch.queryBuilderFast<LogDetailV2Result>({
307307
name: "getLogDetail",
308308
table: "trigger_dev.task_events_v2",

0 commit comments

Comments
 (0)