fix: Rewrite predicate to remove _field from schema physical operations

Fixes influxdata#19488
PhuongNQK · Sep 2, 2020 · 7f94b0d · 7f94b0d
1 parent b3138d2
commit 7f94b0d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/v1/services/storage/store.go b/v1/services/storage/store.go
@@ -231,7 +231,9 @@ func (s *Store) TagKeys(ctx context.Context, req *datatypes.TagKeysRequest) (cur
 		if found := reads.HasFieldValueKey(expr); found {
 			return nil, errors.New("field values unsupported")
 		}
-		expr = influxql.Reduce(influxql.CloneExpr(expr), nil)
+		// this will remove any _field references, which are not indexed
+		//   see https://github.com/influxdata/influxdb/issues/19488
+		expr = influxql.Reduce(RewriteExprRemoveFieldKeyAndValue(influxql.CloneExpr(expr)), nil)
 		if reads.IsTrueBooleanLiteral(expr) {
 			expr = nil
 		}
@@ -309,7 +311,9 @@ func (s *Store) TagValues(ctx context.Context, req *datatypes.TagValuesRequest)
 		if found := reads.HasFieldValueKey(expr); found {
 			return nil, errors.New("field values unsupported")
 		}
-		expr = influxql.Reduce(influxql.CloneExpr(expr), nil)
+		// this will remove any _field references, which are not indexed
+		//   see https://github.com/influxdata/influxdb/issues/19488
+		expr = influxql.Reduce(RewriteExprRemoveFieldKeyAndValue(influxql.CloneExpr(expr)), nil)
 		if reads.IsTrueBooleanLiteral(expr) {
 			expr = nil
 		}
@@ -389,7 +393,9 @@ func (s *Store) MeasurementNames(ctx context.Context, req *MeasurementNamesReque
 		if found := reads.HasFieldValueKey(expr); found {
 			return nil, errors.New("field values unsupported")
 		}
-		expr = influxql.Reduce(influxql.CloneExpr(expr), nil)
+		// this will remove any _field references, which are not indexed
+		//   see https://github.com/influxdata/influxdb/issues/19488
+		expr = influxql.Reduce(RewriteExprRemoveFieldKeyAndValue(influxql.CloneExpr(expr)), nil)
 		if reads.IsTrueBooleanLiteral(expr) {
 			expr = nil
 		}