Merge branch 'master' into 5481/log_bool_values

influxdata · Aug 24, 2020 · 33ff2fc · 33ff2fc
2 parents ada6797 + fdaf9f2
commit 33ff2fc
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 1. [#5551](https://github.com/influxdata/chronograf/pull/5551): Sort namespaces by database and retention policy.
 1. [#5556](https://github.com/influxdata/chronograf/pull/5556): Make MySQL protoboard more useful by using derivatives for counter values.
 1. [#5536](https://github.com/influxdata/chronograf/pull/5536): Add HTTP security headers.
+1. [#5553](https://github.com/influxdata/chronograf/pull/5553): Show all query results in table view.
 1. [#5555](https://github.com/influxdata/chronograf/pull/5555): Show also boolean field/tag values in tickscript editor logs.
 
 ### Other

diff --git a/ui/src/utils/groupByTimeSeriesTransform.ts b/ui/src/utils/groupByTimeSeriesTransform.ts
@@ -343,10 +343,9 @@ const constructTimeSeries = (
   serieses: Series[],
   cells: Cells,
   sortedLabels: Label[],
-  seriesLabels: Label[][]
+  seriesLabels: Label[][],
+  allowDuplicateTime = false
 ): TimeSeries[] => {
-  const nullArray: TimeSeriesValue[] = Array(sortedLabels.length).fill(null)
-
   const labelsToValueIndex = fastReduce<Label, {[x: string]: number}>(
     sortedLabels,
     (acc, {label, responseIndex, seriesIndex}, i) => {
@@ -382,23 +381,38 @@ const constructTimeSeries = (
     }
 
     existingRowIndex = tsMemo[time]
+    const valueIndex = labelsToValueIndex[label + responseIndex + seriesIndex]
 
     // avoid memoizing null time columns for meta queries
-    if (existingRowIndex === undefined || time === null) {
+    // + optionally create a duplicate entry if it would overwrite existing
+    if (
+      existingRowIndex === undefined ||
+      time === null ||
+      (allowDuplicateTime &&
+        existingRowIndex !== undefined &&
+        timeSeries[existingRowIndex].values[valueIndex] !== undefined)
+    ) {
       timeSeries.push({
         time,
-        values: fastCloneArray(nullArray),
+        values: new Array(sortedLabels.length),
       })
 
       existingRowIndex = timeSeries.length - 1
       tsMemo[time] = existingRowIndex
     }
 
-    timeSeries[existingRowIndex].values[
-      labelsToValueIndex[label + responseIndex + seriesIndex]
-    ] = value
+    timeSeries[existingRowIndex].values[valueIndex] = value
   }
 
+  // change all undefined values to null, these values were not set
+  timeSeries.forEach(x => {
+    for (let i = 0; i < x.values.length; i++) {
+      if (x.values[i] === undefined) {
+        x.values[i] = null
+      }
+    }
+  })
+
   return _.sortBy(timeSeries, 'time')
 }
 
@@ -434,7 +448,8 @@ export const groupByTimeSeriesTransform = (
     serieses,
     cells,
     sortedLabels,
-    seriesLabels
+    seriesLabels,
+    isTable
   )
   return {
     sortedLabels,

diff --git a/ui/test/utils/timeSeriesTransformers.test.ts b/ui/test/utils/timeSeriesTransformers.test.ts
@@ -971,6 +971,44 @@ describe('timeSeriesToTableGraph', () => {
     expect(actual.data).toEqual(expected)
     expect(actual.influxQLQueryType).toEqual(InfluxQLQueryType.MetaQuery)
   })
+  it('returns all table results even with duplicate time rows #5502', () => {
+    const influxResponse = [
+      {
+        response: {
+          results: [
+            {
+              statement_id: 0,
+              series: [
+                {
+                  name: 'mem',
+                  columns: ['time', 'host', 'val'],
+                  values: [
+                    [1000, 'a', 1],
+                    [1000, 'b', 2],
+                    [2000, 'b', 3],
+                    [2000, 'c', 4],
+                  ],
+                },
+              ],
+            },
+          ],
+          uuid: '8cb3862f-aacf-4c3a-990f-4479de00ff99',
+        },
+      },
+    ]
+
+    const actual = timeSeriesToTableGraph(influxResponse)
+    const expected = [
+      ['time', 'mem.host', 'mem.val'],
+      [1000, 'a', 1],
+      [1000, 'b', 2],
+      [2000, 'b', 3],
+      [2000, 'c', 4],
+    ]
+
+    expect(actual.data).toEqual(expected)
+    expect(actual.influxQLQueryType).toEqual(InfluxQLQueryType.DataQuery)
+  })
 })
 
 describe('filterTableColumns', () => {