fix missing results on day start

go-graphite · Aug 24, 2022 · b00e1b5 · b00e1b5
1 parent 90044bb
commit b00e1b5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/autocomplete/autocomplete.go b/autocomplete/autocomplete.go
@@ -129,7 +129,7 @@ func (h *Handler) ServeTags(w http.ResponseWriter, r *http.Request) {
 
 	queryLimit := limit + len(usedTags)
 
-	fromDate := time.Now().AddDate(0, 0, -h.config.ClickHouse.TaggedAutocompleDays)
+	fromDate := time.Now().AddDate(0, 0, -h.config.ClickHouse.TaggedAutocompleDays).UTC()
 	wr.Andf("Date >= '%s'", fromDate.Format("2006-01-02"))
 
 	sql := fmt.Sprintf("SELECT %s FROM %s %s %s GROUP BY value ORDER BY value LIMIT %d",
@@ -235,7 +235,7 @@ func (h *Handler) ServeValues(w http.ResponseWriter, r *http.Request) {
 		wr.And(where.HasPrefix("arrayJoin(Tags)", tag+"="+valuePrefix))
 	}
 
-	fromDate := time.Now().AddDate(0, 0, -h.config.ClickHouse.TaggedAutocompleDays)
+	fromDate := time.Now().AddDate(0, 0, -h.config.ClickHouse.TaggedAutocompleDays).UTC()
 	wr.Andf("Date >= '%s'", fromDate.Format("2006-01-02"))
 
 	sql := fmt.Sprintf("SELECT %s FROM %s %s %s GROUP BY value ORDER BY value LIMIT %d",

diff --git a/finder/date.go b/finder/date.go
@@ -35,8 +35,8 @@ func (b *DateFinder) Execute(ctx context.Context, query string, from int64, unti
 	dateWhere := where.New()
 	dateWhere.Andf(
 		"Date >='%s' AND Date <= '%s'",
-		time.Unix(from, 0).Format("2006-01-02"),
-		time.Unix(until, 0).Format("2006-01-02"),
+		time.Unix(from, 0).UTC().Format("2006-01-02"),
+		time.Unix(until, 0).UTC().Format("2006-01-02"),
 	)
 
 	if b.tableVersion == 2 {

diff --git a/finder/date_reverse.go b/finder/date_reverse.go
@@ -31,8 +31,8 @@ func (f *DateFinderV3) Execute(ctx context.Context, query string, from int64, un
 	dateWhere := where.New()
 	dateWhere.Andf(
 		"Date >='%s' AND Date <= '%s'",
-		time.Unix(from, 0).Format("2006-01-02"),
-		time.Unix(until, 0).Format("2006-01-02"),
+		time.Unix(from, 0).UTC().Format("2006-01-02"),
+		time.Unix(until, 0).UTC().Format("2006-01-02"),
 	)
 
 	f.body, err = clickhouse.Query(

diff --git a/finder/index.go b/finder/index.go
@@ -135,8 +135,8 @@ func (idx *IndexFinder) Execute(ctx context.Context, query string, from int64, u
 	if idx.useDaily {
 		w.Andf(
 			"Date >='%s' AND Date <= '%s'",
-			time.Unix(from, 0).Format("2006-01-02"),
-			time.Unix(until, 0).Format("2006-01-02"),
+			time.Unix(from, 0).UTC().Format("2006-01-02"),
+			time.Unix(until, 0).UTC().Format("2006-01-02"),
 		)
 	} else {
 		w.And(where.Eq("Date", DefaultTreeDate))

diff --git a/finder/tagged.go b/finder/tagged.go
@@ -380,8 +380,8 @@ func (t *TaggedFinder) ExecutePrepared(ctx context.Context, terms []TaggedTerm,
 	if t.dailyEnabled {
 		w.Andf(
 			"Date >='%s' AND Date <= '%s'",
-			time.Unix(from, 0).Format("2006-01-02"),
-			time.Unix(until, 0).Format("2006-01-02"),
+			time.Unix(from, 0).UTC().Format("2006-01-02"),
+			time.Unix(until, 0).UTC().Format("2006-01-02"),
 		)
 	}
 

diff --git a/pkg/where/where.go b/pkg/where/where.go
@@ -178,7 +178,7 @@ func InTable(field string, table string) string {
 
 func DateBetween(field string, from int64, until int64) string {
 	return fmt.Sprintf(
-		"%s >= toDate(%d) AND %s <= toDate(%d)",
+		"%s >= toDate(%d, 'UTC') AND %s <= toDate(%d, 'UTC')",
 		field, from, field, until,
 	)
 }

diff --git a/prometheus/querier.go b/prometheus/querier.go
@@ -1,3 +1,4 @@
+//go:build !noprom
 // +build !noprom
 
 package prometheus
@@ -43,7 +44,7 @@ func (q *Querier) LabelValues(label string) ([]string, storage.Warnings, error)
 	w := where.New()
 	w.And(where.HasPrefix("Tag1", label+"="))
 
-	fromDate := time.Now().AddDate(0, 0, -q.config.ClickHouse.TaggedAutocompleDays)
+	fromDate := time.Now().AddDate(0, 0, -q.config.ClickHouse.TaggedAutocompleDays).UTC()
 	w.Andf("Date >= '%s'", fromDate.Format("2006-01-02"))
 
 	sql := fmt.Sprintf("SELECT splitByChar('=', Tag1)[2] as value FROM %s %s GROUP BY value ORDER BY value",
@@ -76,7 +77,7 @@ func (q *Querier) LabelValues(label string) ([]string, storage.Warnings, error)
 // LabelNames returns all the unique label names present in the block in sorted order.
 func (q *Querier) LabelNames() ([]string, storage.Warnings, error) {
 	w := where.New()
-	fromDate := time.Now().AddDate(0, 0, -q.config.ClickHouse.TaggedAutocompleDays)
+	fromDate := time.Now().AddDate(0, 0, -q.config.ClickHouse.TaggedAutocompleDays).UTC()
 	w.Andf("Date >= '%s'", fromDate.Format("2006-01-02"))
 
 	sql := fmt.Sprintf("SELECT splitByChar('=', Tag1)[1] as value FROM %s %s GROUP BY value ORDER BY value",