Skip to content

Commit 53f3cbb

Browse files
committed
refactor: log hint
1 parent df14f72 commit 53f3cbb

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/greptimedb/index.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from '@grafana/data';
99

1010
import { GreptimeDataTypes } from './types';
11-
import { getColumnsByHint } from 'data/sqlGenerator';
11+
import { getColumnsByHint, logColumnHintsToAlias } from 'data/sqlGenerator';
1212
import { ColumnHint, QueryBuilderOptions } from 'types/queryBuilder';
1313
import { CHQuery } from 'types/sql';
1414

@@ -274,20 +274,14 @@ export function transformGreptimeDBLogs(sqlResponse: GreptimeResponse, query: CH
274274

275275

276276
if('builderOptions' in query) {
277-
const timeColumn = query.builderOptions?.columns?.find(c => c.hint === 'time')
278-
const timeColumnName = timeColumn?.alias || timeColumn?.name
279-
const bodyColumn = query.builderOptions?.columns?.find(c => c.hint === 'log_message')
280-
const bodyColumnName = bodyColumn?.alias || bodyColumn?.name
281-
const severityColumn = query.builderOptions?.columns?.find(c => c.hint === 'log_level')
282-
const severityColumnName = severityColumn?.alias || severityColumn?.name
283277

284278
columnSchemas.forEach((schema, index) => {
285279
const lowerCaseName = schema.name.toLowerCase();
286-
if (lowerCaseName === timeColumnName) {
280+
if (lowerCaseName === logColumnHintsToAlias.get(ColumnHint.Time)) {
287281
timestampColumnIndex = index;
288-
} else if (lowerCaseName === bodyColumnName) {
282+
} else if (lowerCaseName === logColumnHintsToAlias.get(ColumnHint.LogMessage)) {
289283
bodyColumnIndex = index;
290-
} else if (lowerCaseName === severityColumnName) {
284+
} else if (lowerCaseName === logColumnHintsToAlias.get(ColumnHint.LogLevel)) {
291285
severityColumnIndex = index;
292286
} else if (contextColumns.includes(schema.name)) {
293287
contextColumnIndices[schema.name] = index;

0 commit comments

Comments
 (0)