Merge pull request #169 from lexx-bright/master

Felixoid · web-flow · commit c5dccb5c528e · 2021-09-24T09:56:03.000+02:00
Promethues querier. Constrain maximum timestamp.
diff --git a/prometheus/querier_select.go b/prometheus/querier_select.go
@@ -1,3 +1,4 @@
+//go:build !noprom
 // +build !noprom
 
 package prometheus
@@ -43,7 +44,8 @@ func (q *Querier) Select(selectParams *storage.SelectParams, labelsMatcher ...*l
 	if from.IsZero() && q.mint > 0 {
 		from = time.Unix(q.mint/1000, (q.mint%1000)*1000000)
 	}
-	if until.IsZero() && q.maxt > 0 {
+	// ClickHouse supported Datetime range of values: [1970-01-01 00:00:00, 2105-12-31 23:59:59]
+	if until.IsZero() && q.maxt > 0 && q.maxt <= 4291765199000 {
 		until = time.Unix(q.maxt/1000, (q.maxt%1000)*1000000)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build !noprom`
`1`	`2`	`// +build !noprom`
`2`	`3`
`3`	`4`	`package prometheus`
`@@ -43,7 +44,8 @@ func (q Querier) Select(selectParams storage.SelectParams, labelsMatcher ...*l`
`43`	`44`	`if from.IsZero() && q.mint > 0 {`
`44`	`45`	`from = time.Unix(q.mint/1000, (q.mint%1000)*1000000)`
`45`	`46`	`}`
`46`		`- if until.IsZero() && q.maxt > 0 {`
	`47`	`+ // ClickHouse supported Datetime range of values: [1970-01-01 00:00:00, 2105-12-31 23:59:59]`
	`48`	`+ if until.IsZero() && q.maxt > 0 && q.maxt <= 4291765199000 {`
`47`	`49`	`until = time.Unix(q.maxt/1000, (q.maxt%1000)*1000000)`
`48`	`50`	`}`
`49`	`51`