Skip to content

Commit 7de3263

Browse files
cheb0cheb0
committed
linter fixes
1 parent 5288d49 commit 7de3263

9 files changed

Lines changed: 51 additions & 55 deletions

File tree

‎frac/fraction_concurrency_test.go‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,15 @@ func TestConcurrentAppendAndQuery(t *testing.T) {
147147
readTest(t, sealed, numReaders, numQueries, docs, fromTime, toTime, mapping)
148148
}
149149

150+
const (
151+
scheduler = "scheduler"
152+
database = "database"
153+
bus = "bus"
154+
proxy = "proxy"
155+
gateway = "gateway"
156+
kafka = "kafka"
157+
)
158+
150159
func readTest(t *testing.T, fraction Fraction, numReaders, numQueries int, docs []*testDoc, fromTime, toTime time.Time, mapping seq.Mapping) {
151160
readersGroup, ctx := errgroup.WithContext(t.Context())
152161

@@ -173,7 +182,7 @@ func readTest(t *testing.T, fraction Fraction, numReaders, numQueries int, docs
173182
case 1:
174183
query = "service:gateway"
175184
filter = func(doc *testDoc) bool {
176-
return doc.service == "gateway"
185+
return doc.service == gateway
177186
}
178187
case 2:
179188
query = "level:2"
@@ -198,7 +207,7 @@ func readTest(t *testing.T, fraction Fraction, numReaders, numQueries int, docs
198207
case 6:
199208
query = "service:gateway AND level:3"
200209
filter = func(doc *testDoc) bool {
201-
return doc.service == "gateway" && doc.level == 3
210+
return doc.service == gateway && doc.level == 3
202211
}
203212
}
204213

@@ -264,7 +273,7 @@ type testDoc = struct {
264273
}
265274

266275
func generatesMessages(numMessages, bulkSize int) ([]*testDoc, [][]string, time.Time, time.Time) {
267-
services := []string{"gateway", "proxy", "scheduler", "database", "bus", "kafka"}
276+
services := []string{gateway, proxy, scheduler, database, bus, kafka}
268277
messages := []string{
269278
"request started", "request completed", "processing timed out",
270279
"processing data", "processing failed", "processing retry",

‎frac/fraction_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -739,14 +739,14 @@ func (s *FractionTestSuite) TestBasicAggregation() {
739739
"message:*",
740740
withAggQuery(processor.AggQuery{GroupBy: aggField("service")})),
741741
[]map[string]uint64{
742-
{"gateway": 3, "proxy": 2, "scheduler": 1},
742+
{gateway: 3, proxy: 2, scheduler: 1},
743743
})
744744
assertAggSearch(
745745
s.query(
746746
"message:good",
747747
withAggQuery(processor.AggQuery{GroupBy: aggField("service")})),
748748
[]map[string]uint64{
749-
{"gateway": 2, "proxy": 1},
749+
{gateway: 2, proxy: 1},
750750
})
751751
assertAggSearch(
752752
s.query(
@@ -761,7 +761,7 @@ func (s *FractionTestSuite) TestBasicAggregation() {
761761
withAggQuery(processor.AggQuery{GroupBy: aggField("service")}),
762762
withAggQuery(processor.AggQuery{GroupBy: aggField("level")})),
763763
[]map[string]uint64{
764-
{"gateway": 3, "proxy": 2, "scheduler": 1},
764+
{gateway: 3, proxy: 2, "scheduler": 1},
765765
{"1": 4, "2": 1, "3": 1},
766766
})
767767
}
@@ -1224,28 +1224,28 @@ func (s *FractionTestSuite) TestSearchLargeFrac() {
12241224
{
12251225
name: "NOT service:bus",
12261226
query: "NOT service:bus",
1227-
filter: func(doc *testDoc) bool { return doc.service != "bus" },
1227+
filter: func(doc *testDoc) bool { return doc.service != bus },
12281228
fromTime: fromTime,
12291229
toTime: toTime,
12301230
},
12311231
{
12321232
name: "NOT service:bus (time range)",
12331233
query: "NOT service:bus",
1234-
filter: func(doc *testDoc) bool { return doc.service != "bus" },
1234+
filter: func(doc *testDoc) bool { return doc.service != bus },
12351235
fromTime: fromTime,
12361236
toTime: midTime,
12371237
},
12381238
{
12391239
name: "service:proxy (time range)",
12401240
query: "service:proxy",
1241-
filter: func(doc *testDoc) bool { return doc.service == "proxy" },
1241+
filter: func(doc *testDoc) bool { return doc.service == proxy },
12421242
fromTime: fromTime,
12431243
toTime: midTime,
12441244
},
12451245
{
12461246
name: "service:scheduler (time range + limit)",
12471247
query: "service:scheduler",
1248-
filter: func(doc *testDoc) bool { return doc.service == "scheduler" },
1248+
filter: func(doc *testDoc) bool { return doc.service == scheduler },
12491249
fromTime: fromTime,
12501250
toTime: midTime,
12511251
limit: 100,
@@ -1313,7 +1313,7 @@ func (s *FractionTestSuite) TestSearchLargeFrac() {
13131313
name: "service:gateway AND message:processing AND message:retry AND level:5",
13141314
query: "service:gateway AND message:processing AND message:retry AND level:5",
13151315
filter: func(doc *testDoc) bool {
1316-
return doc.service == "gateway" && strings.Contains(doc.message, "processing") &&
1316+
return doc.service == gateway && strings.Contains(doc.message, "processing") &&
13171317
strings.Contains(doc.message, "retry") && doc.level == 5
13181318
},
13191319
fromTime: fromTime,
@@ -1350,7 +1350,7 @@ func (s *FractionTestSuite) TestSearchLargeFrac() {
13501350
query: "(service:gateway OR service:proxy OR service:scheduler) AND " +
13511351
"(message:request OR message:failed) AND level:[1 to 3]",
13521352
filter: func(doc *testDoc) bool {
1353-
return (doc.service == "gateway" || doc.service == "proxy" || doc.service == "scheduler") &&
1353+
return (doc.service == gateway || doc.service == proxy || doc.service == "scheduler") &&
13541354
(strings.Contains(doc.message, "request") || strings.Contains(doc.message, "failed")) &&
13551355
(doc.level >= 1 && doc.level <= 3)
13561356
},
@@ -1361,7 +1361,7 @@ func (s *FractionTestSuite) TestSearchLargeFrac() {
13611361
name: "service:gateway AND NOT (message:request OR message:timed OR level:[0 to 3])",
13621362
query: "service:gateway AND NOT (message:request OR message:timed OR level:[0 to 3])",
13631363
filter: func(doc *testDoc) bool {
1364-
return doc.service == "gateway" &&
1364+
return doc.service == gateway &&
13651365
!(strings.Contains(doc.message, "request") ||
13661366
strings.Contains(doc.message, "timed") ||
13671367
(doc.level >= 0 && doc.level <= 3))
@@ -1373,7 +1373,7 @@ func (s *FractionTestSuite) TestSearchLargeFrac() {
13731373
name: "service:proxy AND NOT level:5 AND NOT pod:pod-2* AND NOT client_ip:ip_range(192.168.19.0,192.168.19.255)",
13741374
query: "service:proxy AND NOT level:5 AND NOT pod:pod-2* AND NOT client_ip:ip_range(192.168.19.0,192.168.19.255)",
13751375
filter: func(doc *testDoc) bool {
1376-
return doc.service == "proxy" &&
1376+
return doc.service == proxy &&
13771377
doc.level != 5 &&
13781378
!strings.Contains(doc.pod, "pod-2") &&
13791379
!strings.Contains(doc.clientIp, "192.168.19")
@@ -1430,7 +1430,7 @@ func (s *FractionTestSuite) TestSearchLargeFrac() {
14301430
for _, ord := range orders {
14311431
ips := make(map[string]map[string]struct{})
14321432
for _, doc := range testDocs {
1433-
if doc.service != "kafka" {
1433+
if doc.service != kafka {
14341434
continue
14351435
}
14361436
if ips[doc.pod] == nil {

‎frac/processor/aggregator.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,11 +383,9 @@ type SourcedNodeIterator struct {
383383

384384
lastID node.CmpLID
385385
lastSource uint32
386-
387-
reverse bool
388386
}
389387

390-
func NewSourcedNodeIterator(sourced node.Sourced, ti tokenIndex, tids []uint32, limit iteratorLimit, reverse bool) *SourcedNodeIterator {
388+
func NewSourcedNodeIterator(sourced node.Sourced, ti tokenIndex, tids []uint32, limit iteratorLimit) *SourcedNodeIterator {
391389
lastID, lastSource := sourced.NextSourced()
392390
return &SourcedNodeIterator{
393391
sourcedNode: sourced,
@@ -398,7 +396,6 @@ func NewSourcedNodeIterator(sourced node.Sourced, ti tokenIndex, tids []uint32,
398396
countBySource: make(map[uint32]int),
399397
lastID: lastID,
400398
lastSource: lastSource,
401-
reverse: reverse,
402399
}
403400
}
404401

‎frac/processor/aggregator_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func TestSingleSourceCountAggregator(t *testing.T) {
2828
{1, 2, 4, 5, 8, 11, 12},
2929
}
3030

31-
source := node.BuildORTreeAgg(node.MakeStaticNodes(sources), false)
32-
iter := NewSourcedNodeIterator(source, nil, nil, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens}, false)
31+
source := node.BuildORTreeAgg(node.MakeStaticNodes(sources))
32+
iter := NewSourcedNodeIterator(source, nil, nil, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens})
3333
agg := NewSingleSourceCountAggregator(iter, provideExtractTimeFunc(nil, nil, 0))
3434
for _, id := range searchDocs {
3535
if err := agg.Next(node.NewCmpLIDOrderDesc(id)); err != nil {
@@ -56,8 +56,8 @@ func TestSingleSourceCountAggregatorWithInterval(t *testing.T) {
5656
{1, 2, 4, 5, 8, 11, 12},
5757
}
5858

59-
source := node.BuildORTreeAgg(node.MakeStaticNodes(sources), false)
60-
iter := NewSourcedNodeIterator(source, nil, nil, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens}, false)
59+
source := node.BuildORTreeAgg(node.MakeStaticNodes(sources))
60+
iter := NewSourcedNodeIterator(source, nil, nil, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens})
6161

6262
agg := NewSingleSourceCountAggregator(iter, func(l seq.LID) seq.MID {
6363
return seq.MID(l) % 3
@@ -96,7 +96,7 @@ func BenchmarkAggDeep(b *testing.B) {
9696
b.Run(fmt.Sprintf("size=%d", s), func(b *testing.B) {
9797
v, _ := Generate(s)
9898
src := node.NewSourcedNodeWrapper(node.NewStatic(v, false), 0)
99-
iter := NewSourcedNodeIterator(src, nil, make([]uint32, 1), iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens}, false)
99+
iter := NewSourcedNodeIterator(src, nil, make([]uint32, 1), iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens})
100100
n := NewSingleSourceCountAggregator(iter, provideExtractTimeFunc(nil, nil, 0))
101101
vals, _ := Generate(s)
102102

@@ -127,9 +127,9 @@ func BenchmarkAggWide(b *testing.B) {
127127
slices.Sort(wide[i])
128128
}
129129

130-
source := node.BuildORTreeAgg(node.MakeStaticNodes(wide), false)
130+
source := node.BuildORTreeAgg(node.MakeStaticNodes(wide))
131131

132-
iter := NewSourcedNodeIterator(source, nil, make([]uint32, len(wide)), iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens}, false)
132+
iter := NewSourcedNodeIterator(source, nil, make([]uint32, len(wide)), iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens})
133133
n := NewSingleSourceCountAggregator(iter, provideExtractTimeFunc(nil, nil, 0))
134134
vals, _ := Generate(s)
135135

@@ -195,8 +195,8 @@ func TestTwoSourceAggregator(t *testing.T) {
195195

196196
fieldTIDs := []uint32{42, 73}
197197
groupByTIDs := []uint32{1, 2}
198-
groupIterator := NewSourcedNodeIterator(groupBy, dp, groupByTIDs, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens}, false)
199-
fieldIterator := NewSourcedNodeIterator(field, dp, fieldTIDs, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens}, false)
198+
groupIterator := NewSourcedNodeIterator(groupBy, dp, groupByTIDs, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens})
199+
fieldIterator := NewSourcedNodeIterator(field, dp, fieldTIDs, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens})
200200
limits := AggLimits{}
201201
aggregator := NewGroupAndFieldAggregator(
202202
fieldIterator, groupIterator, provideExtractTimeFunc(nil, nil, 0), true, false, limits,
@@ -248,7 +248,7 @@ func TestSingleTreeCountAggregator(t *testing.T) {
248248
},
249249
}
250250

251-
iter := NewSourcedNodeIterator(field, dp, []uint32{0}, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens}, false)
251+
iter := NewSourcedNodeIterator(field, dp, []uint32{0}, iteratorLimit{limit: 0, err: consts.ErrTooManyGroupTokens})
252252
aggregator := NewSingleSourceCountAggregator(iter, provideExtractTimeFunc(nil, nil, 0))
253253

254254
r.NoError(aggregator.Next(node.NewCmpLIDOrderDesc(1)))
@@ -285,8 +285,8 @@ func TestAggregatorLimitExceeded(t *testing.T) {
285285
const limit = 1
286286

287287
for _, expectedErr := range []error{consts.ErrTooManyGroupTokens, consts.ErrTooManyFieldTokens} {
288-
source := node.BuildORTreeAgg(node.MakeStaticNodes(sources), false)
289-
iter := NewSourcedNodeIterator(source, nil, nil, iteratorLimit{limit: limit, err: expectedErr}, false)
288+
source := node.BuildORTreeAgg(node.MakeStaticNodes(sources))
289+
iter := NewSourcedNodeIterator(source, nil, nil, iteratorLimit{limit: limit, err: expectedErr})
290290
agg := NewSingleSourceCountAggregator(iter, provideExtractTimeFunc(nil, nil, 0))
291291

292292
var limitErr error

‎frac/processor/eval_tree.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,6 @@ func iteratorFromLiteral(
217217
stats.AggNodesTotal += len(lidsTids)*2 - 1
218218
}
219219

220-
sourcedNode := node.BuildORTreeAgg(lidsTids, order.IsReverse())
221-
return NewSourcedNodeIterator(sourcedNode, ti, tids, iteratorLimit, order.IsReverse()), nil
220+
sourcedNode := node.BuildORTreeAgg(lidsTids)
221+
return NewSourcedNodeIterator(sourcedNode, ti, tids, iteratorLimit), nil
222222
}

‎node/builder.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ func BuildORTree(nodes []Node) Node {
1313
)
1414
}
1515

16-
func BuildORTreeAgg(nodes []Node, reverse bool) Sourced {
16+
func BuildORTreeAgg(nodes []Node) Sourced {
1717
return TreeFold(
18-
func(l, r Sourced) Sourced { return NewNodeOrAgg(l, r, reverse) },
18+
NewNodeOrAgg,
1919
emptyNodeSourced,
2020
WrapWithSource(nodes),
2121
)

‎node/cmp_lid.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type CmpLID struct {
1414

1515
func NullCmpLID() CmpLID {
1616
// reverse flag does not matter, as null values are never unpacked
17-
return NewCmpLID(math.MaxUint32, false)
17+
return NewCmpLIDOrderDesc(math.MaxUint32)
1818
}
1919

2020
// NewCmpLIDOrderDesc returns LIDs for desc sort order
@@ -34,15 +34,7 @@ func NewCmpLIDOrderAsc(lid uint32) CmpLID {
3434
}
3535
}
3636

37-
func NewCmpLID(lid uint32, reverse bool) CmpLID {
38-
if reverse {
39-
return NewCmpLIDOrderAsc(lid)
40-
} else {
41-
return NewCmpLIDOrderDesc(lid)
42-
}
43-
}
44-
45-
// Less compares two values. It also does an implicit null check, since we store math.MaxUint32 for null values.
37+
// Less compares two values. It also does an implicit null check, since we store math.MaxUint32 in lid field for null values.
4638
// Which means if we call x.Less(y), then we now for sure that x is not null. Therefore, this Less call can work
4739
// as both "null check + less" combo.
4840
func (c CmpLID) Less(other CmpLID) bool {

‎node/node_or.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ func (n *nodeOr) Next() CmpLID {
5151
}
5252

5353
type nodeOrAgg struct {
54-
reverse bool
55-
5654
left Sourced
5755
right Sourced
5856

@@ -67,8 +65,8 @@ func (n *nodeOrAgg) String() string {
6765
return fmt.Sprintf("(%s OR %s)", n.left.String(), n.right.String())
6866
}
6967

70-
func NewNodeOrAgg(left, right Sourced, reverse bool) Sourced {
71-
n := &nodeOrAgg{reverse: reverse, left: left, right: right}
68+
func NewNodeOrAgg(left, right Sourced) Sourced {
69+
n := &nodeOrAgg{left: left, right: right}
7270
n.readLeft()
7371
n.readRight()
7472
return n

‎node/node_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,32 +139,32 @@ func TestNodeTreeBuilding(t *testing.T) {
139139
t.Run("size_0", func(t *testing.T) {
140140
dn := MakeStaticNodes(make([][]uint32, 0))
141141
assert.True(t, isEmptyNode(BuildORTree(dn)), "expected empty node")
142-
assert.True(t, isEmptyNode(BuildORTreeAgg(dn, false)), "expected empty node")
142+
assert.True(t, isEmptyNode(BuildORTreeAgg(dn)), "expected empty node")
143143
})
144144
t.Run("size_1", func(t *testing.T) {
145145
dn := MakeStaticNodes(make([][]uint32, 1))
146146
assert.Equal(t, "STATIC", BuildORTree(dn).String())
147-
assert.Equal(t, "SOURCED", BuildORTreeAgg(dn, false).String())
147+
assert.Equal(t, "SOURCED", BuildORTreeAgg(dn).String())
148148
})
149149
t.Run("size_2", func(t *testing.T) {
150150
dn := MakeStaticNodes(make([][]uint32, 2))
151151
assert.Equal(t, "(STATIC OR STATIC)", BuildORTree(dn).String())
152-
assert.Equal(t, "(SOURCED OR SOURCED)", BuildORTreeAgg(dn, false).String())
152+
assert.Equal(t, "(SOURCED OR SOURCED)", BuildORTreeAgg(dn).String())
153153
})
154154
t.Run("size_3", func(t *testing.T) {
155155
dn := MakeStaticNodes(make([][]uint32, 3))
156156
assert.Equal(t, "(STATIC OR (STATIC OR STATIC))", BuildORTree(dn).String())
157-
assert.Equal(t, "(SOURCED OR (SOURCED OR SOURCED))", BuildORTreeAgg(dn, false).String())
157+
assert.Equal(t, "(SOURCED OR (SOURCED OR SOURCED))", BuildORTreeAgg(dn).String())
158158
})
159159
t.Run("size_4", func(t *testing.T) {
160160
dn := MakeStaticNodes(make([][]uint32, 4))
161161
assert.Equal(t, "((STATIC OR STATIC) OR (STATIC OR STATIC))", BuildORTree(dn).String())
162-
assert.Equal(t, "((SOURCED OR SOURCED) OR (SOURCED OR SOURCED))", BuildORTreeAgg(dn, false).String())
162+
assert.Equal(t, "((SOURCED OR SOURCED) OR (SOURCED OR SOURCED))", BuildORTreeAgg(dn).String())
163163
})
164164
t.Run("size_5", func(t *testing.T) {
165165
dn := MakeStaticNodes(make([][]uint32, 5))
166166
assert.Equal(t, "((STATIC OR STATIC) OR (STATIC OR (STATIC OR STATIC)))", BuildORTree(dn).String())
167-
assert.Equal(t, "((SOURCED OR SOURCED) OR (SOURCED OR (SOURCED OR SOURCED)))", BuildORTreeAgg(dn, false).String())
167+
assert.Equal(t, "((SOURCED OR SOURCED) OR (SOURCED OR (SOURCED OR SOURCED)))", BuildORTreeAgg(dn).String())
168168
})
169169
t.Run("size_6", func(t *testing.T) {
170170
labels := BuildORTree(MakeStaticNodes(make([][]uint32, 6))).String()

0 commit comments

Comments
 (0)