Skip to content

Commit d8e670f

Browse files
kpatel71716kpatel71716
authored
BAAS-35884 remove unused runtime param from NewMemUsageContext (#129)
1 parent c20f1ef commit d8e670f

25 files changed

+59
-64
lines changed

‎added_values_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ func TestIntStringEquality(t *testing.T) {
4848
}
4949

5050
func TestAddedValuesMemUsage(t *testing.T) {
51-
vm := New()
52-
5351
for _, tc := range []struct {
5452
name string
5553
val MemUsageReporter
@@ -77,7 +75,7 @@ func TestAddedValuesMemUsage(t *testing.T) {
7775
},
7876
} {
7977
t.Run(tc.name, func(t *testing.T) {
80-
mem, err := tc.val.MemUsage(NewMemUsageContext(vm, 100, 100, 100, 100, 0.1, nil))
78+
mem, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
8179
if err != nil {
8280
t.Fatalf("Unexpected error. Actual: %v Expected: nil", err)
8381
}

‎array_sparse_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ func TestSparseArrayObjectMemUsage(t *testing.T) {
274274
}{
275275
{
276276
name: "mem below threshold",
277-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
277+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
278278
sao: &sparseArrayObject{
279279
items: []sparseArrayItem{
280280
{
@@ -289,14 +289,14 @@ func TestSparseArrayObjectMemUsage(t *testing.T) {
289289
},
290290
{
291291
name: "mem is SizeEmptyStruct for nil sparse array",
292-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
292+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
293293
sao: nil,
294294
expected: SizeEmptyStruct,
295295
errExpected: nil,
296296
},
297297
{
298298
name: "mem way above threshold returns first crossing of threshold",
299-
mu: NewMemUsageContext(vm, 88, 100, 50, 50, 0.1, TestNativeMemUsageChecker{}),
299+
mu: NewMemUsageContext(88, 100, 50, 50, 0.1, TestNativeMemUsageChecker{}),
300300
sao: &sparseArrayObject{
301301
items: []sparseArrayItem{
302302
{
@@ -331,7 +331,7 @@ func TestSparseArrayObjectMemUsage(t *testing.T) {
331331
},
332332
{
333333
name: "mem above estimate threshold and within memory limit returns correct usage",
334-
mu: NewMemUsageContext(vm, 88, 100, 5, 50, 0.1, TestNativeMemUsageChecker{}),
334+
mu: NewMemUsageContext(88, 100, 5, 50, 0.1, TestNativeMemUsageChecker{}),
335335
sao: &sparseArrayObject{
336336
items: []sparseArrayItem{
337337
{

‎array_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,23 +144,23 @@ func TestArrayObjectMemUsage(t *testing.T) {
144144
}{
145145
{
146146
name: "mem below threshold given a nil slice of values",
147-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
147+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
148148
ao: &arrayObject{},
149149
// array overhead + array baseObject
150150
expectedMem: SizeEmptyStruct + SizeEmptyStruct,
151151
errExpected: nil,
152152
},
153153
{
154154
name: "mem below threshold given empty slice of values",
155-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
155+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
156156
ao: &arrayObject{values: []Value{}},
157157
// array overhead + array baseObject + values slice overhead
158158
expectedMem: SizeEmptyStruct + SizeEmptyStruct + SizeEmptySlice,
159159
errExpected: nil,
160160
},
161161
{
162162
name: "mem way above threshold returns first crossing of threshold",
163-
mu: NewMemUsageContext(vm, 88, 100, 50, 50, 0.1, TestNativeMemUsageChecker{}),
163+
mu: NewMemUsageContext(88, 100, 50, 50, 0.1, TestNativeMemUsageChecker{}),
164164
ao: &arrayObject{
165165
values: []Value{
166166
vm.ToValue("key0"),
@@ -179,7 +179,7 @@ func TestArrayObjectMemUsage(t *testing.T) {
179179
},
180180
{
181181
name: "empty array with negative threshold",
182-
mu: NewMemUsageContext(vm, 88, 100, -1, 50, 0.1, TestNativeMemUsageChecker{}),
182+
mu: NewMemUsageContext(88, 100, -1, 50, 0.1, TestNativeMemUsageChecker{}),
183183
ao: &arrayObject{
184184
values: []Value{},
185185
},

‎builtin_map_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func TestMapObjectMemUsage(t *testing.T) {
286286
}{
287287
{
288288
name: "mem below threshold",
289-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
289+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
290290
mo: &mapObject{
291291
m: &orderedMap{
292292
hashTable: map[uint64]*mapEntry{
@@ -303,14 +303,14 @@ func TestMapObjectMemUsage(t *testing.T) {
303303
},
304304
{
305305
name: "mem is SizeEmptyStruct given a nil map object",
306-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
306+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
307307
mo: nil,
308308
expectedMem: SizeEmptyStruct,
309309
errExpected: nil,
310310
},
311311
{
312312
name: "mem way above threshold returns first crossing of threshold",
313-
mu: NewMemUsageContext(vm, 88, 100, 50, 50, 0.1, TestNativeMemUsageChecker{}),
313+
mu: NewMemUsageContext(88, 100, 50, 50, 0.1, TestNativeMemUsageChecker{}),
314314
mo: &mapObject{
315315
m: &orderedMap{
316316
hashTable: map[uint64]*mapEntry{
@@ -343,7 +343,7 @@ func TestMapObjectMemUsage(t *testing.T) {
343343
},
344344
{
345345
name: "mem above estimate threshold and within memory limit returns correct mem usage",
346-
mu: NewMemUsageContext(vm, 88, 100, 50, 5, 0.1, TestNativeMemUsageChecker{}),
346+
mu: NewMemUsageContext(88, 100, 50, 5, 0.1, TestNativeMemUsageChecker{}),
347347
mo: &mapObject{
348348
m: createOrderedMap(vm, 20),
349349
},

‎builtin_proxy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ func TestBuiltinProxyMemUsage(t *testing.T) {
12901290

12911291
for _, tc := range tests {
12921292
t.Run(tc.name, func(t *testing.T) {
1293-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
1293+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
12941294
if err != nil {
12951295
t.Fatalf("Unexpected error. Actual: %v Expected: nil", err)
12961296
}

‎builtin_set_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func TestSetObjectMemUsage(t *testing.T) {
227227
}{
228228
{
229229
name: "mem below threshold",
230-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
230+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
231231
so: &setObject{
232232
m: &orderedMap{
233233
hashTable: map[uint64]*mapEntry{
@@ -244,14 +244,14 @@ func TestSetObjectMemUsage(t *testing.T) {
244244
},
245245
{
246246
name: "mem is SizeEmptyStruct given a nil map object",
247-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
247+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
248248
so: nil,
249249
expectedMem: SizeEmptyStruct,
250250
errExpected: nil,
251251
},
252252
{
253253
name: "mem way above threshold returns first crossing of threshold",
254-
mu: NewMemUsageContext(vm, 88, 100, 50, 50, 0.1, TestNativeMemUsageChecker{}),
254+
mu: NewMemUsageContext(88, 100, 50, 50, 0.1, TestNativeMemUsageChecker{}),
255255
so: &setObject{
256256
m: &orderedMap{
257257
hashTable: map[uint64]*mapEntry{
@@ -284,7 +284,7 @@ func TestSetObjectMemUsage(t *testing.T) {
284284
},
285285
{
286286
name: "mem above estimate threshold and within memory limit returns correct mem usage",
287-
mu: NewMemUsageContext(vm, 88, 100, 50, 5, 0.1, TestNativeMemUsageChecker{}),
287+
mu: NewMemUsageContext(88, 100, 50, 5, 0.1, TestNativeMemUsageChecker{}),
288288
so: &setObject{
289289
m: createOrderedMap(vm, 20),
290290
},
@@ -298,7 +298,7 @@ func TestSetObjectMemUsage(t *testing.T) {
298298
},
299299
{
300300
name: "mem above estimate threshold and within memory limit and nil values returns correct mem usage",
301-
mu: NewMemUsageContext(vm, 88, 100, 50, 1, 0.1, TestNativeMemUsageChecker{}),
301+
mu: NewMemUsageContext(88, 100, 50, 1, 0.1, TestNativeMemUsageChecker{}),
302302
so: &setObject{
303303
m: createOrderedMapWithNilValues(3),
304304
},
@@ -308,7 +308,7 @@ func TestSetObjectMemUsage(t *testing.T) {
308308
},
309309
{
310310
name: "mem is SizeEmptyStruct given a nil orderedMap object",
311-
mu: NewMemUsageContext(vm, 88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
311+
mu: NewMemUsageContext(88, 5000, 50, 50, 0.1, TestNativeMemUsageChecker{}),
312312
so: &setObject{},
313313
expectedMem: SizeEmptyStruct,
314314
errExpected: nil,

‎compiler_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5657,7 +5657,7 @@ func TestProgramMemUsage(t *testing.T) {
56575657
}{
56585658
{
56595659
name: "mem below threshold",
5660-
mu: NewMemUsageContext(New(), 88, 50, 50, 50, 0.1, TestNativeMemUsageChecker{}),
5660+
mu: NewMemUsageContext(88, 50, 50, 50, 0.1, TestNativeMemUsageChecker{}),
56615661
p: &Program{
56625662
values: []Value{
56635663
New().newDateObject(time.Now(), true, nil),
@@ -5669,7 +5669,7 @@ func TestProgramMemUsage(t *testing.T) {
56695669
},
56705670
{
56715671
name: "mem way above threshold returns first crossing of threshold",
5672-
mu: NewMemUsageContext(New(), 88, 50, 50, 50, 0.1, TestNativeMemUsageChecker{}),
5672+
mu: NewMemUsageContext(88, 50, 50, 50, 0.1, TestNativeMemUsageChecker{}),
56735673
p: &Program{
56745674
values: []Value{
56755675
New().newDateObject(time.Now(), true, nil),

‎date_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ func TestDateMemUsage(t *testing.T) {
349349

350350
for _, tc := range tests {
351351
t.Run(tc.name, func(t *testing.T) {
352-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
352+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
353353
if err != tc.errExpected {
354354
t.Fatalf("Unexpected error. Actual: %v Expected: %v", err, tc.errExpected)
355355
}

‎destruct_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestDestructMemUsage(t *testing.T) {
2727

2828
for _, tc := range tests {
2929
t.Run(tc.name, func(t *testing.T) {
30-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
30+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
3131
if err != tc.errExpected {
3232
t.Fatalf("Unexpected error. Actual: %v Expected: %v", err, tc.errExpected)
3333
}

‎func_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func TestNativeFuncObjectMemUsage(t *testing.T) {
184184

185185
for _, tc := range tests {
186186
t.Run(tc.name, func(t *testing.T) {
187-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
187+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
188188
if err != tc.errExpected {
189189
t.Fatalf("Unexpected error. Actual: %v Expected: %v", err, tc.errExpected)
190190
}
@@ -234,7 +234,7 @@ func TestFuncObjectMemUsage(t *testing.T) {
234234

235235
for _, tc := range tests {
236236
t.Run(tc.name, func(t *testing.T) {
237-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
237+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
238238
if err != tc.errExpected {
239239
t.Fatalf("Unexpected error. Actual: %v Expected: %v", err, tc.errExpected)
240240
}
@@ -282,7 +282,7 @@ func TestBaseJsFuncObjectMemUsage(t *testing.T) {
282282

283283
for _, tc := range tests {
284284
t.Run(tc.name, func(t *testing.T) {
285-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
285+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
286286
if err != tc.errExpected {
287287
t.Fatalf("Unexpected error. Actual: %v Expected: %v", err, tc.errExpected)
288288
}
@@ -361,7 +361,7 @@ func TestClassFuncObjectMemUsage(t *testing.T) {
361361

362362
for _, tc := range tests {
363363
t.Run(tc.name, func(t *testing.T) {
364-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
364+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
365365
if err != tc.errExpected {
366366
t.Fatalf("Unexpected error. Actual: %v Expected: %v", err, tc.errExpected)
367367
}
@@ -421,7 +421,7 @@ func TestMethodFuncObjectMemUsage(t *testing.T) {
421421

422422
for _, tc := range tests {
423423
t.Run(tc.name, func(t *testing.T) {
424-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
424+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
425425
if err != tc.errExpected {
426426
t.Fatalf("Unexpected error. Actual: %v Expected: %v", err, tc.errExpected)
427427
}
@@ -490,7 +490,7 @@ func TestArrowFuncObjectMemUsage(t *testing.T) {
490490

491491
for _, tc := range tests {
492492
t.Run(tc.name, func(t *testing.T) {
493-
total, err := tc.val.MemUsage(NewMemUsageContext(New(), 100, 100, 100, 100, 0.1, nil))
493+
total, err := tc.val.MemUsage(NewMemUsageContext(100, 100, 100, 100, 0.1, nil))
494494
if err != tc.errExpected {
495495
t.Fatalf("Unexpected error. Actual: %v Expected: %v", err, tc.errExpected)
496496
}

0 commit comments

Comments
 (0)