Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: strip double quotes from measurement names in v2/delete (#25407) #25477

Open
wants to merge 1 commit into
base: 1.11
Choose a base branch
from
Open

fix: strip double quotes from measurement names in v2/delete (#25407) #25477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/httpd/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ func (h *Handler) serveDeleteV2(w http.ResponseWriter, r *http.Request, user met
case influxql.EQ:
tag, ok := e.LHS.(*influxql.VarRef)
if ok && tag.Val == measurement {
srcs = append(srcs, &influxql.Measurement{Name: e.RHS.String()})
srcs = append(srcs, &influxql.Measurement{Name: strings.Trim(e.RHS.String(), `"`)})
return true, nil
}
// Not permitted in V2 API DELETE predicates
Expand Down
29 changes: 27 additions & 2 deletions services/httpd/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,6 +1715,7 @@ func TestHandler_Write_V2_Precision(t *testing.T) {
}

func TestHandler_Delete_V2(t *testing.T) {
var errUnexpectedMeasurement = errors.New("unexpected measurement")
type test struct {
url string
body httpd.DeleteBody
Expand Down Expand Up @@ -1742,7 +1743,7 @@ func TestHandler_Delete_V2(t *testing.T) {
},
&test{
url: "/api/v2/delete?org=bar&bucket=mydb/myrp",
body: httpd.DeleteBody{Stop: "2022-03-23T20:56:06Z", Start: "2022-03-23T22:56:06Z", Predicate: "_measurement='baz' AND t1=tagOne"},
body: httpd.DeleteBody{Stop: "2022-03-23T20:56:06Z", Start: "2022-03-23T22:56:06Z", Predicate: "_measurement=\"mymeasure\" AND t1=tagOne"},
status: http.StatusOK,
errMsg: ``,
},
Expand Down Expand Up @@ -1782,11 +1783,28 @@ func TestHandler_Delete_V2(t *testing.T) {
body: httpd.DeleteBody{Stop: "2022-03-23T20:56:06Z", Start: "2022-03-23T18:56:06Z", Predicate: `_measurement = "mymeasure" AND "tag0" = "value1"`},
status: http.StatusOK,
},
&test{
url: "/api/v2/delete?org=bar&bucket=mydb/myrp",
body: httpd.DeleteBody{Stop: "2022-03-23T20:56:06Z", Start: "2022-03-23T18:56:06Z", Predicate: `_measurement = mymeasure AND "tag0" = "value1"`},
status: http.StatusOK,
},
&test{
url: "/api/v2/delete?org=bar&bucket=mydb/myrp",
body: httpd.DeleteBody{Stop: "2022-03-23T20:56:06Z", Start: "2022-03-23T18:56:06Z", Predicate: `_measurement = "mymeasure" AND "tag0" = "value1" AND tag1 = value3`},
status: http.StatusOK,
},
&test{
url: "/api/v2/delete?org=bar&bucket=mydb/myrp",
body: httpd.DeleteBody{Stop: "2022-03-23T20:56:06Z", Start: "2022-03-23T18:56:06Z", Predicate: `_measurement = "bad_measurement" AND "tag0" = "value1" AND tag1 = value3`},
status: http.StatusBadRequest,
errMsg: "delete - database: \"mydb\", retention policy: \"myrp\", start: \"2022-03-23T18:56:06Z\", stop: \"2022-03-23T20:56:06Z\", predicate: \"_measurement = \\\"bad_measurement\\\" AND \\\"tag0\\\" = \\\"value1\\\" AND tag1 = value3\", error: unexpected measurement",
},
&test{
url: "/api/v2/delete?org=bar&bucket=mydb/myrp",
body: httpd.DeleteBody{Stop: "2022-03-23T20:56:06Z", Start: "2022-03-23T18:56:06Z", Predicate: `_measurement = bad_measurement AND "tag0" = "value1" AND tag1 = value3`},
status: http.StatusBadRequest,
errMsg: "delete - database: \"mydb\", retention policy: \"myrp\", start: \"2022-03-23T18:56:06Z\", stop: \"2022-03-23T20:56:06Z\", predicate: \"_measurement = bad_measurement AND \\\"tag0\\\" = \\\"value1\\\" AND tag1 = value3\", error: unexpected measurement",
},
&test{
url: "/api/v2/delete?org=bar&bucket=mydb/myrp",
body: httpd.DeleteBody{Stop: "2022-03-23T20:56:06Z", Start: "2022-03-23T18:56:06Z", Predicate: `_measurement = "mymeasure" AND "tag0" != "value1" AND tag1 = value3`},
Expand All @@ -1796,7 +1814,14 @@ func TestHandler_Delete_V2(t *testing.T) {
}

h := NewHandler(false)
h.Store.DeleteFn = func(database string, sources []influxql.Source, condition influxql.Expr) error { return nil }
h.Store.DeleteFn = func(database string, sources []influxql.Source, condition influxql.Expr) error {
if len(sources) > 0 {
if m, ok := sources[0].(*influxql.Measurement); ok && m.Name != "mymeasure" {
return errUnexpectedMeasurement
}
}
return nil
}
h.MetaClient = &internal.MetaClientMock{
DatabaseFn: func(name string) *meta.DatabaseInfo {
if name == "mydb" {
Expand Down