Update tests

Author: benclive

pkg/dataobj/internal/dataset/value.go

@@ -290,8 +290,6 @@ func (v Value) Size() int {
 		return int(unsafe.Sizeof(int64(0)))
 	case datasetmd.VALUE_TYPE_UINT64:
 		return int(unsafe.Sizeof(uint64(0)))
-	case datasetmd.VALUE_TYPE_STRING:
-		return int(v.num)
 	case datasetmd.VALUE_TYPE_BYTE_ARRAY:
 		return int(v.num)
 	case datasetmd.VALUE_TYPE_UNSPECIFIED:

pkg/dataobj/querier/iter.go

@@ -335,7 +335,6 @@ func newSampleIterator(ctx context.Context,
 				// TODO(twhitney): when iterating over multiple extractors, we need a way to pre-process as much of the line as possible
 				// In the case of multi-variant expressions, the only difference between the multiple extractors should be the final value, with all
 				// other filters and processing already done.
-				statistics.AddDecompressedLines(1)
 				value, parsedLabels, ok := streamExtractor.Process(timestamp, record.Line, record.Metadata...)
 				if !ok {
 					continue

pkg/querier/queryrange/codec_test.go

@@ -1886,6 +1886,20 @@ var (
 				},
 				"chunksDownloadTime": 0,
 				"congestionControlLatency": 0,
+				"dataobj":{
+					"pageBatches": 0,
+					"pagesDownloaded": 0,
+					"pagesDownloadedBytes": 0,
+					"pagesScanned": 0,
+					"postFilterRows": 0,
+					"postPredicateRows": 0,
+					"postPredicateDecompressedBytes": 0,
+					"postPredicateStructuredMetadataBytes": 0,
+					"prePredicateDecompressedRows": 0,
+					"prePredicateDecompressedBytes": 0,
+					"prePredicateDecompressedStructuredMetadataBytes": 0,
+					"totalRowsAvailable": 0
+				},
 				"totalChunksRef": 0,
 				"totalChunksDownloaded": 0,
 				"chunkRefsFetchTime": 0,
@@ -1912,6 +1926,20 @@ var (
 				},
 				"chunksDownloadTime": 16,
 				"congestionControlLatency": 0,
+				"dataobj":{
+					"pageBatches": 0,
+					"pagesDownloaded": 0,
+					"pagesDownloadedBytes": 0,
+					"pagesScanned": 0,
+					"postFilterRows": 0,
+					"postPredicateRows": 0,
+					"postPredicateDecompressedBytes": 0,
+					"postPredicateStructuredMetadataBytes": 0,
+					"prePredicateDecompressedRows": 0,
+					"prePredicateDecompressedBytes": 0,
+					"prePredicateDecompressedStructuredMetadataBytes": 0,
+					"totalRowsAvailable": 0
+				},
 				"totalChunksRef": 17,
 				"totalChunksDownloaded": 18,
 				"chunkRefsFetchTime": 19,

pkg/querier/queryrange/prometheus_test.go

@@ -38,6 +38,20 @@ var emptyStats = `"stats": {
 				"headChunkStructuredMetadataBytes": 0,
                 "postFilterLines": 0,
 				"totalDuplicates": 0
+			},
+			"dataobj": {
+				"pageBatches": 0,
+				"pagesDownloaded": 0,
+				"pagesDownloadedBytes": 0,
+				"pagesScanned": 0,
+				"postFilterRows": 0,
+				"postPredicateRows": 0,
+				"postPredicateDecompressedBytes": 0,
+				"postPredicateStructuredMetadataBytes": 0,
+				"prePredicateDecompressedRows": 0,
+				"prePredicateDecompressedBytes": 0,
+				"prePredicateDecompressedStructuredMetadataBytes": 0,
+				"totalRowsAvailable": 0
 			}
 		},
 		"totalBatches": 0,
@@ -64,6 +78,20 @@ var emptyStats = `"stats": {
 				"headChunkStructuredMetadataBytes": 0,
                 "postFilterLines": 0,
 				"totalDuplicates": 0
+			},
+			"dataobj": {
+				"pageBatches": 0,
+				"pagesDownloaded": 0,
+				"pagesDownloadedBytes": 0,
+				"pagesScanned": 0,
+				"postFilterRows": 0,
+				"postPredicateRows": 0,
+				"postPredicateDecompressedBytes": 0,
+				"postPredicateStructuredMetadataBytes": 0,
+				"prePredicateDecompressedRows": 0,
+				"prePredicateDecompressedBytes": 0,
+				"prePredicateDecompressedStructuredMetadataBytes": 0,
+				"totalRowsAvailable": 0
 			}
 		}
 	},