Skip to content

Commit e97f051

Browse files
fix: Changes hisStart filter to his
nHaystack doesn't include hisStart/End tags. Also adds in a no-point error case.
1 parent ac77ab6 commit e97f051

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

pkg/plugin/datasource.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,20 @@ func (datasource *Datasource) query(ctx context.Context, pCtx backend.PluginCont
176176
return response
177177

178178
case "hisReadFilter":
179-
pointsGrid, readErr := datasource.read(model.HisReadFilter+" and hisStart", variables)
179+
pointsGrid, readErr := datasource.read(model.HisReadFilter+" and his", variables)
180180
if readErr != nil {
181181
log.DefaultLogger.Error(readErr.Error())
182182
return backend.ErrDataResponse(backend.StatusBadRequest, fmt.Sprintf("HisReadFilter failure: %v", readErr.Error()))
183183
}
184184
points := pointsGrid.Rows()
185-
recLimit := 300
186-
if len(points) > recLimit {
187-
errMsg := fmt.Sprintf("Query exceeded record limit of %d: %d records", recLimit, len(points))
185+
pointMax := 300
186+
if len(points) == 0 {
187+
errMsg := fmt.Sprintf("Query returned no historized records")
188+
log.DefaultLogger.Error(errMsg)
189+
return backend.ErrDataResponse(backend.StatusBadRequest, errMsg)
190+
}
191+
if len(points) > pointMax {
192+
errMsg := fmt.Sprintf("Query exceeded record limit of %d: %d records", pointMax, len(points))
188193
log.DefaultLogger.Error(errMsg)
189194
return backend.ErrDataResponse(backend.StatusBadRequest, errMsg)
190195
}

0 commit comments

Comments
 (0)