@@ -3,6 +3,7 @@ package queryrange
33import (
44 "context"
55 "fmt"
6+ querier_stats "github.com/cortexproject/cortex/pkg/querier/stats"
67 "net/http"
78 "strconv"
89 "testing"
@@ -173,6 +174,7 @@ func mkAPIResponseWithStats(start, end, step int64, withStats bool, oldFormat bo
173174 })
174175
175176 stats .Samples .TotalQueryableSamples += i
177+ stats .Samples .PeakSamples = max (stats .Samples .PeakSamples , i )
176178 }
177179 }
178180
@@ -597,11 +599,13 @@ func TestShouldCache(t *testing.T) {
597599func TestPartition (t * testing.T ) {
598600 t .Parallel ()
599601 for _ , tc := range []struct {
600- name string
601- input tripperware.Request
602- prevCachedResponse []tripperware.Extent
603- expectedRequests []tripperware.Request
604- expectedCachedResponse []tripperware.Response
602+ name string
603+ input tripperware.Request
604+ prevCachedResponse []tripperware.Extent
605+ expectedRequests []tripperware.Request
606+ expectedCachedResponse []tripperware.Response
607+ expectedScannedSamplesFromCachedResponse uint64
608+ expectedPeakSamplesFromCachedResponse uint64
605609 }{
606610 {
607611 name : "Test a complete hit." ,
@@ -822,6 +826,8 @@ func TestPartition(t *testing.T) {
822826 expectedCachedResponse : []tripperware.Response {
823827 mkAPIResponseWithStats (0 , 100 , 10 , true , false ),
824828 },
829+ expectedPeakSamplesFromCachedResponse : getPeakSamples (0 , 100 , 10 ),
830+ expectedScannedSamplesFromCachedResponse : getScannedSamples (0 , 100 , 10 ),
825831 },
826832
827833 {
@@ -836,6 +842,8 @@ func TestPartition(t *testing.T) {
836842 expectedCachedResponse : []tripperware.Response {
837843 mkAPIResponseWithStats (0 , 100 , 10 , true , false ),
838844 },
845+ expectedPeakSamplesFromCachedResponse : getPeakSamples (0 , 100 , 10 ),
846+ expectedScannedSamplesFromCachedResponse : getScannedSamples (0 , 100 , 10 ),
839847 },
840848
841849 {
@@ -886,6 +894,8 @@ func TestPartition(t *testing.T) {
886894 expectedCachedResponse : []tripperware.Response {
887895 mkAPIResponseWithStats (50 , 100 , 10 , true , false ),
888896 },
897+ expectedPeakSamplesFromCachedResponse : getPeakSamples (50 , 100 , 10 ),
898+ expectedScannedSamplesFromCachedResponse : getScannedSamples (50 , 100 , 10 ),
889899 },
890900 {
891901 name : "[stats] Test multiple partial hits." ,
@@ -907,6 +917,8 @@ func TestPartition(t *testing.T) {
907917 mkAPIResponseWithStats (100 , 120 , 10 , true , false ),
908918 mkAPIResponseWithStats (160 , 200 , 10 , true , false ),
909919 },
920+ expectedPeakSamplesFromCachedResponse : max (getPeakSamples (100 , 120 , 10 ), getPeakSamples (160 , 200 , 10 )),
921+ expectedScannedSamplesFromCachedResponse : getScannedSamples (100 , 120 , 10 ) + getScannedSamples (160 , 200 , 10 ),
910922 },
911923 {
912924 name : "[stats] Partial hits with tiny gap." ,
@@ -927,7 +939,8 @@ func TestPartition(t *testing.T) {
927939 expectedCachedResponse : []tripperware.Response {
928940 mkAPIResponseWithStats (100 , 120 , 10 , true , false ),
929941 },
930- },
942+ expectedPeakSamplesFromCachedResponse : getPeakSamples (100 , 120 , 10 ),
943+ expectedScannedSamplesFromCachedResponse : getScannedSamples (100 , 120 , 10 )},
931944 {
932945 name : "[stats] Extent is outside the range and the request has a single step (same start and end)." ,
933946 input : & tripperware.PrometheusRequest {
@@ -957,6 +970,8 @@ func TestPartition(t *testing.T) {
957970 expectedCachedResponse : []tripperware.Response {
958971 mkAPIResponseWithStats (100 , 105 , 10 , true , false ),
959972 },
973+ expectedPeakSamplesFromCachedResponse : getPeakSamples (100 , 105 , 10 ),
974+ expectedScannedSamplesFromCachedResponse : getScannedSamples (100 , 105 , 10 ),
960975 },
961976 {
962977 name : "[stats] Test when hit has a large step and only a single sample extent with old format." ,
@@ -971,6 +986,8 @@ func TestPartition(t *testing.T) {
971986 expectedCachedResponse : []tripperware.Response {
972987 mkAPIResponseWithStats (100 , 105 , 10 , true , false ),
973988 },
989+ expectedPeakSamplesFromCachedResponse : getPeakSamples (100 , 105 , 10 ),
990+ expectedScannedSamplesFromCachedResponse : getScannedSamples (100 , 105 , 10 ),
974991 },
975992 } {
976993 tc := tc
@@ -980,10 +997,13 @@ func TestPartition(t *testing.T) {
980997 extractor : PrometheusResponseExtractor {},
981998 minCacheExtent : 10 ,
982999 }
983- reqs , resps , err := s .partition (tc .input , tc .prevCachedResponse )
1000+ stats , ctx := querier_stats .ContextWithEmptyStats (context .Background ())
1001+ reqs , resps , err := s .partition (ctx , tc .input , tc .prevCachedResponse )
9841002 require .Nil (t , err )
9851003 require .Equal (t , tc .expectedRequests , reqs )
9861004 require .Equal (t , tc .expectedCachedResponse , resps )
1005+ require .Equal (t , tc .expectedScannedSamplesFromCachedResponse , stats .ScannedSamples )
1006+ require .Equal (t , tc .expectedPeakSamplesFromCachedResponse , stats .PeakSamples )
9871007 })
9881008 }
9891009}
@@ -1580,3 +1600,14 @@ func TestResultsCacheFillCompatibility(t *testing.T) {
15801600func toMs (t time.Duration ) int64 {
15811601 return int64 (t / time .Millisecond )
15821602}
1603+
1604+ func getScannedSamples (start , end , step uint64 ) uint64 {
1605+ lastTerm := start + ((end - start )/ step )* step
1606+ n := (lastTerm - start )/ step + 1
1607+
1608+ return (n * (2 * start + (n - 1 )* step )) / 2
1609+ }
1610+
1611+ func getPeakSamples (start , end , step uint64 ) uint64 {
1612+ return start + ((end - start )/ step )* step
1613+ }
0 commit comments