[wip] wiring up support to pass store chunks to queriers

Signed-off-by: Owen Diehl <ow.diehl@gmail.com>

pkg/logcli/client/file.go

@@ -77,6 +77,7 @@ func (f *FileClient) Query(q string, limit int, t time.Time, direction logproto.
 		direction,
 		uint32(limit),
 		nil,
+		nil,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse query: %w", err)

pkg/logcli/query/query.go

@@ -490,6 +490,7 @@ func (q *Query) DoLocalQuery(out output.LogOutput, statistics bool, orgID string
 			q.resultsDirection(),
 			uint32(q.Limit),
 			nil,
+			nil,
 		)
 		if err != nil {
 			return err
@@ -506,6 +507,7 @@ func (q *Query) DoLocalQuery(out output.LogOutput, statistics bool, orgID string
 			q.resultsDirection(),
 			uint32(q.Limit),
 			nil,
+			nil,
 		)
 		if err != nil {
 			return err

pkg/logcli/query/query_test.go

@@ -426,7 +426,7 @@ func (t *testQueryClient) Query(_ string, _ int, _ time.Time, _ logproto.Directi
 func (t *testQueryClient) QueryRange(queryStr string, limit int, from, through time.Time, direction logproto.Direction, step, interval time.Duration, _ bool) (*loghttp.QueryResponse, error) {
 	ctx := user.InjectOrgID(context.Background(), "fake")
 
-	params, err := logql.NewLiteralParams(queryStr, from, through, step, interval, direction, uint32(limit), nil)
+	params, err := logql.NewLiteralParams(queryStr, from, through, step, interval, direction, uint32(limit), nil, nil)
 	if err != nil {
 		return nil, err
 	}

pkg/logproto/indexgateway.proto

@@ -45,7 +45,7 @@ message ShardsRequest {
     (gogoproto.jsontag) = "through"
   ];
   string query = 3 [(gogoproto.jsontag) = "query"];
-  uint64 target_bytes_per_shard = 4 [(gogoproto.jsontag) = "targetBytesPerShard"];
+  uint64 targetBytesPerShard = 4 [(gogoproto.jsontag) = "targetBytesPerShard"];
 }
 
 message ShardsResponse {
@@ -57,6 +57,12 @@ message ShardsResponse {
     (gogoproto.nullable) = false,
     (gogoproto.jsontag) = "statistics"
   ];
+  // If present, includes the chunk refs for each shard,
+  // therefore the length will be equal to the length of the `shards` field.
+  repeated logproto.ChunkRefGroup chunkGroups = 3 [
+    (gogoproto.nullable) = false,
+    (gogoproto.jsontag) = "chunkGroups"
+  ];
 }
 
 message Shard {