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

Merge pull request #9434 from influxdata/er-card-nodb 

Ensure db specified for SHOW CARDINALITY
pull/9439/head
Edd Robinson 2018-02-13 14:15:30 +00:00 committed by GitHub
parent 0b905c059f 5a8f0202fb
commit 56b4a91acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coordinator/statement_executor.go
View File

@ -779,6 +779,10 @@ func (e *StatementExecutor) executeShowMeasurementsStatement(q *influxql.ShowMea
}
func (e *StatementExecutor) executeShowMeasurementCardinalityStatement(stmt *influxql.ShowMeasurementCardinalityStatement) (models.Rows, error) {
if stmt.Database == "" {
return nil, ErrDatabaseNameRequired
}
n, err := e.TSDBStore.MeasurementsCardinality(stmt.Database)
if err != nil {
return nil, err
@ -846,6 +850,10 @@ func (e *StatementExecutor) executeShowShardsStatement(stmt *influxql.ShowShards
}
func (e *StatementExecutor) executeShowSeriesCardinalityStatement(stmt *influxql.ShowSeriesCardinalityStatement) (models.Rows, error) {
if stmt.Database == "" {
return nil, ErrDatabaseNameRequired
}
n, err := e.TSDBStore.SeriesCardinality(stmt.Database)
if err != nil {
return nil, err