Added missing nil check for delSeriesIterator and comment

Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
thanos-io · Nov 18, 2022 · dbb017e · dbb017e
1 parent b74f556
commit dbb017e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/pkg/compact/downsample/downsample.go b/pkg/compact/downsample/downsample.go
@@ -706,7 +706,7 @@ func (it *AverageChunkIterator) Next() chunkenc.ValueType {
 	cok, sok := it.cntIt.Next(), it.sumIt.Next()
 	if cok != sok {
 		it.err = errors.New("sum and count iterator not aligned")
-		return chunkenc.ValFloat
+		return chunkenc.ValNone
 	}
 	if cok == chunkenc.ValNone {
 		return chunkenc.ValNone

diff --git a/pkg/compactv2/modifiers.go b/pkg/compactv2/modifiers.go
@@ -236,7 +236,11 @@ type delSeriesIterator struct {
 }
 
 func (p *delSeriesIterator) Next() chunkenc.ValueType {
-	if valueType := p.curr.Next(); p.curr != nil && valueType != chunkenc.ValNone {
+	if p.curr == nil {
+		return chunkenc.ValNone
+	}
+
+	if valueType := p.curr.Next(); valueType != chunkenc.ValNone {
 		return valueType
 	}
 
@@ -254,7 +258,11 @@ func (p *delSeriesIterator) Next() chunkenc.ValueType {
 }
 
 func (p *delSeriesIterator) Seek(t int64) chunkenc.ValueType {
-	if valueType := p.curr.Seek(t); p.curr != nil && valueType != chunkenc.ValNone {
+	if p.curr == nil {
+		return chunkenc.ValNone
+	}
+
+	if valueType := p.curr.Seek(t); valueType != chunkenc.ValNone {
 		return valueType
 	}
 	for p.Next() != chunkenc.ValNone {

diff --git a/pkg/server/http/http.go b/pkg/server/http/http.go
@@ -78,7 +78,7 @@ func (s *Server) ListenAndServe() error {
 
 	flags := &toolkit_web.FlagConfig{
 		WebListenAddresses: &([]string{s.opts.listen}),
-		WebSystemdSocket:   OfBool(false),
+		WebSystemdSocket:   ofBool(false),
 		WebConfigFile:      &s.opts.tlsConfigPath,
 	}
 
@@ -139,6 +139,7 @@ func registerProbes(mux *http.ServeMux, p *prober.HTTPProbe, logger log.Logger)
 	}
 }
 
-func OfBool(i bool) *bool {
+// Helper for exporter toolkit FlagConfig
+func ofBool(i bool) *bool {
 	return &i
 }