From ae7328fbd5eb5ceef95fe4eac9b95d9aa2bef364 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Wed, 25 Nov 2020 15:14:21 -0800 Subject: [PATCH] Arrow: cast timestams to Number (#29402) --- packages/grafana-data/src/dataframe/ArrowDataFrame.ts | 1 + public/app/plugins/panel/graph/data_processor.ts | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/grafana-data/src/dataframe/ArrowDataFrame.ts b/packages/grafana-data/src/dataframe/ArrowDataFrame.ts index 29bfc35d781..03a48fa7471 100644 --- a/packages/grafana-data/src/dataframe/ArrowDataFrame.ts +++ b/packages/grafana-data/src/dataframe/ArrowDataFrame.ts @@ -68,6 +68,7 @@ export function arrowTableToDataFrame(table: Table): ArrowDataFrame { } case ArrowType.Timestamp: { type = FieldType.time; + values = new NumberColumn(col); // Cast to number break; } case ArrowType.Utf8: { diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts index d17b43dd2a0..4fff3f5aed8 100644 --- a/public/app/plugins/panel/graph/data_processor.ts +++ b/public/app/plugins/panel/graph/data_processor.ts @@ -6,7 +6,6 @@ import { Field, DataFrame, getTimeField, - dateTime, getFieldDisplayName, getColorForTheme, } from '@grafana/data'; @@ -47,7 +46,7 @@ export class DataProcessor { const datapoints = []; for (let r = 0; r < series.length; r++) { - datapoints.push([field.values.get(r), dateTime(timeField.values.get(r)).valueOf()]); + datapoints.push([field.values.get(r), timeField.values.get(r)]); } list.push(this.toTimeSeries(field, name, i, j, datapoints, list.length, range));