Skip to content

fix: linter warnings on test files #2159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abhinavdangeti merged 2 commits into from
Mar 10, 2025
Merged

fix: linter warnings on test files #2159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd84221
fix: linter warnings
christiangda Mar 6, 2025
fc0c52c
fix: remove unnecessary errChan to handler errors
christiangda Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions geo/versus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4145,16 +4145,12 @@ func TestDecodeGeoHashVersus(t *testing.T) {

func compareLatitude(box []float64, v float64) bool {
avg := (box[0] + box[1]) / 2
if compareGeo(avg, v) != 0 {
return false
}
return true

return compareGeo(avg, v) == 0
}

func compareLogitude(box []float64, v float64) bool {
avg := (box[2] + box[3]) / 2
if compareGeo(avg, v) != 0 {
return false
}
return true

return compareGeo(avg, v) == 0
}
86 changes: 56 additions & 30 deletions index/scorch/mergeplan/merge_plan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,32 @@ func TestSimplePlan(t *testing.T) {
ExpectPlan *MergePlan
ExpectErr error
}{
{"nil segments",
nil, nil, nil, nil},
{"empty segments",
[]Segment{}, nil, nil, nil},
{"1 segment",
{
"nil segments",
nil, nil, nil, nil,
},
{
"empty segments",
[]Segment{},
nil, nil, nil,
},
{
"1 segment",
[]Segment{segs[1]},
nil,
nil,
nil,
},
{"2 segments",
{
"2 segments",
[]Segment{
segs[1],
segs[2],
},
nil,
&MergePlan{
Tasks: []*MergeTask{
&MergeTask{
{
Segments: []Segment{
segs[2],
segs[1],
Expand All @@ -92,7 +99,8 @@ func TestSimplePlan(t *testing.T) {
},
nil,
},
{"3 segments",
{
"3 segments",
[]Segment{
segs[1],
segs[2],
Expand All @@ -101,7 +109,7 @@ func TestSimplePlan(t *testing.T) {
nil,
&MergePlan{
Tasks: []*MergeTask{
&MergeTask{
{
Segments: []Segment{
segs[9],
segs[2],
Expand All @@ -112,7 +120,8 @@ func TestSimplePlan(t *testing.T) {
},
nil,
},
{"many segments",
{
"many segments",
[]Segment{
segs[1],
segs[2],
Expand All @@ -130,7 +139,7 @@ func TestSimplePlan(t *testing.T) {
},
&MergePlan{
Tasks: []*MergeTask{
&MergeTask{
{
Segments: []Segment{
segs[6],
segs[5],
Expand All @@ -144,14 +153,18 @@ func TestSimplePlan(t *testing.T) {

for testi, test := range tests {
plan, err := Plan(test.Segments, test.Options)

if err != test.ExpectErr {
testj, _ := json.Marshal(&test)
t.Errorf("testi: %d, test: %s, got err: %v",
testi, testj, err)

t.Errorf("testi: %d, test: %s, got err: %v", testi, testj, err)
}

if !reflect.DeepEqual(plan, test.ExpectPlan) {
testj, _ := json.Marshal(&test)

planj, _ := json.Marshal(&plan)

t.Errorf("testi: %d, test: %s, got plan: %s",
testi, testj, planj)
}
Expand Down Expand Up @@ -184,7 +197,8 @@ func TestCalcBudget(t *testing.T) {
{0, 0, MergePlanOptions{}, 0},
{1, 0, MergePlanOptions{}, 1},
{9, 0, MergePlanOptions{}, 9},
{1, 1,
{
1, 1,
MergePlanOptions{
MaxSegmentsPerTier: 1,
MaxSegmentSize: 1000,
Expand All @@ -194,7 +208,8 @@ func TestCalcBudget(t *testing.T) {
},
1,
},
{21, 1,
{
21, 1,
MergePlanOptions{
MaxSegmentsPerTier: 1,
MaxSegmentSize: 1000,
Expand All @@ -204,7 +219,8 @@ func TestCalcBudget(t *testing.T) {
},
5,
},
{21, 1,
{
21, 1,
MergePlanOptions{
MaxSegmentsPerTier: 2,
MaxSegmentSize: 1000,
Expand All @@ -214,18 +230,30 @@ func TestCalcBudget(t *testing.T) {
},
7,
},
{1000, 2000, DefaultMergePlanOptions,
1},
{5000, 2000, DefaultMergePlanOptions,
3},
{10000, 2000, DefaultMergePlanOptions,
5},
{30000, 2000, DefaultMergePlanOptions,
11},
{1000000, 2000, DefaultMergePlanOptions,
24},
{1000000000, 2000, DefaultMergePlanOptions,
54},
{
1000, 2000, DefaultMergePlanOptions,
1,
},
{
5000, 2000, DefaultMergePlanOptions,
3,
},
{
10000, 2000, DefaultMergePlanOptions,
5,
},
{
30000, 2000, DefaultMergePlanOptions,
11,
},
{
1000000, 2000, DefaultMergePlanOptions,
24,
},
{
1000000000, 2000, DefaultMergePlanOptions,
54,
},
}

for testi, test := range tests {
Expand Down Expand Up @@ -492,15 +520,13 @@ func TestPlanMaxSegmentSizeLimit(t *testing.T) {
var totalLiveSize int64
for _, segs := range task.Segments {
totalLiveSize += segs.LiveSize()

}
if totalLiveSize >= o.MaxSegmentSize {
t.Errorf("merged segments size: %d exceeding the MaxSegmentSize"+
"limit: %d", totalLiveSize, o.MaxSegmentSize)
}
}
}

}

// ----------------------------------------
Expand Down
Loading