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

Merge pull request #13656 from zhulongcheng/fix-document-panic 

fix document service panic
pull/13677/head
Jade McGough 2019-04-26 12:30:27 -07:00 committed by GitHub
parent 070e9043a5 f7635f0552
commit 6438999508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
http/document_service.go
View File

@ -205,8 +205,7 @@ func (h *DocumentHandler) handleGetDocuments(w http.ResponseWriter, r *http.Requ
return
}
var opt func(influxdb.DocumentIndex, influxdb.DocumentDecorator) ([]influxdb.ID, error)
opts := []influxdb.DocumentFindOptions{influxdb.IncludeLabels}
if req.Org != "" && req.OrgID != nil {
EncodeError(ctx, &influxdb.Error{
Code: influxdb.EInvalid,
@ -214,12 +213,14 @@ func (h *DocumentHandler) handleGetDocuments(w http.ResponseWriter, r *http.Requ
}, w)
return
} else if req.OrgID != nil && req.OrgID.Valid() {
opt = influxdb.AuthorizedWhereOrgID(a, *req.OrgID)
opt := influxdb.AuthorizedWhereOrgID(a, *req.OrgID)
opts = append(opts, opt)
} else if req.Org != "" {
opt = influxdb.AuthorizedWhereOrg(a, req.Org)
opt := influxdb.AuthorizedWhereOrg(a, req.Org)
opts = append(opts, opt)
}
ds, err := s.FindDocuments(ctx, opt, influxdb.IncludeLabels)
ds, err := s.FindDocuments(ctx, opts...)
if err != nil {
EncodeError(ctx, err, w)
return