Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid issuing invalid metaquery in query builder

pull/11307/head
Christopher Henn 2019-01-18 15:15:02 -08:00 committed by Chris Henn
parent 8b95eb57b3
commit 083e02e4b5
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ui/src/shared/apis/v2/queryBuilder.ts
View File

@ -37,18 +37,17 @@ function findKeys(
const searchFilter = formatSearchFilterCall(searchTerm) const searchFilter = formatSearchFilterCall(searchTerm)
const previousKeyFilter = formatTagKeyFilterCall(tagsSelections) const previousKeyFilter = formatTagKeyFilterCall(tagsSelections)
const query = ` const query = `import "influxdata/influxdb/v1"
import "influxdata/influxdb/v1"
v1.tagKeys(bucket: "${bucket}", predicate: ${tagFilters}, start: -${SEARCH_DURATION})${searchFilter}${previousKeyFilter} v1.tagKeys(bucket: "${bucket}", predicate: ${tagFilters}, start: -${SEARCH_DURATION})${searchFilter}${previousKeyFilter}
|> filter(fn: (r) => |> filter(fn: (r) =>
r._value != "_time" and r._value != "_time" and
r._value != "_start" and r._value != "_start" and
r._value != "_stop" and r._value != "_stop" and
r._value != "_value") r._value != "_value")
|> distinct() |> distinct()
|> limit(n: ${LIMIT}) |> sort()
` |> limit(n: ${LIMIT})`
const {promise, cancel} = executeQuery(url, query, InfluxLanguage.Flux) const {promise, cancel} = executeQuery(url, query, InfluxLanguage.Flux)
@ -68,12 +67,11 @@ function findValues(
const tagFilters = formatTagFilterPredicate(tagsSelections) const tagFilters = formatTagFilterPredicate(tagsSelections)
const searchFilter = formatSearchFilterCall(searchTerm) const searchFilter = formatSearchFilterCall(searchTerm)
const query = ` const query = `import "influxdata/influxdb/v1"
import "influxdata/influxdb/v1"
v1.tagValues(bucket: "${bucket}", tag: "${key}", predicate: ${tagFilters}, start: -${SEARCH_DURATION})${searchFilter} v1.tagValues(bucket: "${bucket}", tag: "${key}", predicate: ${tagFilters}, start: -${SEARCH_DURATION})${searchFilter}
|> limit(n: ${LIMIT}) |> limit(n: ${LIMIT})
` |> sort()`
const {promise, cancel} = executeQuery(url, query, InfluxLanguage.Flux) const {promise, cancel} = executeQuery(url, query, InfluxLanguage.Flux)
@ -106,6 +104,26 @@ function extractCol(resp: ExecuteFluxQueryResult, colName: string): string[] {
return colValues return colValues
} }
function formatTagFilterPredicate(tagsSelections: BuilderConfig['tags']) {
const validSelections = tagsSelections.filter(
({key, values}) => key && values.length
)
if (!validSelections.length) {
return '(r) => true'
}
const calls = validSelections
.map(({key, values}) => {
const body = values.map(value => `r.${key} == "${value}"`).join(' or ')
return `(${body})`
})
.join(' and ')
return `(r) => ${calls}`
}
function formatTagKeyFilterCall(tagsSelections: BuilderConfig['tags']) { function formatTagKeyFilterCall(tagsSelections: BuilderConfig['tags']) {
const keys = tagsSelections.map(({key}) => key) const keys = tagsSelections.map(({key}) => key)
@ -232,20 +250,3 @@ export class QueryBuilderFetcher {
} }
} }
} }
function formatTagFilterPredicate(tagsSelections: BuilderConfig['tags']) {
if (!tagsSelections.length) {
return '(r) => true'
}
const calls = tagsSelections
.filter(({key, values}) => key && values.length)
.map(({key, values}) => {
const body = values.map(value => `r.${key} == "${value}"`).join(' or ')
return `(${body})`
})
.join(' and ')
return `(r) => ${calls}`
}