Skip to content

Commit

Permalink
fix: detect misquoted tag values and return an error (#22754) (#22785)
Browse files Browse the repository at this point in the history
SHOW TAG KEYS FROM "foo" where bar="misquoted" is
erroneous, because the tag value must be enclosed
in single, not double, quotes. Although this
correctly returns no tag keys, it is very
inefficient and has cause out-of-memory failures
at a customer. This fix short-circuits the query.

closes #22755

(cherry picked from commit af9e89a)

closes #22757
  • Loading branch information
davidby-influx authored Oct 28, 2021
1 parent 8825cd5 commit 88afa92
Showing 1 changed file with 31 additions and 1 deletion.
32 changes: 31 additions & 1 deletion tsdb/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -1546,6 +1546,9 @@ func (s *Store) TagKeys(ctx context.Context, auth query.Authorizer, shardIDs []u
if err != nil {
return nil, err
}
if err = isBadQuoteTagValueClause(filterExpr); err != nil {
return nil, err
}

// Get all the shards we're interested in.
is := IndexSet{Indexes: make([]Index, 0, len(shardIDs))}
Expand Down Expand Up @@ -1714,6 +1717,31 @@ func isTagKeyClause(e influxql.Expr) (bool, error) {
return false, nil
}

func isBadQuoteTagValueClause(e influxql.Expr) error {
switch e := e.(type) {
case *influxql.BinaryExpr:
switch e.Op {
case influxql.EQ, influxql.NEQ:
_, lOk := e.LHS.(*influxql.VarRef)
_, rOk := e.RHS.(*influxql.VarRef)
if lOk && rOk {
return fmt.Errorf("bad WHERE clause for metaquery; one term must be a string literal tag value within single quotes: %s", e.String())
}
case influxql.OR, influxql.AND:
if err := isBadQuoteTagValueClause(e.LHS); err != nil {
return err
} else if err = isBadQuoteTagValueClause(e.RHS); err != nil {
return err
} else {
return nil
}
}
case *influxql.ParenExpr:
return isBadQuoteTagValueClause(e.Expr)
}
return nil
}

// TagValues returns the tag keys and values for the provided shards, where the
// tag values satisfy the provided condition.
func (s *Store) TagValues(ctx context.Context, auth query.Authorizer, shardIDs []uint64, cond influxql.Expr) ([]TagValues, error) {
Expand Down Expand Up @@ -1748,7 +1776,9 @@ func (s *Store) TagValues(ctx context.Context, auth query.Authorizer, shardIDs [
if err != nil {
return nil, err
}

if err = isBadQuoteTagValueClause(filterExpr); err != nil {
return nil, err
}
// Build index set to work on.
is := IndexSet{Indexes: make([]Index, 0, len(shardIDs))}
s.mu.RLock()
Expand Down

0 comments on commit 88afa92

Please sign in to comment.