From 66b2db7f70ac2f786e3ffac2d968981c9146e217 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 12 Dec 2019 16:24:04 +0800 Subject: [PATCH] add one more condition for query to limit the end of date field --- reader.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reader.go b/reader.go index 2715132..c418e96 100644 --- a/reader.go +++ b/reader.go @@ -20,7 +20,7 @@ type p2cReader struct { func (r *p2cReader) getTimePeriod(query *remote.Query) (string, string, error) { var tselSQL = "SELECT COUNT() AS CNT, (intDiv(toUInt32(ts), %d) * %d) * 1000 as t" - var twhereSQL = "WHERE date >= toDate(%d) AND ts >= toDateTime(%d) AND ts <= toDateTime(%d)" + var twhereSQL = "WHERE date >= toDate(%d) AND ts >= toDateTime(%d) AND ts <= toDateTime(%d) AND date <= toDate(%d)" var err error tstart := query.StartTimestampMs / 1000 tend := query.EndTimestampMs / 1000 @@ -45,7 +45,7 @@ func (r *p2cReader) getTimePeriod(query *remote.Query) (string, string, error) { } selectSQL := fmt.Sprintf(tselSQL, taggr, taggr) - whereSQL := fmt.Sprintf(twhereSQL, tstart, tstart, tend) + whereSQL := fmt.Sprintf(twhereSQL, tstart, tstart, tend, tend) return selectSQL, whereSQL, nil }