Skip to content

Commit 6c0477e

Browse files
AnaNekAnaNek
committed
Add stats collection and pert tests for batch methods
Since we have PR #244 it will be nice to collect statistics for batch operations too. To establish the effectiveness of `crud.batch_insert()` method compared to `crud.insert()`, perf tests were added. `crud.insert()` in the loop and `crud.batch_insert()` are compared for different batch sizes. Closes #193
1 parent 842d8f4 commit 6c0477e

File tree

4 files changed

+250
-11
lines changed

4 files changed

+250
-11
lines changed

‎crud.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ crud.insert_object = stats.wrap(insert.object, stats.op.INSERT)
3636

3737
-- @refer insert_many.tuples
3838
-- @function insert_many
39-
crud.insert_many = insert_many.tuples
39+
crud.insert_many = stats.wrap(insert_many.tuples, stats.op.INSERT_MANY)
4040

4141
-- @refer insert_many.objects
4242
-- @function insert_object_many
43-
crud.insert_object_many = insert_many.objects
43+
crud.insert_object_many = stats.wrap(insert_many.objects, stats.op.INSERT_MANY)
4444

4545
-- @refer get.call
4646
-- @function get
@@ -56,11 +56,11 @@ crud.replace_object = stats.wrap(replace.object, stats.op.REPLACE)
5656

5757
-- @refer replace_many.tuples
5858
-- @function replace_many
59-
crud.replace_many = replace_many.tuples
59+
crud.replace_many = stats.wrap(replace_many.tuples, stats.op.REPLACE_MANY)
6060

6161
-- @refer replace_many.objects
6262
-- @function replace_object_many
63-
crud.replace_object_many = replace_many.objects
63+
crud.replace_object_many = stats.wrap(replace_many.objects, stats.op.REPLACE_MANY)
6464

6565
-- @refer update.call
6666
-- @function update
@@ -72,11 +72,11 @@ crud.upsert = stats.wrap(upsert.tuple, stats.op.UPSERT)
7272

7373
-- @refer upsert_many.tuples
7474
-- @function upsert_many
75-
crud.upsert_many = upsert_many.tuples
75+
crud.upsert_many = stats.wrap(upsert_many.tuples, stats.op.UPSERT_MANY)
7676

7777
-- @refer upsert_many.objects
7878
-- @function upsert_object_many
79-
crud.upsert_object_many = upsert_many.objects
79+
crud.upsert_object_many = stats.wrap(upsert_many.objects, stats.op.UPSERT_MANY)
8080

8181
-- @refer upsert.object
8282
-- @function upsert

‎crud/stats/operation.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@
66
return {
77
-- INSERT identifies both `insert` and `insert_object`.
88
INSERT = 'insert',
9+
-- INSERT_MANY identifies both `insert_many` and `insert_object_many`.
10+
INSERT_MANY = 'insert_many',
911
GET = 'get',
1012
-- REPLACE identifies both `replace` and `replace_object`.
1113
REPLACE = 'replace',
14+
-- REPLACE_MANY identifies both `replace_many` and `replace_object_many`.
15+
REPLACE_MANY = 'replace_many',
1216
UPDATE = 'update',
1317
-- UPSERT identifies both `upsert` and `upsert_object`.
1418
UPSERT = 'upsert',
19+
-- UPSERT_MANY identifies both `upsert_many` and `upsert_object_many`.
20+
UPSERT_MANY = 'upsert_many',
1521
DELETE = 'delete',
1622
-- SELECT identifies both `pairs` and `select`.
1723
SELECT = 'select',

‎test/integration/stats_test.lua

Lines changed: 112 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,28 @@ local simple_operation_cases = {
175175
},
176176
op = 'insert',
177177
},
178+
insert_many = {
179+
func = 'crud.insert_many',
180+
args = {
181+
space_name,
182+
{
183+
{ 21, box.NULL, 'Ivan', 'Ivanov', 20, 'Moscow' },
184+
{ 31, box.NULL, 'Oleg', 'Petrov', 25, 'Moscow' },
185+
}
186+
},
187+
op = 'insert_many',
188+
},
189+
insert_object_many = {
190+
func = 'crud.insert_object_many',
191+
args = {
192+
space_name,
193+
{
194+
{ id = 22, name = 'Ivan', last_name = 'Ivanov', age = 20, city = 'Moscow' },
195+
{ id = 32, name = 'Oleg', last_name = 'Petrov', age = 25, city = 'Moscow' },
196+
}
197+
},
198+
op = 'insert_many',
199+
},
178200
get = {
179201
func = 'crud.get',
180202
args = { space_name, { 12 } },
@@ -206,6 +228,28 @@ local simple_operation_cases = {
206228
},
207229
op = 'replace',
208230
},
231+
replace_many = {
232+
func = 'crud.replace_many',
233+
args = {
234+
space_name,
235+
{
236+
{ 21, box.NULL, 'Peter', 'Ivanov', 40, 'Moscow' },
237+
{ 31, box.NULL, 'Ivan', 'Petrov', 35, 'Moscow' },
238+
}
239+
},
240+
op = 'replace_many',
241+
},
242+
replace_object_many = {
243+
func = 'crud.replace_object_many',
244+
args = {
245+
space_name,
246+
{
247+
{ id = 22, name = 'Peter', last_name = 'Ivanov', age = 40, city = 'Moscow' },
248+
{ id = 32, name = 'Ivan', last_name = 'Petrov', age = 35, city = 'Moscow' },
249+
}
250+
},
251+
op = 'replace_many',
252+
},
209253
update = {
210254
prepare = function(g)
211255
helpers.insert_objects(g, space_name, {{
@@ -235,6 +279,36 @@ local simple_operation_cases = {
235279
},
236280
op = 'upsert',
237281
},
282+
upsert_many = {
283+
func = 'crud.upsert_many',
284+
args = {
285+
space_name,
286+
{
287+
{ 26, box.NULL, 'Ivan', 'Ivanov', 20, 'Moscow' },
288+
{ 36, box.NULL, 'Oleg', 'Petrov', 25, 'Moscow' },
289+
},
290+
{
291+
{{'+', 'age', 1}},
292+
{{'+', 'age', 1}},
293+
},
294+
},
295+
op = 'upsert_many',
296+
},
297+
upsert_object_many = {
298+
func = 'crud.upsert_object_many',
299+
args = {
300+
space_name,
301+
{
302+
{ id = 27, name = 'Ivan', last_name = 'Ivanov', age = 20, city = 'Moscow' },
303+
{ id = 37, name = 'Oleg', last_name = 'Petrov', age = 25, city = 'Moscow' },
304+
},
305+
{
306+
{{'+', 'age', 1}},
307+
{{'+', 'age', 1}}
308+
},
309+
},
310+
op = 'upsert_many',
311+
},
238312
delete = {
239313
func = 'crud.delete',
240314
args = { space_name, { 12 } },
@@ -277,6 +351,18 @@ local simple_operation_cases = {
277351
op = 'insert',
278352
expect_error = true,
279353
},
354+
insert_many_error = {
355+
func = 'crud.insert_many',
356+
args = { space_name, {{ 'id' }} },
357+
op = 'insert_many',
358+
expect_error = true,
359+
},
360+
insert_object_many_error = {
361+
func = 'crud.insert_object_many',
362+
args = { space_name, {{ 'id' }} },
363+
op = 'insert_many',
364+
expect_error = true,
365+
},
280366
get_error = {
281367
func = 'crud.get',
282368
args = { space_name, { 'id' } },
@@ -308,6 +394,18 @@ local simple_operation_cases = {
308394
op = 'replace',
309395
expect_error = true,
310396
},
397+
replace_many_error = {
398+
func = 'crud.replace_many',
399+
args = { space_name, {{ 'id' }} },
400+
op = 'replace_many',
401+
expect_error = true,
402+
},
403+
replace_object_many_error = {
404+
func = 'crud.replace_object_many',
405+
args = { space_name, {{ 'id' }} },
406+
op = 'replace_many',
407+
expect_error = true,
408+
},
311409
update_error = {
312410
func = 'crud.update',
313411
args = { space_name, { 'id' }, {{'+', 'age', 1}} },
@@ -326,6 +424,18 @@ local simple_operation_cases = {
326424
op = 'upsert',
327425
expect_error = true,
328426
},
427+
upsert_many_error = {
428+
func = 'crud.upsert_many',
429+
args = { space_name, {{ 'id' }}, {{{'+', 'age', 1}}} },
430+
op = 'upsert_many',
431+
expect_error = true,
432+
},
433+
upsert_object_many_error = {
434+
func = 'crud.upsert_object_many',
435+
args = { space_name, {{ 'id' }}, {{{'+', 'age', 1}}} },
436+
op = 'upsert_many',
437+
expect_error = true,
438+
},
329439
delete_error = {
330440
func = 'crud.delete',
331441
args = { space_name, { 'id' } },
@@ -800,8 +910,8 @@ local function validate_metrics(g, metrics)
800910
t.assert_type(stats_sum, 'table', '`tnt_crud_stats` summary metrics found')
801911

802912

803-
local expected_operations = { 'insert', 'get', 'replace', 'update',
804-
'upsert', 'delete', 'select', 'truncate', 'len', 'count', 'borders' }
913+
local expected_operations = { 'insert', 'insert_many', 'get', 'replace', 'replace_many', 'update',
914+
'upsert', 'upsert_many', 'delete', 'select', 'truncate', 'len', 'count', 'borders' }
805915

806916
if g.params.quantiles == true then
807917
t.assert_items_equals(get_unique_label_values(quantile_stats, 'operation'), expected_operations,

0 commit comments

Comments
 (0)