apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused Value field (#9774)

Browse Source 
We didn't end up needing the `Value` field because we can express
everything we need to as selectors
pull/9773/head^2
Travis Patterson 3 years ago committed by GitHub
parent a894c3ccf0
commit 4da0f63789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 194 additions and 307 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      pkg/ingester/ingester_test.go
  2. 12
      pkg/ingester/instance_test.go
  3. 327
      pkg/logproto/logproto.pb.go
  4. 1
      pkg/logproto/logproto.proto
  5. 4
      pkg/querier/http_test.go
  6. 4
      pkg/querier/ingester_querier_test.go
  7. 6
      pkg/querier/multi_tenant_querier_test.go
  8. 4
      pkg/querier/querier_test.go
  9. 25
      pkg/querier/queryrange/codec_test.go
  10. 4
      pkg/querier/queryrange/roundtrip_test.go
  11. 12
      pkg/querier/queryrange/split_by_interval_test.go
  12. 8
      pkg/storage/async_store_test.go
  13. 8
      pkg/storage/stores/composite_store_test.go
  14. 5
      pkg/storage/stores/index/seriesvolume/volume.go
  15. 37
      pkg/storage/stores/index/seriesvolume/volume_test.go
  16. 4
      pkg/storage/stores/shipper/indexgateway/gateway_test.go
  17. 10
      pkg/storage/stores/tsdb/index_client_test.go
  18. 16
      pkg/storage/stores/tsdb/single_file_index_test.go

14
pkg/ingester/ingester_test.go
Unescape View File

@ -473,7 +473,7 @@ func (s *mockStore) Stats(_ context.Context, _ string, _, _ model.Time, _ ...*la
func (s *mockStore) SeriesVolume(_ context.Context, _ string, _, _ model.Time, limit int32, _ ...*labels.Matcher) (*logproto.VolumeResponse, error) {
return &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
Limit: limit,
}, nil
@ -1104,8 +1104,8 @@ func TestSeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []logproto.Volume{
{Name: `{log_stream="dispatcher"}`, Value: "", Volume: 90},
{Name: `{log_stream="worker"}`, Value: "", Volume: 70},
{Name: `{log_stream="dispatcher"}`, Volume: 90},
{Name: `{log_stream="worker"}`, Volume: 70},
}, volumes.Volumes)
})
@ -1119,8 +1119,8 @@ func TestSeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []logproto.Volume{
{Name: `{host="agent", log_stream="dispatcher"}`, Value: "", Volume: 90},
{Name: `{host="agent", log_stream="worker"}`, Value: "", Volume: 70},
{Name: `{host="agent", log_stream="dispatcher"}`, Volume: 90},
{Name: `{host="agent", log_stream="worker"}`, Volume: 70},
}, volumes.Volumes)
})
@ -1134,8 +1134,8 @@ func TestSeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []logproto.Volume{
{Name: `{host="agent", log_stream="dispatcher"}`, Value: "", Volume: 90},
{Name: `{host="agent", log_stream="worker"}`, Value: "", Volume: 70},
{Name: `{host="agent", log_stream="dispatcher"}`, Volume: 90},
{Name: `{host="agent", log_stream="worker"}`, Volume: 70},
}, volumes.Volumes)
})
}

12
pkg/ingester/instance_test.go
Unescape View File

@ -850,8 +850,8 @@ func TestInstance_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []logproto.Volume{
{Name: `{host="agent", job="3", log_stream="dispatcher"}`, Value: "", Volume: 90},
{Name: `{host="agent", job="3", log_stream="worker"}`, Value: "", Volume: 70},
{Name: `{host="agent", job="3", log_stream="dispatcher"}`, Volume: 90},
{Name: `{host="agent", job="3", log_stream="worker"}`, Volume: 70},
}, volumes.Volumes)
})
@ -866,7 +866,7 @@ func TestInstance_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []logproto.Volume{
{Name: `{log_stream="dispatcher"}`, Value: "", Volume: 90},
{Name: `{log_stream="dispatcher"}`, Volume: 90},
}, volumes.Volumes)
})
@ -881,8 +881,8 @@ func TestInstance_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []logproto.Volume{
{Name: `{host="agent", job="3", log_stream="dispatcher"}`, Value: "", Volume: 45},
{Name: `{host="agent", job="3", log_stream="worker"}`, Value: "", Volume: 26},
{Name: `{host="agent", job="3", log_stream="dispatcher"}`, Volume: 45},
{Name: `{host="agent", job="3", log_stream="worker"}`, Volume: 26},
}, volumes.Volumes)
})
@ -897,7 +897,7 @@ func TestInstance_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []logproto.Volume{
{Name: `{host="agent", job="3", log_stream="dispatcher"}`, Value: "", Volume: 90},
{Name: `{host="agent", job="3", log_stream="dispatcher"}`, Volume: 90},
}, volumes.Volumes)
})
}

327
pkg/logproto/logproto.pb.go
Unescape View File

@ -2393,7 +2393,6 @@ func (m *VolumeResponse) GetLimit() int32 {
type Volume struct {
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"`
Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value"`
Volume uint64 `protobuf:"varint,3,opt,name=volume,proto3" json:"volume"`
}
@ -2436,13 +2435,6 @@ func (m *Volume) GetName() string {
return ""
}
func (m *Volume) GetValue() string {
if m != nil {
return m.Value
}
return ""
}
func (m *Volume) GetVolume() uint64 {
if m != nil {
return m.Volume
@ -2503,146 +2495,145 @@ func init() {
func init() { proto.RegisterFile("pkg/logproto/logproto.proto", fileDescriptor_c28a5f14f1f4c79a) }
var fileDescriptor_c28a5f14f1f4c79a = []byte{
// 2213 bytes of a gzipped FileDescriptorProto
// 2206 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x39, 0xcd, 0x6f, 0x1b, 0xc7,
0xf5, 0x1c, 0x72, 0x49, 0x91, 0x8f, 0xd4, 0x87, 0x47, 0x8c, 0xad, 0x1f, 0x6d, 0x93, 0xf2, 0x20,
0x3f, 0x5b, 0xb0, 0x1d, 0x32, 0x56, 0xda, 0xd4, 0xb1, 0x9b, 0x16, 0xa6, 0x14, 0x3b, 0xf2, 0x77,
0x46, 0xae, 0x0b, 0x04, 0x0d, 0x8c, 0x15, 0x39, 0xfc, 0x80, 0xb8, 0x5c, 0x7a, 0x77, 0x19, 0x47,
0x46, 0xae, 0x0b, 0x04, 0x0d, 0x8c, 0x15, 0x39, 0xfc, 0x80, 0xb9, 0x5c, 0x7a, 0x77, 0x19, 0x47,
0x40, 0x0f, 0xfd, 0x07, 0x02, 0xe4, 0x56, 0xf4, 0x52, 0xf4, 0x50, 0xa0, 0x45, 0x81, 0x5e, 0xfa,
0x07, 0xb4, 0x3d, 0x14, 0xa8, 0x7b, 0x73, 0x6f, 0x41, 0x0f, 0x6c, 0x2d, 0x5f, 0x02, 0x9d, 0xf2,
0x0f, 0xb4, 0x28, 0xe6, 0x6b, 0x77, 0x76, 0x45, 0x27, 0xa1, 0x6b, 0xa0, 0xf5, 0x45, 0xdc, 0xf7,
0xe6, 0xcd, 0x9b, 0xf7, 0xfd, 0xe6, 0x8d, 0xe0, 0xf8, 0x68, 0xb7, 0xdb, 0x18, 0xb8, 0xdd, 0x91,
0xe7, 0x06, 0x6e, 0xf8, 0x51, 0x17, 0x7f, 0x71, 0x5e, 0xc3, 0x95, 0x72, 0xd7, 0xed, 0xba, 0x92,
0x86, 0x7f, 0xc9, 0xf5, 0x4a, 0xad, 0xeb, 0xba, 0xdd, 0x01, 0x6b, 0x08, 0x68, 0x67, 0xdc, 0x69,
0x04, 0x7d, 0x87, 0xf9, 0x81, 0xed, 0x8c, 0x14, 0xc1, 0xaa, 0xe2, 0xfe, 0x70, 0xe0, 0xb8, 0x6d,
0x36, 0x68, 0xf8, 0x81, 0x1d, 0xf8, 0xf2, 0xaf, 0xa2, 0x58, 0xe6, 0x14, 0xa3, 0xb1, 0xdf, 0x13,
0x7f, 0x24, 0x92, 0x94, 0x01, 0x6f, 0x07, 0x1e, 0xb3, 0x1d, 0x6a, 0x07, 0xcc, 0xa7, 0xec, 0xe1,
0x98, 0xf9, 0x01, 0xb9, 0x05, 0xcb, 0x31, 0xac, 0x3f, 0x72, 0x87, 0x3e, 0xc3, 0x6f, 0x43, 0xd1,
0x8f, 0xd0, 0x2b, 0x68, 0x35, 0xb3, 0x56, 0x5c, 0x2f, 0xd7, 0x43, 0x55, 0xa2, 0x3d, 0xd4, 0x24,
0x24, 0x3f, 0x47, 0x00, 0xd1, 0x1a, 0xae, 0x02, 0xc8, 0xd5, 0xf7, 0x6d, 0xbf, 0xb7, 0x82, 0x56,
0xd1, 0x9a, 0x45, 0x0d, 0x0c, 0x3e, 0x0f, 0x47, 0x22, 0xe8, 0xb6, 0xbb, 0xdd, 0xb3, 0xbd, 0xf6,
0x4a, 0x5a, 0x90, 0x1d, 0x5e, 0xc0, 0x18, 0x2c, 0xcf, 0x0e, 0xd8, 0x4a, 0x66, 0x15, 0xad, 0x65,
0xa8, 0xf8, 0xc6, 0x47, 0x21, 0x17, 0xb0, 0xa1, 0x3d, 0x0c, 0x56, 0xac, 0x55, 0xb4, 0x56, 0xa0,
0x0a, 0xe2, 0x78, 0xae, 0x3b, 0xf3, 0x57, 0xb2, 0xab, 0x68, 0x6d, 0x9e, 0x2a, 0x88, 0xfc, 0x39,
0x0d, 0xa5, 0x0f, 0xc6, 0xcc, 0xdb, 0x53, 0x06, 0xc0, 0x15, 0xc8, 0xfb, 0x6c, 0xc0, 0x5a, 0x81,
0xeb, 0x09, 0x01, 0x0b, 0x34, 0x84, 0x71, 0x19, 0xb2, 0x83, 0xbe, 0xd3, 0x0f, 0x84, 0x48, 0xf3,
0x54, 0x02, 0xf8, 0x12, 0x64, 0xfd, 0xc0, 0xf6, 0x02, 0x21, 0x47, 0x71, 0xbd, 0x52, 0x97, 0x0e,
0xab, 0x6b, 0x87, 0xd5, 0xef, 0x69, 0x87, 0x35, 0xf3, 0x8f, 0x27, 0xb5, 0xd4, 0x67, 0x7f, 0xaf,
0x21, 0x2a, 0xb7, 0xe0, 0xb7, 0x21, 0xc3, 0x86, 0x6d, 0x21, 0xeb, 0x37, 0xdd, 0xc9, 0x37, 0xe0,
0x0b, 0x50, 0x68, 0xf7, 0x3d, 0xd6, 0x0a, 0xfa, 0xee, 0x50, 0x68, 0xb4, 0xb0, 0xbe, 0x1c, 0x79,
0x63, 0x53, 0x2f, 0xd1, 0x88, 0x0a, 0x9f, 0x87, 0x9c, 0xcf, 0xcd, 0xe6, 0xaf, 0xcc, 0xad, 0x66,
0xd6, 0x0a, 0xcd, 0xf2, 0xc1, 0xa4, 0xb6, 0x24, 0x31, 0xe7, 0x5d, 0xa7, 0x1f, 0x30, 0x67, 0x14,
0xec, 0x51, 0x45, 0x83, 0xcf, 0xc2, 0x5c, 0x9b, 0x0d, 0x18, 0x77, 0x76, 0x5e, 0x38, 0x7b, 0xc9,
0x60, 0x2f, 0x16, 0xa8, 0x26, 0xb8, 0x6e, 0xe5, 0x73, 0x4b, 0x73, 0xe4, 0x5f, 0x08, 0xf0, 0xb6,
0xed, 0x8c, 0x06, 0xec, 0x1b, 0xdb, 0x33, 0xb4, 0x5c, 0xfa, 0x85, 0x2d, 0x97, 0x99, 0xd5, 0x72,
0x91, 0x19, 0xac, 0xd9, 0xcc, 0x90, 0xfd, 0x1a, 0x33, 0x90, 0x9b, 0x90, 0x93, 0xa8, 0xaf, 0x8b,
0xa1, 0x48, 0xe7, 0x8c, 0xd6, 0x66, 0x29, 0xd2, 0x26, 0x23, 0xe4, 0x24, 0xbf, 0x40, 0x30, 0xaf,
0x0c, 0xa9, 0x72, 0x70, 0x07, 0xe6, 0x64, 0x0e, 0xe8, 0xfc, 0x3b, 0x96, 0xcc, 0xbf, 0x2b, 0x6d,
0x7b, 0x14, 0x30, 0xaf, 0xd9, 0x78, 0x3c, 0xa9, 0xa1, 0xbf, 0x4d, 0x6a, 0x67, 0xba, 0xfd, 0xa0,
0x37, 0xde, 0xa9, 0xb7, 0x5c, 0xa7, 0xd1, 0xf5, 0xec, 0x8e, 0x3d, 0xb4, 0x1b, 0x03, 0x77, 0xb7,
0xdf, 0xd0, 0xf5, 0x40, 0xe7, 0xad, 0x66, 0x8c, 0xcf, 0x09, 0xe9, 0x02, 0x5f, 0x79, 0x64, 0xb1,
0x2e, 0xcb, 0xc8, 0xd6, 0xb0, 0xcb, 0x7c, 0xce, 0xd9, 0xe2, 0xc6, 0xa4, 0x92, 0x86, 0xfc, 0x18,
0x96, 0x63, 0x0e, 0x57, 0x72, 0x5e, 0x84, 0x9c, 0xcf, 0xbc, 0x7e, 0x58, 0x26, 0x0c, 0x93, 0x6d,
0x0b, 0x7c, 0x73, 0x41, 0xc9, 0x97, 0x93, 0x30, 0x55, 0xf4, 0xb3, 0x9d, 0xfe, 0x27, 0x04, 0xa5,
0x9b, 0xf6, 0x0e, 0x1b, 0xe8, 0x48, 0xc3, 0x60, 0x0d, 0x6d, 0x87, 0x29, 0x8b, 0x8b, 0x6f, 0x9e,
0xf6, 0x1f, 0xdb, 0x83, 0x31, 0x93, 0x2c, 0xf3, 0x54, 0x41, 0xb3, 0xe6, 0x2c, 0x7a, 0xe1, 0x9c,
0x45, 0x51, 0xe4, 0x95, 0x21, 0xfb, 0x90, 0x1b, 0x4a, 0xe4, 0x6b, 0x81, 0x4a, 0x80, 0x9c, 0x81,
0x79, 0xa5, 0x85, 0x32, 0x5f, 0x24, 0x32, 0x37, 0x5f, 0x41, 0x8b, 0x4c, 0x1c, 0xc8, 0x49, 0x6b,
0xe3, 0xd7, 0xa1, 0x10, 0xf6, 0x00, 0xa1, 0x6d, 0xa6, 0x99, 0x3b, 0x98, 0xd4, 0xd2, 0x81, 0x4f,
0xa3, 0x05, 0x5c, 0x83, 0xac, 0xd8, 0x29, 0x34, 0x47, 0xcd, 0xc2, 0xc1, 0xa4, 0x26, 0x11, 0x54,
0xfe, 0xe0, 0x13, 0x60, 0xf5, 0x78, 0x19, 0xe6, 0x26, 0xb0, 0x9a, 0xf9, 0x83, 0x49, 0x4d, 0xc0,
0x54, 0xfc, 0x25, 0xd7, 0xa0, 0x74, 0x93, 0x75, 0xed, 0xd6, 0x9e, 0x3a, 0xb4, 0xac, 0xd9, 0xf1,
0x03, 0x91, 0xe6, 0x71, 0x0a, 0x4a, 0xe1, 0x89, 0x0f, 0x1c, 0x5f, 0x05, 0x75, 0x31, 0xc4, 0xdd,
0xf2, 0xc9, 0xcf, 0x10, 0x28, 0x3f, 0x63, 0x02, 0xb9, 0x01, 0xd7, 0xd5, 0x97, 0x3e, 0x6a, 0xc2,
0xc1, 0xa4, 0xa6, 0x30, 0x54, 0xfd, 0xe2, 0xcb, 0x30, 0xe7, 0x8b, 0x13, 0x39, 0xb3, 0x64, 0xf8,
0x88, 0x85, 0xe6, 0x22, 0x0f, 0x83, 0x83, 0x49, 0x4d, 0x13, 0x52, 0xfd, 0x81, 0xeb, 0xb1, 0xfe,
0x22, 0x15, 0x5b, 0x38, 0x98, 0xd4, 0x0c, 0xac, 0xd9, 0x6f, 0xc8, 0x4f, 0x11, 0x14, 0xef, 0xd9,
0xfd, 0x30, 0x84, 0x42, 0x17, 0x21, 0xc3, 0x45, 0x3c, 0x9d, 0xdb, 0x6c, 0x60, 0xef, 0x5d, 0x75,
0x3d, 0xc1, 0x73, 0x9e, 0x86, 0x70, 0xd4, 0x12, 0xac, 0xa9, 0x2d, 0x21, 0x3b, 0x73, 0x61, 0xbb,
0x6e, 0xe5, 0xd3, 0x4b, 0x19, 0xf2, 0x5b, 0x04, 0x25, 0x29, 0x99, 0x0a, 0x8b, 0x1f, 0x41, 0x4e,
0x0a, 0x2e, 0x64, 0xfb, 0x8a, 0xe4, 0x3f, 0x37, 0x4b, 0xe2, 0x2b, 0x9e, 0xf8, 0xfb, 0xb0, 0xd0,
0xf6, 0xdc, 0xd1, 0x88, 0xb5, 0xb7, 0x55, 0x89, 0x49, 0x27, 0x4b, 0xcc, 0xa6, 0xb9, 0x4e, 0x13,
0xe4, 0xe4, 0x2f, 0x08, 0xe6, 0x55, 0x36, 0x2b, 0x5b, 0x86, 0x36, 0x40, 0x2f, 0x5c, 0xdc, 0xd3,
0xb3, 0x16, 0xf7, 0xa3, 0x90, 0xeb, 0x7a, 0xee, 0x78, 0xe4, 0xaf, 0x64, 0x64, 0xee, 0x48, 0x68,
0xb6, 0xa2, 0x4f, 0xae, 0xc3, 0x82, 0x56, 0xe5, 0x39, 0x25, 0xad, 0x92, 0x2c, 0x69, 0x5b, 0x6d,
0x36, 0x0c, 0xfa, 0x9d, 0x7e, 0x58, 0xa4, 0x14, 0x3d, 0xf9, 0x14, 0xc1, 0x52, 0x92, 0x04, 0x7f,
0xcf, 0xc8, 0x03, 0xce, 0xee, 0xf4, 0xf3, 0xd9, 0xd5, 0x45, 0x71, 0xf0, 0xdf, 0x1b, 0x06, 0xde,
0x9e, 0xce, 0x91, 0xca, 0x3b, 0x50, 0x34, 0xd0, 0xbc, 0x79, 0xec, 0x32, 0x1d, 0xb3, 0xfc, 0x33,
0x4a, 0xd6, 0xb4, 0x8c, 0x63, 0x01, 0x5c, 0x4a, 0x5f, 0x44, 0x3c, 0xe2, 0xe7, 0x63, 0x9e, 0xc4,
0x17, 0xc1, 0xea, 0x78, 0xae, 0x33, 0x93, 0x9b, 0xc4, 0x0e, 0xfc, 0x2d, 0x48, 0x07, 0xee, 0x4c,
0x4e, 0x4a, 0x07, 0x2e, 0xf7, 0x91, 0x52, 0x3e, 0x23, 0x6f, 0x68, 0x12, 0x22, 0xbf, 0x41, 0xb0,
0xc8, 0xf7, 0x48, 0x0b, 0x6c, 0xf4, 0xc6, 0xc3, 0x5d, 0xbc, 0x06, 0x4b, 0xfc, 0xa4, 0x07, 0x7d,
0xd5, 0x01, 0x1e, 0xf4, 0xdb, 0x4a, 0xcd, 0x05, 0x8e, 0xd7, 0x8d, 0x61, 0xab, 0x8d, 0x8f, 0xc1,
0xdc, 0xd8, 0x97, 0x04, 0x52, 0xe7, 0x1c, 0x07, 0xb7, 0xda, 0xf8, 0x9c, 0x71, 0x1c, 0xb7, 0xb5,
0x71, 0x4d, 0x12, 0x36, 0xbc, 0x6b, 0xf7, 0xbd, 0xb0, 0xf8, 0x9c, 0x81, 0x5c, 0x8b, 0x1f, 0x2c,
0xe3, 0x84, 0x77, 0xa0, 0x90, 0x58, 0x08, 0x44, 0xd5, 0x32, 0xf9, 0x36, 0x14, 0xc2, 0xdd, 0x53,
0x1b, 0xcf, 0x54, 0x0f, 0x90, 0xcb, 0xb0, 0x28, 0x8b, 0xea, 0xf4, 0xcd, 0xa5, 0x69, 0x9b, 0x4b,
0x7a, 0xf3, 0x71, 0xc8, 0x4a, 0xab, 0x60, 0xb0, 0xda, 0x76, 0x60, 0xeb, 0x2d, 0xfc, 0x9b, 0xac,
0xc0, 0xd1, 0x7b, 0x9e, 0x3d, 0xf4, 0x3b, 0xcc, 0x13, 0x44, 0x61, 0xec, 0x92, 0xd7, 0x60, 0x99,
0x17, 0x12, 0xe6, 0xf9, 0x1b, 0xee, 0x78, 0x18, 0xe8, 0x8b, 0xfe, 0x79, 0x28, 0xc7, 0xd1, 0x2a,
0xd4, 0xcb, 0x90, 0x6d, 0x71, 0x84, 0xe0, 0x3e, 0x4f, 0x25, 0x40, 0x7e, 0x89, 0x00, 0x5f, 0x63,
0x81, 0x60, 0xbd, 0xb5, 0xe9, 0x1b, 0x97, 0x3b, 0xc7, 0x0e, 0x5a, 0x3d, 0xe6, 0xf9, 0xfa, 0xa2,
0xa3, 0xe1, 0xff, 0xc6, 0xe5, 0x8e, 0x5c, 0x80, 0xe5, 0x98, 0x94, 0x4a, 0xa7, 0x0a, 0xe4, 0x5b,
0x0a, 0xa7, 0x9a, 0x6a, 0x08, 0x93, 0xdf, 0xa5, 0x21, 0x2f, 0x7d, 0xcb, 0x3a, 0xf8, 0x02, 0x14,
0x3b, 0x3c, 0xd6, 0xbc, 0x91, 0xd7, 0x57, 0x26, 0xb0, 0x9a, 0x8b, 0x07, 0x93, 0x9a, 0x89, 0xa6,
0x26, 0x80, 0xdf, 0x48, 0x04, 0x5e, 0xb3, 0xbc, 0x3f, 0xa9, 0xe5, 0x7e, 0xc0, 0x83, 0x6f, 0x93,
0xb7, 0x37, 0x11, 0x86, 0x9b, 0x61, 0x38, 0xde, 0x50, 0xd9, 0x26, 0x6e, 0x7a, 0xcd, 0xef, 0x70,
0xf1, 0x13, 0xf5, 0x7a, 0xe4, 0xb9, 0x0e, 0x0b, 0x7a, 0x6c, 0xec, 0x37, 0x5a, 0xae, 0xe3, 0xb8,
0xc3, 0x86, 0x18, 0xeb, 0x84, 0xd2, 0xbc, 0x47, 0xf3, 0xed, 0x2a, 0x01, 0xef, 0xc1, 0x5c, 0xd0,
0xf3, 0xdc, 0x71, 0xb7, 0x27, 0xda, 0x4f, 0xa6, 0x79, 0x69, 0x76, 0x7e, 0x9a, 0x03, 0xd5, 0x1f,
0xf8, 0x14, 0xb7, 0x16, 0x6b, 0xed, 0xfa, 0x63, 0x47, 0x0e, 0x4b, 0xcd, 0xec, 0xc1, 0xa4, 0x86,
0xde, 0xa0, 0x21, 0x9a, 0x7c, 0x9a, 0x86, 0x9a, 0x08, 0xe1, 0xfb, 0xe2, 0x6e, 0x72, 0xd5, 0xf5,
0x6e, 0xb1, 0xc0, 0xeb, 0xb7, 0x6e, 0xdb, 0x0e, 0xd3, 0xb1, 0x51, 0x83, 0xa2, 0x23, 0x90, 0x0f,
0x8c, 0xe4, 0x00, 0x27, 0xa4, 0xc3, 0x27, 0x01, 0x44, 0xda, 0xc9, 0x75, 0x99, 0x27, 0x05, 0x81,
0x11, 0xcb, 0x1b, 0x31, 0x4b, 0x35, 0x66, 0xd4, 0x4c, 0x59, 0x68, 0x2b, 0x69, 0xa1, 0x99, 0xf9,
0x84, 0x66, 0x31, 0x63, 0x3d, 0x1b, 0x8f, 0x75, 0xf2, 0x57, 0x04, 0xd5, 0x9b, 0x5a, 0xf2, 0x17,
0x34, 0x87, 0xd6, 0x37, 0xfd, 0x92, 0xf4, 0xcd, 0xfc, 0x67, 0xfa, 0x92, 0x3f, 0x1a, 0x29, 0x4f,
0x59, 0x47, 0xeb, 0xb1, 0x61, 0xb4, 0x8b, 0x97, 0x21, 0x66, 0xfa, 0x25, 0xba, 0x25, 0x93, 0x70,
0xcb, 0xbb, 0x51, 0x39, 0x10, 0x1a, 0xa8, 0x72, 0x70, 0x1a, 0x2c, 0x8f, 0x75, 0x74, 0xf3, 0xc5,
0xc9, 0x1a, 0xcf, 0x3a, 0x54, 0xac, 0x93, 0xdf, 0x23, 0x58, 0xba, 0xc6, 0x82, 0xf8, 0xb5, 0xe6,
0x55, 0xd2, 0xff, 0x7d, 0x38, 0x62, 0xc8, 0xaf, 0xb4, 0x7f, 0x2b, 0x71, 0x97, 0x79, 0x2d, 0xd2,
0x7f, 0x6b, 0xd8, 0x66, 0x9f, 0xa8, 0x19, 0x2d, 0x7e, 0x8d, 0xb9, 0x0b, 0x45, 0x63, 0x11, 0x5f,
0x49, 0x5c, 0x60, 0xa6, 0x35, 0xd5, 0x66, 0x59, 0xe9, 0x24, 0xa7, 0x34, 0x75, 0x3d, 0x0d, 0xdb,
0xfd, 0x36, 0x60, 0x31, 0x36, 0x0a, 0xb6, 0x66, 0xa5, 0x16, 0xd8, 0x1b, 0xe1, 0x7d, 0x26, 0x84,
0xf1, 0x29, 0xb0, 0x3c, 0xf7, 0x91, 0xbe, 0x99, 0xce, 0x47, 0x47, 0x52, 0xf7, 0x11, 0x15, 0x4b,
0xe4, 0x32, 0x64, 0xa8, 0xfb, 0x08, 0x57, 0x01, 0x3c, 0x7b, 0xd8, 0x65, 0xf7, 0xc3, 0x81, 0xa5,
0x44, 0x0d, 0xcc, 0x73, 0xfa, 0xeb, 0x06, 0x1c, 0x31, 0x25, 0x92, 0xee, 0xae, 0xc3, 0x1c, 0x47,
0xf6, 0xa7, 0x3d, 0x7a, 0x09, 0x42, 0x39, 0xfb, 0x6a, 0x22, 0x1e, 0x33, 0x10, 0xe1, 0xf1, 0x09,
0x28, 0x04, 0xf6, 0xce, 0x80, 0xdd, 0x8e, 0x72, 0x3e, 0x42, 0xf0, 0x55, 0x3e, 0x6b, 0xdd, 0x37,
0x2e, 0x0a, 0x11, 0x02, 0x9f, 0x85, 0xa5, 0x48, 0xe6, 0xbb, 0x1e, 0xeb, 0xf4, 0x3f, 0x11, 0x1e,
0x2e, 0xd1, 0x43, 0x78, 0xbc, 0x06, 0x8b, 0x11, 0x6e, 0x5b, 0xb4, 0x5d, 0x4b, 0x90, 0x26, 0xd1,
0xdc, 0x36, 0x42, 0xdd, 0xf7, 0x1e, 0x8e, 0xed, 0x81, 0x28, 0x64, 0x25, 0x6a, 0x60, 0xc8, 0x1f,
0x10, 0x1c, 0x91, 0xae, 0xe6, 0x53, 0xf6, 0xab, 0x18, 0xf5, 0xbf, 0x42, 0x80, 0x4d, 0x0d, 0x54,
0x68, 0xfd, 0xbf, 0xf9, 0x7c, 0xc2, 0xfb, 0x7a, 0x51, 0x8c, 0x90, 0x12, 0x15, 0xbd, 0x80, 0x90,
0xf0, 0x0a, 0x28, 0xde, 0x1d, 0xe5, 0x8c, 0x2a, 0x31, 0xfa, 0xf6, 0xc7, 0x47, 0xeb, 0x9d, 0xbd,
0x80, 0xf9, 0x6a, 0xc2, 0x14, 0xa3, 0xb5, 0x40, 0x50, 0xf9, 0xc3, 0xcf, 0x62, 0xc3, 0x40, 0x44,
0x8d, 0x15, 0x9d, 0xa5, 0x50, 0x54, 0x7f, 0xf0, 0xb6, 0x31, 0x7f, 0xdf, 0x1d, 0x8c, 0xa3, 0x2e,
0xf1, 0x0a, 0xd9, 0x39, 0x3e, 0xfa, 0x66, 0xd5, 0xe8, 0x4b, 0xbe, 0x40, 0xb0, 0xa0, 0x75, 0x52,
0x96, 0x7f, 0x13, 0xe6, 0x3e, 0x16, 0x98, 0x29, 0x2f, 0x42, 0x92, 0x54, 0x55, 0x1b, 0x4d, 0x16,
0x7f, 0x68, 0xd5, 0xac, 0xff, 0xd7, 0x6e, 0x04, 0x64, 0x17, 0x72, 0x52, 0x7c, 0x7c, 0xc2, 0x9c,
0x00, 0xe4, 0x53, 0x0a, 0x87, 0xd5, 0x75, 0x3e, 0xf6, 0x12, 0x53, 0x98, 0xf2, 0x12, 0x43, 0x20,
0x27, 0x35, 0x57, 0x01, 0x25, 0x62, 0x4e, 0x62, 0xa8, 0xfa, 0x3d, 0x7b, 0x1a, 0x0a, 0xe1, 0xb3,
0x2e, 0x2e, 0xc2, 0xdc, 0xd5, 0x3b, 0xf4, 0x87, 0x57, 0xe8, 0xe6, 0x52, 0x0a, 0x97, 0x20, 0xdf,
0xbc, 0xb2, 0x71, 0x43, 0x40, 0x68, 0xfd, 0x9f, 0x96, 0xae, 0x58, 0x1e, 0xfe, 0x2e, 0x64, 0x65,
0x19, 0x3a, 0x1a, 0x19, 0xdc, 0x7c, 0x9c, 0xad, 0x1c, 0x3b, 0x84, 0x57, 0x43, 0x43, 0xea, 0x4d,
0x84, 0x6f, 0x43, 0x51, 0x20, 0xd5, 0x03, 0xd0, 0x89, 0xe4, 0x3b, 0x4c, 0x8c, 0xd3, 0xc9, 0xe7,
0xac, 0x1a, 0xfc, 0x2e, 0x41, 0x56, 0x74, 0x02, 0x53, 0x1a, 0xf3, 0x01, 0xcf, 0x94, 0x26, 0xf6,
0x24, 0x46, 0x52, 0xf8, 0x1d, 0xb0, 0xf8, 0xb4, 0x82, 0x8d, 0x66, 0x65, 0xbc, 0xdb, 0x54, 0x8e,
0x26, 0xd1, 0xc6, 0xb1, 0xef, 0x86, 0xcf, 0x4f, 0xc7, 0x92, 0x63, 0xb6, 0xde, 0xbe, 0x72, 0x78,
0x21, 0x3c, 0xf9, 0x8e, 0x7c, 0x87, 0xd1, 0x73, 0x12, 0x3e, 0x19, 0x3f, 0x2a, 0x31, 0x56, 0x55,
0xaa, 0xcf, 0x5b, 0x0e, 0x19, 0xde, 0x84, 0xa2, 0x31, 0xa3, 0x98, 0x66, 0x3d, 0x3c, 0x60, 0x99,
0x66, 0x9d, 0x32, 0xd8, 0x90, 0x14, 0xbe, 0x06, 0x79, 0xde, 0xe2, 0x79, 0xa5, 0xc3, 0xc7, 0x93,
0x9d, 0xdc, 0xa8, 0xe0, 0x95, 0x13, 0xd3, 0x17, 0x43, 0x46, 0x57, 0x61, 0x31, 0xbc, 0x2b, 0xa8,
0xa8, 0x3e, 0x96, 0x4c, 0xd3, 0x29, 0xf6, 0x8a, 0xa7, 0x3a, 0x49, 0xad, 0x7f, 0x04, 0x79, 0x3d,
0x96, 0xe3, 0x0f, 0x60, 0x21, 0x3e, 0x94, 0xe2, 0xff, 0x33, 0xcc, 0x13, 0x9f, 0xf5, 0x2b, 0xab,
0xc6, 0xd2, 0xf4, 0x49, 0x36, 0xb5, 0x86, 0xd6, 0x3f, 0xd2, 0xff, 0x4f, 0xda, 0xb4, 0x03, 0x1b,
0xdf, 0x81, 0x05, 0xa1, 0x7d, 0xf8, 0x0f, 0xa7, 0x58, 0x94, 0x1e, 0xfa, 0xef, 0x56, 0x2c, 0x4a,
0x0f, 0xff, 0x97, 0x8b, 0xa4, 0x9a, 0x1f, 0x3e, 0x79, 0x5a, 0x4d, 0x7d, 0xfe, 0xb4, 0x9a, 0xfa,
0xf2, 0x69, 0x15, 0xfd, 0x64, 0xbf, 0x8a, 0x7e, 0xbd, 0x5f, 0x45, 0x8f, 0xf7, 0xab, 0xe8, 0xc9,
0x7e, 0x15, 0xfd, 0x63, 0xbf, 0x8a, 0xbe, 0xd8, 0xaf, 0xa6, 0xbe, 0xdc, 0xaf, 0xa2, 0xcf, 0x9e,
0x55, 0x53, 0x4f, 0x9e, 0x55, 0x53, 0x9f, 0x3f, 0xab, 0xa6, 0x3e, 0x7c, 0xfd, 0xab, 0x9e, 0xdb,
0xf4, 0x89, 0x3b, 0x39, 0xf1, 0xf3, 0xd6, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x47, 0x25,
0xcf, 0x0e, 0x1c, 0x00, 0x00,
0x0f, 0xb4, 0x28, 0xe6, 0x6b, 0x77, 0x76, 0x45, 0x25, 0xa1, 0x6b, 0xa0, 0xf5, 0x45, 0xdc, 0xf7,
0xe6, 0xcd, 0x9b, 0xf7, 0xfd, 0xe6, 0x8d, 0xe0, 0xf8, 0xe8, 0x61, 0xb7, 0x31, 0x70, 0xbb, 0x23,
0xcf, 0x0d, 0xdc, 0xf0, 0xa3, 0x2e, 0xfe, 0xe2, 0xbc, 0x86, 0x2b, 0xe5, 0xae, 0xdb, 0x75, 0x25,
0x0d, 0xff, 0x92, 0xeb, 0x95, 0x5a, 0xd7, 0x75, 0xbb, 0x03, 0xd6, 0x10, 0xd0, 0xce, 0xb8, 0xd3,
0x08, 0xfa, 0x0e, 0xf3, 0x03, 0xdb, 0x19, 0x29, 0x82, 0x55, 0xc5, 0xfd, 0xd1, 0xc0, 0x71, 0xdb,
0x6c, 0xd0, 0xf0, 0x03, 0x3b, 0xf0, 0xe5, 0x5f, 0x45, 0xb1, 0xcc, 0x29, 0x46, 0x63, 0xbf, 0x27,
0xfe, 0x48, 0x24, 0x29, 0x03, 0xde, 0x0e, 0x3c, 0x66, 0x3b, 0xd4, 0x0e, 0x98, 0x4f, 0xd9, 0xa3,
0x31, 0xf3, 0x03, 0x72, 0x0b, 0x96, 0x63, 0x58, 0x7f, 0xe4, 0x0e, 0x7d, 0x86, 0xdf, 0x86, 0xa2,
0x1f, 0xa1, 0x57, 0xd0, 0x6a, 0x66, 0xad, 0xb8, 0x5e, 0xae, 0x87, 0xaa, 0x44, 0x7b, 0xa8, 0x49,
0x48, 0x7e, 0x8e, 0x00, 0xa2, 0x35, 0x5c, 0x05, 0x90, 0xab, 0xef, 0xdb, 0x7e, 0x6f, 0x05, 0xad,
0xa2, 0x35, 0x8b, 0x1a, 0x18, 0x7c, 0x1e, 0x8e, 0x44, 0xd0, 0x6d, 0x77, 0xbb, 0x67, 0x7b, 0xed,
0x95, 0xb4, 0x20, 0x3b, 0xb8, 0x80, 0x31, 0x58, 0x9e, 0x1d, 0xb0, 0x95, 0xcc, 0x2a, 0x5a, 0xcb,
0x50, 0xf1, 0x8d, 0x8f, 0x42, 0x2e, 0x60, 0x43, 0x7b, 0x18, 0xac, 0x58, 0xab, 0x68, 0xad, 0x40,
0x15, 0xc4, 0xf1, 0x5c, 0x77, 0xe6, 0xaf, 0x64, 0x57, 0xd1, 0xda, 0x3c, 0x55, 0x10, 0xf9, 0x73,
0x1a, 0x4a, 0x1f, 0x8c, 0x99, 0xb7, 0xab, 0x0c, 0x80, 0x2b, 0x90, 0xf7, 0xd9, 0x80, 0xb5, 0x02,
0xd7, 0x13, 0x02, 0x16, 0x68, 0x08, 0xe3, 0x32, 0x64, 0x07, 0x7d, 0xa7, 0x1f, 0x08, 0x91, 0xe6,
0xa9, 0x04, 0xf0, 0x25, 0xc8, 0xfa, 0x81, 0xed, 0x05, 0x42, 0x8e, 0xe2, 0x7a, 0xa5, 0x2e, 0x1d,
0x56, 0xd7, 0x0e, 0xab, 0xdf, 0xd3, 0x0e, 0x6b, 0xe6, 0x9f, 0x4c, 0x6a, 0xa9, 0xcf, 0xfe, 0x5e,
0x43, 0x54, 0x6e, 0xc1, 0x6f, 0x43, 0x86, 0x0d, 0xdb, 0x42, 0xd6, 0x6f, 0xba, 0x93, 0x6f, 0xc0,
0x17, 0xa0, 0xd0, 0xee, 0x7b, 0xac, 0x15, 0xf4, 0xdd, 0xa1, 0xd0, 0x68, 0x61, 0x7d, 0x39, 0xf2,
0xc6, 0xa6, 0x5e, 0xa2, 0x11, 0x15, 0x3e, 0x0f, 0x39, 0x9f, 0x9b, 0xcd, 0x5f, 0x99, 0x5b, 0xcd,
0xac, 0x15, 0x9a, 0xe5, 0xfd, 0x49, 0x6d, 0x49, 0x62, 0xce, 0xbb, 0x4e, 0x3f, 0x60, 0xce, 0x28,
0xd8, 0xa5, 0x8a, 0x06, 0x9f, 0x85, 0xb9, 0x36, 0x1b, 0x30, 0xee, 0xec, 0xbc, 0x70, 0xf6, 0x92,
0xc1, 0x5e, 0x2c, 0x50, 0x4d, 0x70, 0xdd, 0xca, 0xe7, 0x96, 0xe6, 0xc8, 0xbf, 0x10, 0xe0, 0x6d,
0xdb, 0x19, 0x0d, 0xd8, 0x37, 0xb6, 0x67, 0x68, 0xb9, 0xf4, 0x0b, 0x5b, 0x2e, 0x33, 0xab, 0xe5,
0x22, 0x33, 0x58, 0xb3, 0x99, 0x21, 0xfb, 0x35, 0x66, 0x20, 0x37, 0x21, 0x27, 0x51, 0x5f, 0x17,
0x43, 0x91, 0xce, 0x19, 0xad, 0xcd, 0x52, 0xa4, 0x4d, 0x46, 0xc8, 0x49, 0x7e, 0x81, 0x60, 0x5e,
0x19, 0x52, 0xe5, 0xe0, 0x0e, 0xcc, 0xc9, 0x1c, 0xd0, 0xf9, 0x77, 0x2c, 0x99, 0x7f, 0x57, 0xda,
0xf6, 0x28, 0x60, 0x5e, 0xb3, 0xf1, 0x64, 0x52, 0x43, 0x7f, 0x9b, 0xd4, 0xce, 0x74, 0xfb, 0x41,
0x6f, 0xbc, 0x53, 0x6f, 0xb9, 0x4e, 0xa3, 0xeb, 0xd9, 0x1d, 0x7b, 0x68, 0x37, 0x06, 0xee, 0xc3,
0x7e, 0x43, 0xd7, 0x03, 0x9d, 0xb7, 0x9a, 0x31, 0x3e, 0x27, 0xa4, 0x0b, 0x7c, 0xe5, 0x91, 0xc5,
0xba, 0x2c, 0x23, 0x5b, 0xc3, 0x2e, 0xf3, 0x39, 0x67, 0x8b, 0x1b, 0x93, 0x4a, 0x1a, 0xf2, 0x63,
0x58, 0x8e, 0x39, 0x5c, 0xc9, 0x79, 0x11, 0x72, 0x3e, 0xf3, 0xfa, 0x61, 0x99, 0x30, 0x4c, 0xb6,
0x2d, 0xf0, 0xcd, 0x05, 0x25, 0x5f, 0x4e, 0xc2, 0x54, 0xd1, 0xcf, 0x76, 0xfa, 0x9f, 0x10, 0x94,
0x6e, 0xda, 0x3b, 0x6c, 0xa0, 0x23, 0x0d, 0x83, 0x35, 0xb4, 0x1d, 0xa6, 0x2c, 0x2e, 0xbe, 0x79,
0xda, 0x7f, 0x6c, 0x0f, 0xc6, 0x4c, 0xb2, 0xcc, 0x53, 0x05, 0xcd, 0x9a, 0xb3, 0xe8, 0x85, 0x73,
0x16, 0x45, 0x91, 0x57, 0x86, 0xec, 0x23, 0x6e, 0x28, 0x91, 0xaf, 0x05, 0x2a, 0x01, 0x72, 0x06,
0xe6, 0x95, 0x16, 0xca, 0x7c, 0x91, 0xc8, 0xdc, 0x7c, 0x05, 0x2d, 0x32, 0x71, 0x20, 0x27, 0xad,
0x8d, 0x5f, 0x87, 0x42, 0xd8, 0x03, 0x84, 0xb6, 0x99, 0x66, 0x6e, 0x7f, 0x52, 0x4b, 0x07, 0x3e,
0x8d, 0x16, 0x70, 0x0d, 0xb2, 0x62, 0xa7, 0xd0, 0x1c, 0x35, 0x0b, 0xfb, 0x93, 0x9a, 0x44, 0x50,
0xf9, 0x83, 0x4f, 0x80, 0xd5, 0xe3, 0x65, 0x98, 0x9b, 0xc0, 0x6a, 0xe6, 0xf7, 0x27, 0x35, 0x01,
0x53, 0xf1, 0x97, 0x5c, 0x83, 0xd2, 0x4d, 0xd6, 0xb5, 0x5b, 0xbb, 0xea, 0xd0, 0xb2, 0x66, 0xc7,
0x0f, 0x44, 0x9a, 0xc7, 0x29, 0x28, 0x85, 0x27, 0x3e, 0x70, 0x7c, 0x15, 0xd4, 0xc5, 0x10, 0x77,
0xcb, 0x27, 0x3f, 0x43, 0xa0, 0xfc, 0x8c, 0x09, 0xe4, 0x06, 0x5c, 0x57, 0x5f, 0xfa, 0xa8, 0x09,
0xfb, 0x93, 0x9a, 0xc2, 0x50, 0xf5, 0x8b, 0x2f, 0xc3, 0x9c, 0x2f, 0x4e, 0xe4, 0xcc, 0x92, 0xe1,
0x23, 0x16, 0x9a, 0x8b, 0x3c, 0x0c, 0xf6, 0x27, 0x35, 0x4d, 0x48, 0xf5, 0x07, 0xae, 0xc7, 0xfa,
0x8b, 0x54, 0x6c, 0x61, 0x7f, 0x52, 0x33, 0xb0, 0x66, 0xbf, 0x21, 0x3f, 0x45, 0x50, 0xbc, 0x67,
0xf7, 0xc3, 0x10, 0x0a, 0x5d, 0x84, 0x0c, 0x17, 0xf1, 0x74, 0x6e, 0xb3, 0x81, 0xbd, 0x7b, 0xd5,
0xf5, 0x04, 0xcf, 0x79, 0x1a, 0xc2, 0x51, 0x4b, 0xb0, 0xa6, 0xb6, 0x84, 0xec, 0xcc, 0x85, 0xed,
0xba, 0x95, 0x4f, 0x2f, 0x65, 0xc8, 0x6f, 0x11, 0x94, 0xa4, 0x64, 0x2a, 0x2c, 0x7e, 0x04, 0x39,
0x29, 0xb8, 0x90, 0xed, 0x2b, 0x92, 0xff, 0xdc, 0x2c, 0x89, 0xaf, 0x78, 0xe2, 0xef, 0xc3, 0x42,
0xdb, 0x73, 0x47, 0x23, 0xd6, 0xde, 0x56, 0x25, 0x26, 0x9d, 0x2c, 0x31, 0x9b, 0xe6, 0x3a, 0x4d,
0x90, 0x93, 0xbf, 0x20, 0x98, 0x57, 0xd9, 0xac, 0x6c, 0x19, 0xda, 0x00, 0xbd, 0x70, 0x71, 0x4f,
0xcf, 0x5a, 0xdc, 0x8f, 0x42, 0xae, 0xeb, 0xb9, 0xe3, 0x91, 0xbf, 0x92, 0x91, 0xb9, 0x23, 0xa1,
0xd9, 0x8a, 0x3e, 0xb9, 0x0e, 0x0b, 0x5a, 0x95, 0x43, 0x4a, 0x5a, 0x25, 0x59, 0xd2, 0xb6, 0xda,
0x6c, 0x18, 0xf4, 0x3b, 0xfd, 0xb0, 0x48, 0x29, 0x7a, 0xf2, 0x29, 0x82, 0xa5, 0x24, 0x09, 0xfe,
0x9e, 0x91, 0x07, 0x9c, 0xdd, 0xe9, 0xc3, 0xd9, 0xd5, 0x45, 0x71, 0xf0, 0xdf, 0x1b, 0x06, 0xde,
0xae, 0xce, 0x91, 0xca, 0x3b, 0x50, 0x34, 0xd0, 0xbc, 0x79, 0x3c, 0x64, 0x3a, 0x66, 0xf9, 0x67,
0x94, 0xac, 0x69, 0x19, 0xc7, 0x02, 0xb8, 0x94, 0xbe, 0x88, 0x78, 0xc4, 0xcf, 0xc7, 0x3c, 0x89,
0x2f, 0x82, 0xd5, 0xf1, 0x5c, 0x67, 0x26, 0x37, 0x89, 0x1d, 0xf8, 0x5b, 0x90, 0x0e, 0xdc, 0x99,
0x9c, 0x94, 0x0e, 0x5c, 0xee, 0x23, 0xa5, 0x7c, 0x46, 0xde, 0xd0, 0x24, 0x44, 0x7e, 0x83, 0x60,
0x91, 0xef, 0x91, 0x16, 0xd8, 0xe8, 0x8d, 0x87, 0x0f, 0xf1, 0x1a, 0x2c, 0xf1, 0x93, 0x1e, 0xf4,
0x55, 0x07, 0x78, 0xd0, 0x6f, 0x2b, 0x35, 0x17, 0x38, 0x5e, 0x37, 0x86, 0xad, 0x36, 0x3e, 0x06,
0x73, 0x63, 0x5f, 0x12, 0x48, 0x9d, 0x73, 0x1c, 0xdc, 0x6a, 0xe3, 0x73, 0xc6, 0x71, 0xdc, 0xd6,
0xc6, 0x35, 0x49, 0xd8, 0xf0, 0xae, 0xdd, 0xf7, 0xc2, 0xe2, 0x73, 0x06, 0x72, 0x2d, 0x7e, 0xb0,
0x8c, 0x13, 0xde, 0x81, 0x42, 0x62, 0x21, 0x10, 0x55, 0xcb, 0xe4, 0xdb, 0x50, 0x08, 0x77, 0x4f,
0x6d, 0x3c, 0x53, 0x3d, 0x40, 0x2e, 0xc3, 0xa2, 0x2c, 0xaa, 0xd3, 0x37, 0x97, 0xa6, 0x6d, 0x2e,
0xe9, 0xcd, 0xc7, 0x21, 0x2b, 0xad, 0x82, 0xc1, 0x6a, 0xdb, 0x81, 0xad, 0xb7, 0xf0, 0x6f, 0xb2,
0x02, 0x47, 0xef, 0x79, 0xf6, 0xd0, 0xef, 0x30, 0x4f, 0x10, 0x85, 0xb1, 0x4b, 0x5e, 0x83, 0x65,
0x5e, 0x48, 0x98, 0xe7, 0x6f, 0xb8, 0xe3, 0x61, 0xa0, 0x2f, 0xfa, 0xe7, 0xa1, 0x1c, 0x47, 0xab,
0x50, 0x2f, 0x43, 0xb6, 0xc5, 0x11, 0x82, 0xfb, 0x3c, 0x95, 0x00, 0xf9, 0x25, 0x02, 0x7c, 0x8d,
0x05, 0x82, 0xf5, 0xd6, 0xa6, 0x6f, 0x5c, 0xee, 0x1c, 0x3b, 0x68, 0xf5, 0x98, 0xe7, 0xeb, 0x8b,
0x8e, 0x86, 0xff, 0x1b, 0x97, 0x3b, 0x72, 0x01, 0x96, 0x63, 0x52, 0x2a, 0x9d, 0x2a, 0x90, 0x6f,
0x29, 0x9c, 0x6a, 0xaa, 0x21, 0x4c, 0x7e, 0x97, 0x86, 0xbc, 0xf4, 0x2d, 0xeb, 0xe0, 0x0b, 0x50,
0xec, 0xf0, 0x58, 0xf3, 0x46, 0x5e, 0x5f, 0x99, 0xc0, 0x6a, 0x2e, 0xee, 0x4f, 0x6a, 0x26, 0x9a,
0x9a, 0x00, 0x7e, 0x23, 0x11, 0x78, 0xcd, 0xf2, 0xde, 0xa4, 0x96, 0xfb, 0x01, 0x0f, 0xbe, 0x4d,
0xde, 0xde, 0x44, 0x18, 0x6e, 0x86, 0xe1, 0x78, 0x43, 0x65, 0x9b, 0xb8, 0xe9, 0x35, 0xbf, 0xc3,
0xc5, 0x4f, 0xd4, 0xeb, 0x91, 0xe7, 0x3a, 0x2c, 0xe8, 0xb1, 0xb1, 0xdf, 0x68, 0xb9, 0x8e, 0xe3,
0x0e, 0x1b, 0x62, 0xac, 0x13, 0x4a, 0xf3, 0x1e, 0xcd, 0xb7, 0xab, 0x04, 0xbc, 0x07, 0x73, 0x41,
0xcf, 0x73, 0xc7, 0xdd, 0x9e, 0x68, 0x3f, 0x99, 0xe6, 0xa5, 0xd9, 0xf9, 0x69, 0x0e, 0x54, 0x7f,
0xe0, 0x53, 0xdc, 0x5a, 0xac, 0xf5, 0xd0, 0x1f, 0x3b, 0x72, 0x58, 0x6a, 0x66, 0xf7, 0x27, 0x35,
0xf4, 0x06, 0x0d, 0xd1, 0xe4, 0xd3, 0x34, 0xd4, 0x44, 0x08, 0xdf, 0x17, 0x77, 0x93, 0xab, 0xae,
0x77, 0x8b, 0x05, 0x5e, 0xbf, 0x75, 0xdb, 0x76, 0x98, 0x8e, 0x8d, 0x1a, 0x14, 0x1d, 0x81, 0x7c,
0x60, 0x24, 0x07, 0x38, 0x21, 0x1d, 0x3e, 0x09, 0x20, 0xd2, 0x4e, 0xae, 0xcb, 0x3c, 0x29, 0x08,
0x8c, 0x58, 0xde, 0x88, 0x59, 0xaa, 0x31, 0xa3, 0x66, 0xca, 0x42, 0x5b, 0x49, 0x0b, 0xcd, 0xcc,
0x27, 0x34, 0x8b, 0x19, 0xeb, 0xd9, 0x78, 0xac, 0x93, 0xbf, 0x22, 0xa8, 0xde, 0xd4, 0x92, 0xbf,
0xa0, 0x39, 0xb4, 0xbe, 0xe9, 0x97, 0xa4, 0x6f, 0xe6, 0x3f, 0xd3, 0x97, 0xfc, 0xd1, 0x48, 0x79,
0xca, 0x3a, 0x5a, 0x8f, 0x0d, 0xa3, 0x5d, 0xbc, 0x0c, 0x31, 0xd3, 0x2f, 0xd1, 0x2d, 0x99, 0x84,
0x5b, 0xde, 0x8d, 0xca, 0x81, 0xd0, 0x40, 0x95, 0x83, 0xd3, 0x60, 0x79, 0xac, 0xa3, 0x9b, 0x2f,
0x4e, 0xd6, 0x78, 0xd6, 0xa1, 0x62, 0x9d, 0xfc, 0x1e, 0xc1, 0xd2, 0x35, 0x16, 0xc4, 0xaf, 0x35,
0xaf, 0x92, 0xfe, 0xef, 0xc3, 0x11, 0x43, 0x7e, 0xa5, 0xfd, 0x5b, 0x89, 0xbb, 0xcc, 0x6b, 0x91,
0xfe, 0x5b, 0xc3, 0x36, 0xfb, 0x44, 0xcd, 0x68, 0xf1, 0x6b, 0xcc, 0x5d, 0x28, 0x1a, 0x8b, 0xf8,
0x4a, 0xe2, 0x02, 0x33, 0xad, 0xa9, 0x36, 0xcb, 0x4a, 0x27, 0x39, 0xa5, 0xa9, 0xeb, 0x69, 0xd8,
0xee, 0xb7, 0x01, 0x8b, 0xb1, 0x51, 0xb0, 0x35, 0x2b, 0xb5, 0xc0, 0xde, 0x08, 0xef, 0x33, 0x21,
0x8c, 0x4f, 0x81, 0xe5, 0xb9, 0x8f, 0xf5, 0xcd, 0x74, 0x3e, 0x3a, 0x92, 0xba, 0x8f, 0xa9, 0x58,
0x22, 0x97, 0x21, 0x43, 0xdd, 0xc7, 0xb8, 0x0a, 0xe0, 0xd9, 0xc3, 0x2e, 0xbb, 0x1f, 0x0e, 0x2c,
0x25, 0x6a, 0x60, 0x0e, 0xe9, 0xaf, 0x1b, 0x70, 0xc4, 0x94, 0x48, 0xba, 0xbb, 0x0e, 0x73, 0x1c,
0xd9, 0x9f, 0xf6, 0xe8, 0x25, 0x08, 0xe5, 0xec, 0xab, 0x89, 0x78, 0xcc, 0x40, 0x84, 0xc7, 0x27,
0xa0, 0x10, 0xd8, 0x3b, 0x03, 0x76, 0x3b, 0xca, 0xf9, 0x08, 0xc1, 0x57, 0xf9, 0xac, 0x75, 0xdf,
0xb8, 0x28, 0x44, 0x08, 0x7c, 0x16, 0x96, 0x22, 0x99, 0xef, 0x7a, 0xac, 0xd3, 0xff, 0x44, 0x78,
0xb8, 0x44, 0x0f, 0xe0, 0xf1, 0x1a, 0x2c, 0x46, 0xb8, 0x6d, 0xd1, 0x76, 0x2d, 0x41, 0x9a, 0x44,
0x73, 0xdb, 0x08, 0x75, 0xdf, 0x7b, 0x34, 0xb6, 0x07, 0xa2, 0x90, 0x95, 0xa8, 0x81, 0x21, 0x7f,
0x40, 0x70, 0x44, 0xba, 0x9a, 0x4f, 0xd9, 0xaf, 0x62, 0xd4, 0xff, 0x0a, 0x01, 0x36, 0x35, 0x50,
0xa1, 0xf5, 0xff, 0xe6, 0xf3, 0x09, 0xef, 0xeb, 0x45, 0x31, 0x42, 0x4a, 0x54, 0xf4, 0x02, 0x42,
0xc2, 0x2b, 0xa0, 0x78, 0x77, 0x94, 0x33, 0xaa, 0xc4, 0xe8, 0xdb, 0x1f, 0x1f, 0xad, 0x77, 0x76,
0x03, 0xe6, 0xab, 0x09, 0x53, 0x8c, 0xd6, 0x02, 0x41, 0xe5, 0x0f, 0x3f, 0x8b, 0x0d, 0x03, 0x11,
0x35, 0x56, 0x74, 0x96, 0x42, 0x51, 0xfd, 0xc1, 0xdb, 0xc6, 0xfc, 0x7d, 0x77, 0x30, 0x8e, 0xba,
0xc4, 0x2b, 0x64, 0xe7, 0xf8, 0xe8, 0x9b, 0x55, 0xa3, 0x2f, 0xf9, 0x02, 0xc1, 0x82, 0xd6, 0x49,
0x59, 0xfe, 0x4d, 0x98, 0xfb, 0x58, 0x60, 0xa6, 0xbc, 0x08, 0x49, 0x52, 0x55, 0x6d, 0x34, 0x59,
0xfc, 0xa1, 0x55, 0xb3, 0xfe, 0x5f, 0xbb, 0x11, 0x90, 0xeb, 0x90, 0x93, 0xe2, 0xe3, 0x13, 0xe6,
0x04, 0x20, 0x9f, 0x52, 0x38, 0xac, 0xae, 0xf3, 0x04, 0x72, 0x52, 0x31, 0x15, 0x2f, 0x22, 0xa4,
0x24, 0x86, 0xaa, 0xdf, 0xb3, 0xa7, 0xa1, 0x10, 0xbe, 0xda, 0xe2, 0x22, 0xcc, 0x5d, 0xbd, 0x43,
0x7f, 0x78, 0x85, 0x6e, 0x2e, 0xa5, 0x70, 0x09, 0xf2, 0xcd, 0x2b, 0x1b, 0x37, 0x04, 0x84, 0xd6,
0xff, 0x69, 0xe9, 0x82, 0xe4, 0xe1, 0xef, 0x42, 0x56, 0x56, 0x99, 0xa3, 0x91, 0x3d, 0xcd, 0xb7,
0xd7, 0xca, 0xb1, 0x03, 0x78, 0x35, 0x13, 0xa4, 0xde, 0x44, 0xf8, 0x36, 0x14, 0x05, 0x52, 0xbd,
0xef, 0x9c, 0x48, 0x3e, 0xb3, 0xc4, 0x38, 0x9d, 0x3c, 0x64, 0xd5, 0xe0, 0x77, 0x09, 0xb2, 0xa2,
0xd0, 0x9b, 0xd2, 0x98, 0xef, 0x73, 0xa6, 0x34, 0xb1, 0x17, 0x2f, 0x92, 0xc2, 0xef, 0x80, 0xc5,
0x87, 0x11, 0x6c, 0xf4, 0x22, 0xe3, 0x59, 0xa6, 0x72, 0x34, 0x89, 0x36, 0x8e, 0x7d, 0x37, 0x7c,
0x5d, 0x3a, 0x96, 0x9c, 0xa2, 0xf5, 0xf6, 0x95, 0x83, 0x0b, 0xe1, 0xc9, 0x77, 0xe4, 0x33, 0x8b,
0x1e, 0x83, 0xf0, 0xc9, 0xf8, 0x51, 0x89, 0xa9, 0xa9, 0x52, 0x3d, 0x6c, 0x39, 0x64, 0x78, 0x13,
0x8a, 0xc6, 0x08, 0x62, 0x9a, 0xf5, 0xe0, 0xfc, 0x64, 0x9a, 0x75, 0xca, 0xdc, 0x42, 0x52, 0xf8,
0x1a, 0xe4, 0x79, 0x07, 0xe7, 0x85, 0x0c, 0x1f, 0x4f, 0x36, 0x6a, 0xa3, 0x40, 0x57, 0x4e, 0x4c,
0x5f, 0x0c, 0x19, 0x5d, 0x85, 0xc5, 0xf0, 0x2a, 0xa0, 0x82, 0xf6, 0x58, 0x32, 0x0b, 0xa7, 0xd8,
0x2b, 0x9e, 0xc9, 0x24, 0xb5, 0xfe, 0x11, 0xe4, 0xf5, 0xd4, 0x8d, 0x3f, 0x80, 0x85, 0xf8, 0xcc,
0x89, 0xff, 0xcf, 0x30, 0x4f, 0x7c, 0x94, 0xaf, 0xac, 0x1a, 0x4b, 0xd3, 0x07, 0xd5, 0xd4, 0x1a,
0x5a, 0xff, 0x48, 0xff, 0xbb, 0x68, 0xd3, 0x0e, 0x6c, 0x7c, 0x07, 0x16, 0x84, 0xf6, 0xe1, 0xff,
0x93, 0x62, 0x51, 0x7a, 0xe0, 0x9f, 0x57, 0xb1, 0x28, 0x3d, 0xf8, 0x4f, 0x2c, 0x92, 0x6a, 0x7e,
0xf8, 0xf4, 0x59, 0x35, 0xf5, 0xf9, 0xb3, 0x6a, 0xea, 0xcb, 0x67, 0x55, 0xf4, 0x93, 0xbd, 0x2a,
0xfa, 0xf5, 0x5e, 0x15, 0x3d, 0xd9, 0xab, 0xa2, 0xa7, 0x7b, 0x55, 0xf4, 0x8f, 0xbd, 0x2a, 0xfa,
0x62, 0xaf, 0x9a, 0xfa, 0x72, 0xaf, 0x8a, 0x3e, 0x7b, 0x5e, 0x4d, 0x3d, 0x7d, 0x5e, 0x4d, 0x7d,
0xfe, 0xbc, 0x9a, 0xfa, 0xf0, 0xf5, 0xaf, 0x7a, 0x4d, 0xd3, 0x27, 0xee, 0xe4, 0xc4, 0xcf, 0x5b,
0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x60, 0x34, 0x06, 0xed, 0x1b, 0x00, 0x00,
}
func (x Direction) String() string {
@ -4070,9 +4061,6 @@ func (this *Volume) Equal(that interface{}) bool {
if this.Name != that1.Name {
return false
}
if this.Value != that1.Value {
return false
}
if this.Volume != that1.Volume {
return false
}
@ -4647,10 +4635,9 @@ func (this *Volume) GoString() string {
if this == nil {
return "nil"
}
s := make([]string, 0, 7)
s := make([]string, 0, 6)
s = append(s, "&logproto.Volume{")
s = append(s, "Name: "+fmt.Sprintf("%#v", this.Name)+",\n")
s = append(s, "Value: "+fmt.Sprintf("%#v", this.Value)+",\n")
s = append(s, "Volume: "+fmt.Sprintf("%#v", this.Volume)+",\n")
s = append(s, "}")
return strings.Join(s, "")
@ -7229,13 +7216,6 @@ func (m *Volume) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x18
}
if len(m.Value) > 0 {
i -= len(m.Value)
copy(dAtA[i:], m.Value)
i = encodeVarintLogproto(dAtA, i, uint64(len(m.Value)))
i--
dAtA[i] = 0x12
}
if len(m.Name) > 0 {
i -= len(m.Name)
copy(dAtA[i:], m.Name)
@ -8103,10 +8083,6 @@ func (m *Volume) Size() (n int) {
if l > 0 {
n += 1 + l + sovLogproto(uint64(l))
}
l = len(m.Value)
if l > 0 {
n += 1 + l + sovLogproto(uint64(l))
}
if m.Volume != 0 {
n += 1 + sovLogproto(uint64(m.Volume))
}
@ -8711,7 +8687,6 @@ func (this *Volume) String() string {
}
s := strings.Join([]string{`&Volume{`,
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
`Value:` + fmt.Sprintf("%v", this.Value) + `,`,
`Volume:` + fmt.Sprintf("%v", this.Volume) + `,`,
`}`,
}, "")
@ -14405,38 +14380,6 @@ func (m *Volume) Unmarshal(dAtA []byte) error {
}
m.Name = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowLogproto
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthLogproto
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthLogproto
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Value = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Volume", wireType)

1
pkg/logproto/logproto.proto
Unescape View File

@ -409,6 +409,5 @@ message VolumeResponse {
message Volume {
string name = 1 [(gogoproto.jsontag) = "name"];
string value = 2 [(gogoproto.jsontag) = "value"];
uint64 volume = 3 [(gogoproto.jsontag) = "volume"];
}

4
pkg/querier/http_test.go
Unescape View File

@ -206,7 +206,7 @@ func TestSeriesVolumeHandler(t *testing.T) {
t.Run("it returns label volumes from the querier", func(t *testing.T) {
ret := &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
From: t1,
Through: t2,
@ -236,7 +236,7 @@ func TestSeriesVolumeHandler(t *testing.T) {
require.Equal(
t,
fmt.Sprintf(
`{"volumes":[{"name":"{foo=\"bar\"}","value":"","volume":38}],"from":%s,"through":%s}`,
`{"volumes":[{"name":"{foo=\"bar\"}","volume":38}],"from":%s,"through":%s}`,
t1, t2,
),
strings.TrimSpace(w.Body.String()),

4
pkg/querier/ingester_querier_test.go
Unescape View File

@ -349,7 +349,7 @@ func TestIngesterQuerier_SeriesVolume(t *testing.T) {
t.Run("it gets label volumes from all the ingesters", func(t *testing.T) {
ret := &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
Limit: 10,
}
@ -369,7 +369,7 @@ func TestIngesterQuerier_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 76},
{Name: `{foo="bar"}`, Volume: 76},
}, volumes.Volumes)
})

6
pkg/querier/multi_tenant_querier_test.go
Unescape View File

@ -419,7 +419,7 @@ func TestSeriesVolume(t *testing.T) {
desc: "multiple tenants are aggregated",
orgID: "1|2",
expectedSeriesVolumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 76},
{Name: `{foo="bar"}`, Volume: 76},
},
},
@ -427,7 +427,7 @@ func TestSeriesVolume(t *testing.T) {
desc: "single tenant",
orgID: "2",
expectedSeriesVolumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
},
} {
@ -481,7 +481,7 @@ func mockLabelValueRequest() *logproto.VolumeRequest {
func mockLabelValueResponse() *logproto.VolumeResponse {
return &logproto.VolumeResponse{Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
Limit: 10,
}

4
pkg/querier/querier_test.go
Unescape View File

@ -969,7 +969,7 @@ func TestQuerier_RequestingIngesters(t *testing.T) {
func TestQuerier_LabeleVolumes(t *testing.T) {
t.Run("it returns label volumes from the store", func(t *testing.T) {
ret := &logproto.VolumeResponse{Volumes: []logproto.Volume{
{Name: "foo", Value: "bar", Volume: 38},
{Name: "foo", Volume: 38},
}}
limits, err := validation.NewOverrides(defaultLimitsTestConfig(), nil)
@ -986,7 +986,7 @@ func TestQuerier_LabeleVolumes(t *testing.T) {
ctx := user.InjectOrgID(context.Background(), "test")
resp, err := querier.SeriesVolume(ctx, req)
require.NoError(t, err)
require.Equal(t, []logproto.Volume{{Name: "foo", Value: "bar", Volume: 38}}, resp.Volumes)
require.Equal(t, []logproto.Volume{{Name: "foo", Volume: 38}}, resp.Volumes)
})
}

25
pkg/querier/queryrange/codec_test.go
Unescape View File

@ -260,12 +260,12 @@ func Test_codec_DecodeResponse(t *testing.T) {
}, false,
},
{
"label volume", &http.Response{StatusCode: 200, Body: io.NopCloser(strings.NewReader(labelVolumeString))},
"label volume", &http.Response{StatusCode: 200, Body: io.NopCloser(strings.NewReader(seriesVolumeString))},
&logproto.VolumeRequest{},
&VolumeResponse{
Response: &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
Limit: 100,
},
@ -518,17 +518,17 @@ func Test_codec_EncodeResponse(t *testing.T) {
}, indexStatsString, false,
},
{
"label volume",
"series volume",
&VolumeResponse{
Response: &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
Limit: 100,
From: 0,
Through: 0,
},
}, labelVolumeString, false,
}, seriesVolumeString, false,
},
}
for _, tt := range tests {
@ -1026,12 +1026,10 @@ func Test_codec_MergeResponse_Volume(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: `{job="prometheus"}`,
Value: "",
Volume: 150,
},
{
Name: `{job="loki"}`,
Value: "",
Volume: 300,
},
},
@ -1045,12 +1043,10 @@ func Test_codec_MergeResponse_Volume(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: `{job="prometheus"}`,
Value: "",
Volume: 100,
},
{
Name: `{job="loki"}`,
Value: "",
Volume: 200,
},
},
@ -1086,12 +1082,10 @@ func Test_codec_MergeResponse_Volume(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: `{job="prometheus"}`,
Value: "",
Volume: 150,
},
{
Name: `{job="loki"}`,
Value: "",
Volume: 300,
},
},
@ -1105,12 +1099,10 @@ func Test_codec_MergeResponse_Volume(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: `{job="prometheus"}`,
Value: "",
Volume: 100,
},
{
Name: `{job="loki"}`,
Value: "",
Volume: 200,
},
},
@ -1144,12 +1136,10 @@ func Test_codec_MergeResponse_Volume(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: `{job="prometheus"}`,
Value: "",
Volume: 150,
},
{
Name: `{cluster="dev"}`,
Value: "",
Volume: 300,
},
},
@ -1163,12 +1153,10 @@ func Test_codec_MergeResponse_Volume(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: `{job="prometheus"}`,
Value: "",
Volume: 100,
},
{
Name: `{cluster="dev"}`,
Value: "",
Volume: 200,
},
},
@ -1428,14 +1416,13 @@ var (
"bytes": 3,
"entries": 4
}`
labelVolumeString = `{
seriesVolumeString = `{
"from": 0,
"limit": 100,
"through": 0,
"volumes": [
{
"name": "{foo=\"bar\"}",
"value": "",
"volume": 38
}
]

4
pkg/querier/queryrange/roundtrip_test.go
Unescape View File

@ -132,8 +132,8 @@ var (
seriesVolume = logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 1024},
{Name: `{bar="baz"}`, Value: "", Volume: 3350},
{Name: `{foo="bar"}`, Volume: 1024},
{Name: `{bar="baz"}`, Volume: 3350},
},
From: model.TimeFromUnix(testTime.Add(-4 * time.Hour).Unix()),
Through: model.TimeFromUnix(testTime.Add(-1 * time.Hour).Unix()),

12
pkg/querier/queryrange/split_by_interval_test.go
Unescape View File

@ -872,8 +872,8 @@ func Test_seriesvolume_splitByInterval_Do(t *testing.T) {
return &VolumeResponse{
Response: &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{bar="baz"}`, Value: "", Volume: 28},
{Name: `{foo="bar"}`, Volume: 38},
{Name: `{bar="baz"}`, Volume: 28},
},
From: from,
Through: through,
@ -912,10 +912,10 @@ func Test_seriesvolume_splitByInterval_Do(t *testing.T) {
return &VolumeResponse{
Response: &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{bar="baz"}`, Value: "", Volume: 28},
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{fizz="buzz"}`, Value: "", Volume: 28},
{Name: `{foo="bar"}`, Volume: 38},
{Name: `{bar="baz"}`, Volume: 28},
{Name: `{foo="bar"}`, Volume: 38},
{Name: `{fizz="buzz"}`, Volume: 28},
},
From: from,
Through: through,

8
pkg/storage/async_store_test.go
Unescape View File

@ -315,7 +315,7 @@ func TestSeriesVolume(t *testing.T) {
store.On("SeriesVolume", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(
&logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
Limit: 10,
}, nil)
@ -323,7 +323,7 @@ func TestSeriesVolume(t *testing.T) {
ingesterQuerier := newIngesterQuerierMock()
ingesterQuerier.On("SeriesVolume", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{bar="baz"}`, Value: "", Volume: 38},
{Name: `{bar="baz"}`, Volume: 38},
},
Limit: 10,
}, nil)
@ -339,8 +339,8 @@ func TestSeriesVolume(t *testing.T) {
require.Equal(t, &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{bar="baz"}`, Value: "", Volume: 38},
{Name: `{foo="bar"}`, Value: "", Volume: 38},
{Name: `{bar="baz"}`, Volume: 38},
{Name: `{foo="bar"}`, Volume: 38},
},
Limit: 10,
}, vol)

8
pkg/storage/stores/composite_store_test.go
Unescape View File

@ -314,24 +314,24 @@ func TestSeriesVolume(t *testing.T) {
cs := compositeStore{
stores: []compositeStoreEntry{
{model.TimeFromUnix(10), mockStoreSeriesVolume{mockStore: mockStore(0), value: &logproto.VolumeResponse{
Volumes: []logproto.Volume{{Name: `{foo="bar"}`, Value: "", Volume: 15}}, Limit: 10,
Volumes: []logproto.Volume{{Name: `{foo="bar"}`, Volume: 15}}, Limit: 10,
}}},
{model.TimeFromUnix(20), mockStoreSeriesVolume{mockStore: mockStore(1), value: &logproto.VolumeResponse{
Volumes: []logproto.Volume{{Name: `{foo="bar"}`, Value: "", Volume: 30}}, Limit: 10,
Volumes: []logproto.Volume{{Name: `{foo="bar"}`, Volume: 30}}, Limit: 10,
}}},
},
}
volumes, err := cs.SeriesVolume(context.Background(), "fake", 10001, 20001, 10, nil)
require.NoError(t, err)
require.Equal(t, []logproto.Volume{{Name: `{foo="bar"}`, Value: "", Volume: 45}}, volumes.Volumes)
require.Equal(t, []logproto.Volume{{Name: `{foo="bar"}`, Volume: 45}}, volumes.Volumes)
})
t.Run("it returns an error if any store returns an error", func(t *testing.T) {
cs := compositeStore{
stores: []compositeStoreEntry{
{model.TimeFromUnix(10), mockStoreSeriesVolume{mockStore: mockStore(0), value: &logproto.VolumeResponse{
Volumes: []logproto.Volume{{Name: `{foo="bar"}`, Value: "", Volume: 15}}, Limit: 10,
Volumes: []logproto.Volume{{Name: `{foo="bar"}`, Volume: 15}}, Limit: 10,
}}},
{model.TimeFromUnix(20), mockStoreSeriesVolume{mockStore: mockStore(1), err: errors.New("something bad")}},
},

5
pkg/storage/stores/index/seriesvolume/volume.go
Unescape View File

@ -79,17 +79,12 @@ func MapToSeriesVolumeResponse(mergedVolumes map[string]uint64, limit int, from,
for name, size := range mergedVolumes {
volumes = append(volumes, logproto.Volume{
Name: name,
Value: "",
Volume: size,
})
}
sort.Slice(volumes, func(i, j int) bool {
if volumes[i].Volume == volumes[j].Volume {
if volumes[i].Name == volumes[j].Name {
return volumes[i].Value < volumes[j].Value
}
return volumes[i].Name < volumes[j].Name
}

37
pkg/storage/stores/index/seriesvolume/volume_test.go
Unescape View File

@ -30,22 +30,18 @@ func Test_AddVolumes(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 50,
},
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 25,
},
{
Name: "{job: \"prometheus\"}",
Value: "",
Volume: 10,
},
{
Name: "{job: \"loki\"}",
Value: "",
Volume: 5,
},
},
@ -61,22 +57,18 @@ func Test_AddVolumes(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 100,
},
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 50,
},
{
Name: "{job: \"prometheus\"}",
Value: "",
Volume: 20,
},
{
Name: "{job: \"loki\"}",
Value: "",
Volume: 10,
},
},
@ -95,22 +87,18 @@ func Test_AddVolumes(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 50,
},
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 25,
},
{
Name: "{job: \"prometheus\"}",
Value: "",
Volume: 10,
},
{
Name: "{job: \"loki\"}",
Value: "",
Volume: 5,
},
},
@ -141,12 +129,10 @@ func Test_AddVolumes(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{job: \"prometheus\"}",
Value: "",
Volume: 40,
},
{
Name: "{job: \"loki\"}",
Value: "",
Volume: 25,
},
},
@ -165,12 +151,10 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 25,
},
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 50,
},
},
@ -180,17 +164,14 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 25,
},
{
Name: "{job: \"foo\"}",
Value: "",
Volume: 15,
},
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 50,
},
},
@ -204,17 +185,14 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 100,
},
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 50,
},
{
Name: "{job: \"foo\"}",
Value: "",
Volume: 15,
},
},
@ -231,12 +209,10 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 25,
},
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 50,
},
},
@ -246,17 +222,14 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 25,
},
{
Name: "{job: \"foo\"}",
Value: "",
Volume: 15,
},
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 50,
},
},
@ -270,12 +243,10 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 100,
},
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 50,
},
},
@ -296,12 +267,10 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 25,
},
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 50,
},
},
@ -313,17 +282,14 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 25,
},
{
Name: "{job: \"foo\"}",
Value: "",
Volume: 15,
},
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 50,
},
},
@ -339,17 +305,14 @@ func Test_Merge(t *testing.T) {
Volumes: []logproto.Volume{
{
Name: "{cluster: \"prod\"}",
Value: "",
Volume: 100,
},
{
Name: "{cluster: \"dev\"}",
Value: "",
Volume: 50,
},
{
Name: "{job: \"foo\"}",
Value: "",
Volume: 15,
},
},

4
pkg/storage/stores/shipper/indexgateway/gateway_test.go
Unescape View File

@ -248,7 +248,7 @@ func TestGateway_QueryIndex_multistore(t *testing.T) {
func TestSeriesVolume(t *testing.T) {
indexQuerier := newIngesterQuerierMock()
indexQuerier.On("SeriesVolume", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&logproto.VolumeResponse{Volumes: []logproto.Volume{
{Name: "bar", Value: "baz", Volume: 38},
{Name: "bar", Volume: 38},
}}, nil)
gateway, err := NewIndexGateway(Config{}, util_log.Logger, nil, indexQuerier, nil)
@ -259,7 +259,7 @@ func TestSeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, &logproto.VolumeResponse{Volumes: []logproto.Volume{
{Name: "bar", Value: "baz", Volume: 38},
{Name: "bar", Volume: 38},
}}, vol)
}

10
pkg/storage/stores/tsdb/index_client_test.go
Unescape View File

@ -280,10 +280,10 @@ func TestIndexClient_SeriesVolume(t *testing.T) {
require.Equal(t, &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 200 * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Value: "", Volume: 100 * 1024},
{Name: `{fizz="buzz"}`, Value: "", Volume: 100 * 1024},
{Name: `{ping="pong"}`, Value: "", Volume: 100 * 1024},
{Name: `{foo="bar"}`, Volume: 200 * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Volume: 100 * 1024},
{Name: `{fizz="buzz"}`, Volume: 100 * 1024},
{Name: `{ping="pong"}`, Volume: 100 * 1024},
},
Limit: 10,
From: from,
@ -297,7 +297,7 @@ func TestIndexClient_SeriesVolume(t *testing.T) {
require.Equal(t, &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: 200 * 1024},
{Name: `{foo="bar"}`, Volume: 200 * 1024},
},
Limit: 1,
From: from,

16
pkg/storage/stores/tsdb/single_file_index_test.go
Unescape View File

@ -431,8 +431,8 @@ func TestTSDBIndex_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{fizz="fizz", foo="bar"}`, Value: "", Volume: (30 + 40) * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Value: "", Volume: (10 + 20) * 1024},
{Name: `{fizz="fizz", foo="bar"}`, Volume: (30 + 40) * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Volume: (10 + 20) * 1024},
},
Limit: 10,
From: from,
@ -450,8 +450,8 @@ func TestTSDBIndex_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{fizz="fizz", foo="bar"}`, Value: "", Volume: (30 + 40) * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Value: "", Volume: (10 + 20) * 1024},
{Name: `{fizz="fizz", foo="bar"}`, Volume: (30 + 40) * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Volume: (10 + 20) * 1024},
},
Limit: 10,
From: from,
@ -479,7 +479,7 @@ func TestTSDBIndex_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{foo="bar"}`, Value: "", Volume: (10 + 20 + 30 + 40) * 1024},
{Name: `{foo="bar"}`, Volume: (10 + 20 + 30 + 40) * 1024},
},
Limit: 10,
From: from,
@ -497,8 +497,8 @@ func TestTSDBIndex_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{fizz="fizz", foo="bar"}`, Value: "", Volume: (30 + 40) * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Value: "", Volume: (10 + 20) * 1024},
{Name: `{fizz="fizz", foo="bar"}`, Volume: (30 + 40) * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Volume: (10 + 20) * 1024},
},
Limit: 10,
From: from,
@ -516,7 +516,7 @@ func TestTSDBIndex_SeriesVolume(t *testing.T) {
require.NoError(t, err)
require.Equal(t, &logproto.VolumeResponse{
Volumes: []logproto.Volume{
{Name: `{fizz="fizz", foo="bar"}`, Value: "", Volume: (30 + 40) * 1024},
{Name: `{fizz="fizz", foo="bar"}`, Volume: (30 + 40) * 1024},
{Name: `{fizz="buzz", foo="bar"}`, Volume: (10 + 20) * 1024},
},
Limit: 10,

Write Preview
Loading…
Cancel
Save