Skip to content

Commit 4b0fa2c

Browse files
samuelcolvinsamuelcolvin
committed
fix benchmarks
1 parent ec3d870 commit 4b0fa2c

File tree

1 file changed

+30
-28
lines changed

1 file changed

+30
-28
lines changed

‎benches/main.rs

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ fn ints_json(bench: &mut Bencher) {
2323
Python::with_gil(|py| {
2424
let validator = build_schema_validator(py, "{'type': 'int'}");
2525

26-
let result = validator.validate_json(py, json(py, "123"), None, None).unwrap();
26+
let result = validator.validate_json(py, json(py, "123"), None, None, false).unwrap();
2727
let result_int: i64 = result.extract(py).unwrap();
2828
assert_eq!(result_int, 123);
2929

30-
bench.iter(|| black_box(validator.validate_json(py, json(py, "123"), None, None).unwrap()))
30+
bench.iter(|| black_box(validator.validate_json(py, json(py, "123"), None, None, false).unwrap()))
3131
})
3232
}
3333

@@ -38,12 +38,12 @@ fn ints_python(bench: &mut Bencher) {
3838

3939
let input = 123_i64.into_py(py);
4040
let input = input.as_ref(py);
41-
let result = validator.validate_python(py, input, None, None).unwrap();
41+
let result = validator.validate_python(py, input, None, None, false).unwrap();
4242
let result_int: i64 = result.extract(py).unwrap();
4343
assert_eq!(result_int, 123);
4444

4545
let input = black_box(input);
46-
bench.iter(|| black_box(validator.validate_python(py, input, None, None).unwrap()))
46+
bench.iter(|| black_box(validator.validate_python(py, input, None, None, false).unwrap()))
4747
})
4848
}
4949

@@ -56,7 +56,7 @@ fn list_int_json(bench: &mut Bencher) {
5656
(0..100).map(|x| x.to_string()).collect::<Vec<String>>().join(",")
5757
);
5858

59-
bench.iter(|| black_box(validator.validate_json(py, json(py, &code), None, None).unwrap()))
59+
bench.iter(|| black_box(validator.validate_json(py, json(py, &code), None, None, false).unwrap()))
6060
})
6161
}
6262

@@ -77,7 +77,7 @@ fn list_int_python(bench: &mut Bencher) {
7777
let (validator, input) = list_int_input(py);
7878
let input = black_box(input.as_ref(py));
7979
bench.iter(|| {
80-
let v = validator.validate_python(py, input, None, None).unwrap();
80+
let v = validator.validate_python(py, input, None, None, false).unwrap();
8181
black_box(v)
8282
})
8383
})
@@ -88,11 +88,11 @@ fn list_int_python_isinstance(bench: &mut Bencher) {
8888
Python::with_gil(|py| {
8989
let (validator, input) = list_int_input(py);
9090
let input = black_box(input.as_ref(py));
91-
let v = validator.isinstance_python(py, input, None, None).unwrap();
91+
let v = validator.isinstance_python(py, input, None, None, false).unwrap();
9292
assert!(v);
9393

9494
bench.iter(|| {
95-
let v = validator.isinstance_python(py, input, None, None).unwrap();
95+
let v = validator.isinstance_python(py, input, None, None, false).unwrap();
9696
black_box(v)
9797
})
9898
})
@@ -110,7 +110,7 @@ fn list_error_json(bench: &mut Bencher) {
110110
.join(", ")
111111
);
112112

113-
match validator.validate_json(py, json(py, &code), None, None) {
113+
match validator.validate_json(py, json(py, &code), None, None, false) {
114114
Ok(_) => panic!("unexpectedly valid"),
115115
Err(e) => {
116116
let v = e.value(py);
@@ -121,10 +121,12 @@ fn list_error_json(bench: &mut Bencher) {
121121
}
122122
};
123123

124-
bench.iter(|| match validator.validate_json(py, json(py, &code), None, None) {
125-
Ok(_) => panic!("unexpectedly valid"),
126-
Err(e) => black_box(e),
127-
})
124+
bench.iter(
125+
|| match validator.validate_json(py, json(py, &code), None, None, false) {
126+
Ok(_) => panic!("unexpectedly valid"),
127+
Err(e) => black_box(e),
128+
},
129+
)
128130
})
129131
}
130132

@@ -140,7 +142,7 @@ fn list_error_python_input(py: Python<'_>) -> (SchemaValidator, PyObject) {
140142

141143
let input = py.eval(&code, None, None).unwrap();
142144

143-
match validator.validate_python(py, input, None, None) {
145+
match validator.validate_python(py, input, None, None, false) {
144146
Ok(_) => panic!("unexpectedly valid"),
145147
Err(e) => {
146148
let v = e.value(py);
@@ -160,7 +162,7 @@ fn list_error_python(bench: &mut Bencher) {
160162

161163
let input = black_box(input.as_ref(py));
162164
bench.iter(|| {
163-
let result = validator.validate_python(py, input, None, None);
165+
let result = validator.validate_python(py, input, None, None, false);
164166

165167
match result {
166168
Ok(_) => panic!("unexpectedly valid"),
@@ -175,13 +177,13 @@ fn list_error_python_isinstance(bench: &mut Bencher) {
175177
Python::with_gil(|py| {
176178
let (validator, input) = list_error_python_input(py);
177179
let r = validator
178-
.isinstance_python(py, black_box(input.as_ref(py)), None, None)
180+
.isinstance_python(py, black_box(input.as_ref(py)), None, None, false)
179181
.unwrap();
180182
assert!(!r);
181183

182184
let input = black_box(input.as_ref(py));
183185
bench.iter(|| {
184-
black_box(validator.isinstance_python(py, input, None, None).unwrap());
186+
black_box(validator.isinstance_python(py, input, None, None, false).unwrap());
185187
})
186188
})
187189
}
@@ -195,7 +197,7 @@ fn list_any_json(bench: &mut Bencher) {
195197
(0..100).map(|x| x.to_string()).collect::<Vec<String>>().join(",")
196198
);
197199

198-
bench.iter(|| black_box(validator.validate_json(py, json(py, &code), None, None).unwrap()))
200+
bench.iter(|| black_box(validator.validate_json(py, json(py, &code), None, None, false).unwrap()))
199201
})
200202
}
201203

@@ -210,7 +212,7 @@ fn list_any_python(bench: &mut Bencher) {
210212
let input = py.eval(&code, None, None).unwrap();
211213
let input = black_box(input);
212214
bench.iter(|| {
213-
let v = validator.validate_python(py, input, None, None).unwrap();
215+
let v = validator.validate_python(py, input, None, None, false).unwrap();
214216
black_box(v)
215217
})
216218
})
@@ -240,7 +242,7 @@ fn dict_json(bench: &mut Bencher) {
240242
.join(", ")
241243
);
242244

243-
bench.iter(|| black_box(validator.validate_json(py, json(py, &code), None, None).unwrap()))
245+
bench.iter(|| black_box(validator.validate_json(py, json(py, &code), None, None, false).unwrap()))
244246
})
245247
}
246248

@@ -262,7 +264,7 @@ fn dict_python(bench: &mut Bencher) {
262264
let input = py.eval(&code, None, None).unwrap();
263265
let input = black_box(input);
264266
bench.iter(|| {
265-
let v = validator.validate_python(py, input, None, None).unwrap();
267+
let v = validator.validate_python(py, input, None, None, false).unwrap();
266268
black_box(v)
267269
})
268270
})
@@ -290,7 +292,7 @@ fn dict_value_error(bench: &mut Bencher) {
290292

291293
let input = py.eval(&code, None, None).unwrap();
292294

293-
match validator.validate_python(py, input, None, None) {
295+
match validator.validate_python(py, input, None, None, false) {
294296
Ok(_) => panic!("unexpectedly valid"),
295297
Err(e) => {
296298
let v = e.value(py);
@@ -303,7 +305,7 @@ fn dict_value_error(bench: &mut Bencher) {
303305

304306
let input = black_box(input);
305307
bench.iter(|| {
306-
let result = validator.validate_python(py, input, None, None);
308+
let result = validator.validate_python(py, input, None, None, false);
307309

308310
match result {
309311
Ok(_) => panic!("unexpectedly valid"),
@@ -338,7 +340,7 @@ fn typed_dict_json(bench: &mut Bencher) {
338340

339341
let code = r#"{"a": 1, "b": 2, "c": 3, "d": 4, "e": 5, "f": 6, "g": 7, "h": 8, "i": 9, "j": 0}"#.to_string();
340342

341-
bench.iter(|| black_box(validator.validate_json(py, json(py, &code), None, None).unwrap()))
343+
bench.iter(|| black_box(validator.validate_json(py, json(py, &code), None, None, false).unwrap()))
342344
})
343345
}
344346

@@ -369,7 +371,7 @@ fn typed_dict_python(bench: &mut Bencher) {
369371
let input = py.eval(&code, None, None).unwrap();
370372
let input = black_box(input);
371373
bench.iter(|| {
372-
let v = validator.validate_python(py, input, None, None).unwrap();
374+
let v = validator.validate_python(py, input, None, None, false).unwrap();
373375
black_box(v)
374376
})
375377
})
@@ -407,7 +409,7 @@ fn typed_dict_deep_error(bench: &mut Bencher) {
407409
let input = py.eval(code, None, None).unwrap();
408410
let input = black_box(input);
409411

410-
match validator.validate_python(py, input, None, None) {
412+
match validator.validate_python(py, input, None, None, false) {
411413
Ok(_) => panic!("unexpectedly valid"),
412414
Err(e) => {
413415
let v = e.value(py);
@@ -419,7 +421,7 @@ fn typed_dict_deep_error(bench: &mut Bencher) {
419421
};
420422

421423
bench.iter(|| {
422-
let result = validator.validate_python(py, input, None, None);
424+
let result = validator.validate_python(py, input, None, None, false);
423425

424426
match result {
425427
Ok(_) => panic!("unexpectedly valid"),
@@ -443,7 +445,7 @@ fn complete_model(bench: &mut Bencher) {
443445
let input = black_box(input);
444446

445447
bench.iter(|| {
446-
black_box(validator.validate_python(py, input, None, None).unwrap());
448+
black_box(validator.validate_python(py, input, None, None, false).unwrap());
447449
})
448450
})
449451
}

0 commit comments

Comments
 (0)