Do cancel it in the right place

simonswine · simonswine · commit 3869536b129c · 2023-07-10T13:29:53.000+01:00
diff --git a/pkg/phlaredb/query/iters.go b/pkg/phlaredb/query/iters.go
@@ -1173,7 +1173,6 @@ func (c *SyncIterator) setPage(pg parquet.Page) {
 }
 
 func (c *SyncIterator) closeCurrRowGroup() {
-	c.cancel()
 	if c.currPages != nil {
 		c.currPages.Close()
 	}
@@ -1200,6 +1199,7 @@ func (c *SyncIterator) Err() error {
 }
 
 func (c *SyncIterator) Close() error {
+	c.cancel()
 	c.closeCurrRowGroup()
 
 	c.span.SetTag("inspectedColumnChunks", c.filter.InspectedColumnChunks.Load())

Original file line number	Diff line number	Diff line change
`@@ -1173,7 +1173,6 @@ func (c *SyncIterator) setPage(pg parquet.Page) {`
`1173`	`1173`	`}`
`1174`	`1174`
`1175`	`1175`	`func (c *SyncIterator) closeCurrRowGroup() {`
`1176`		`- c.cancel()`
`1177`	`1176`	`if c.currPages != nil {`
`1178`	`1177`	`c.currPages.Close()`
`1179`	`1178`	`}`
`@@ -1200,6 +1199,7 @@ func (c *SyncIterator) Err() error {`
`1200`	`1199`	`}`
`1201`	`1200`
`1202`	`1201`	`func (c *SyncIterator) Close() error {`
	`1202`	`+ c.cancel()`
`1203`	`1203`	`c.closeCurrRowGroup()`
`1204`	`1204`
`1205`	`1205`	`c.span.SetTag("inspectedColumnChunks", c.filter.InspectedColumnChunks.Load())`