From 47fe6ced8c413f8e18fbf9e6c73e54999d0a69d0 Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov.dev@gmail.com>
Date: Tue, 15 May 2018 15:36:40 +0300
Subject: [PATCH] test: improve vinyl/select_consistency
Improve the test by decreasing range_size so that it creates a lot of
ranges for test indexes, not just one. This helped find bugs causing
the crash described in #3393.
Follow-up #3393
---
test/vinyl/select_consistency.result | 11 +++++++----
test/vinyl/select_consistency.test.lua | 9 +++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/test/vinyl/select_consistency.result b/test/vinyl/select_consistency.result
index 537f061346..c8f19cac8e 100644
--- a/test/vinyl/select_consistency.result
+++ b/test/vinyl/select_consistency.result
@@ -10,13 +10,13 @@ math.randomseed(os.time())
s = box.schema.space.create('test', {engine = 'vinyl'})
---
...
-_ = s:create_index('pk', {parts = {1, 'unsigned'}})
+_ = s:create_index('pk', {parts = {1, 'unsigned'}, page_size = 64, range_size = 256})
---
...
-_ = s:create_index('i1', {unique = true, parts = {2, 'unsigned', 3, 'unsigned'}})
+_ = s:create_index('i1', {unique = true, parts = {2, 'unsigned', 3, 'unsigned'}, page_size = 64, range_size = 256})
---
...
-_ = s:create_index('i2', {unique = true, parts = {2, 'unsigned', 4, 'unsigned'}})
+_ = s:create_index('i2', {unique = true, parts = {2, 'unsigned', 4, 'unsigned'}, page_size = 64, range_size = 256})
---
...
--
@@ -29,13 +29,16 @@ MAX_KEY = 100
MAX_VAL = 10
---
...
+PADDING = string.rep('x', 100)
+---
+...
test_run:cmd("setopt delimiter ';'")
---
- true
...
function gen_insert()
pcall(s.insert, s, {math.random(MAX_KEY), math.random(MAX_VAL),
- math.random(MAX_VAL), math.random(MAX_VAL), 1})
+ math.random(MAX_VAL), math.random(MAX_VAL), PADDING})
end;
---
...
diff --git a/test/vinyl/select_consistency.test.lua b/test/vinyl/select_consistency.test.lua
index c29cb8aca5..90fcf67e8e 100644
--- a/test/vinyl/select_consistency.test.lua
+++ b/test/vinyl/select_consistency.test.lua
@@ -5,9 +5,9 @@ fiber = require 'fiber'
math.randomseed(os.time())
s = box.schema.space.create('test', {engine = 'vinyl'})
-_ = s:create_index('pk', {parts = {1, 'unsigned'}})
-_ = s:create_index('i1', {unique = true, parts = {2, 'unsigned', 3, 'unsigned'}})
-_ = s:create_index('i2', {unique = true, parts = {2, 'unsigned', 4, 'unsigned'}})
+_ = s:create_index('pk', {parts = {1, 'unsigned'}, page_size = 64, range_size = 256})
+_ = s:create_index('i1', {unique = true, parts = {2, 'unsigned', 3, 'unsigned'}, page_size = 64, range_size = 256})
+_ = s:create_index('i2', {unique = true, parts = {2, 'unsigned', 4, 'unsigned'}, page_size = 64, range_size = 256})
--
-- If called from a transaction, i1:select({k}) and i2:select({k})
@@ -16,12 +16,13 @@ _ = s:create_index('i2', {unique = true, parts = {2, 'unsigned', 4, 'unsigned'}}
MAX_KEY = 100
MAX_VAL = 10
+PADDING = string.rep('x', 100)
test_run:cmd("setopt delimiter ';'")
function gen_insert()
pcall(s.insert, s, {math.random(MAX_KEY), math.random(MAX_VAL),
- math.random(MAX_VAL), math.random(MAX_VAL), 1})
+ math.random(MAX_VAL), math.random(MAX_VAL), PADDING})
end;
function gen_delete()
--
GitLab