-
Notifications
You must be signed in to change notification settings - Fork 375
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prior to this patch, region on fiber was reset during select(), get(), count(), max(), or min(). This would result in an error if one of these operations was used in a user-defined function in SQL. After this patch, these functions truncate region instead of resetting it. Closes #5427
- Loading branch information
1 parent
2a3a0d1
commit d0d668f
Showing
6 changed files
with
258 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| -- test-run result file version 2 | ||
| test_run = require('test_run').new() | ||
| | --- | ||
| | ... | ||
| engine = test_run:get_cfg('engine') | ||
| | --- | ||
| | ... | ||
| _ = box.space._session_settings:update('sql_default_engine', {{'=', 2, engine}}) | ||
| | --- | ||
| | ... | ||
|
|
||
| box.execute([[CREATE TABLE t (b STRING PRIMARY KEY);]]) | ||
| | --- | ||
| | - row_count: 1 | ||
| | ... | ||
| box.execute([[INSERT INTO t VALUES ('aaaaaaaaaaaa');]]) | ||
| | --- | ||
| | - row_count: 1 | ||
| | ... | ||
| test_run:cmd("setopt delimiter ';'"); | ||
| | --- | ||
| | - true | ||
| | ... | ||
| box.schema.func.create('CORRUPT_SELECT', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T:select() | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| | --- | ||
| | ... | ||
| box.schema.func.create('CORRUPT_GET', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T:get('aaaaaaaaaaaa') | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| | --- | ||
| | ... | ||
| box.schema.func.create('CORRUPT_COUNT', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T:count() | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| | --- | ||
| | ... | ||
| box.schema.func.create('CORRUPT_MAX', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T.index[0]:max() | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| | --- | ||
| | ... | ||
| box.schema.func.create('CORRUPT_MIN', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T.index[0]:min() | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| | --- | ||
| | ... | ||
| test_run:cmd("setopt delimiter ''"); | ||
| | --- | ||
| | - true | ||
| | ... | ||
|
|
||
| values = {"aaaaaaaaaaaa", "aaaaaaaaaaaa"} | ||
| | --- | ||
| | ... | ||
| query = [[select %s() from t where t.b = ? and t.b <= ? order by t.b;]] | ||
| | --- | ||
| | ... | ||
| box.execute(string.format(query, 'CORRUPT_SELECT'), values) | ||
| | --- | ||
| | - metadata: | ||
| | - name: COLUMN_1 | ||
| | type: integer | ||
| | rows: | ||
| | - [1] | ||
| | ... | ||
| box.execute(string.format(query, 'CORRUPT_GET'), values) | ||
| | --- | ||
| | - metadata: | ||
| | - name: COLUMN_1 | ||
| | type: integer | ||
| | rows: | ||
| | - [1] | ||
| | ... | ||
| box.execute(string.format(query, 'CORRUPT_COUNT'), values) | ||
| | --- | ||
| | - metadata: | ||
| | - name: COLUMN_1 | ||
| | type: integer | ||
| | rows: | ||
| | - [1] | ||
| | ... | ||
| box.execute(string.format(query, 'CORRUPT_MAX'), values) | ||
| | --- | ||
| | - metadata: | ||
| | - name: COLUMN_1 | ||
| | type: integer | ||
| | rows: | ||
| | - [1] | ||
| | ... | ||
| box.execute(string.format(query, 'CORRUPT_MIN'), values) | ||
| | --- | ||
| | - metadata: | ||
| | - name: COLUMN_1 | ||
| | type: integer | ||
| | rows: | ||
| | - [1] | ||
| | ... | ||
| box.execute([[DROP TABLE t;]]) | ||
| | --- | ||
| | - row_count: 1 | ||
| | ... | ||
|
|
||
| box.func.CORRUPT_SELECT:drop() | ||
| | --- | ||
| | ... | ||
| box.func.CORRUPT_GET:drop() | ||
| | --- | ||
| | ... | ||
| box.func.CORRUPT_COUNT:drop() | ||
| | --- | ||
| | ... | ||
| box.func.CORRUPT_MAX:drop() | ||
| | --- | ||
| | ... | ||
| box.func.CORRUPT_MIN:drop() | ||
| | --- | ||
| | ... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| test_run = require('test_run').new() | ||
| engine = test_run:get_cfg('engine') | ||
| _ = box.space._session_settings:update('sql_default_engine', {{'=', 2, engine}}) | ||
|
|
||
| box.execute([[CREATE TABLE t (b STRING PRIMARY KEY);]]) | ||
| box.execute([[INSERT INTO t VALUES ('aaaaaaaaaaaa');]]) | ||
| test_run:cmd("setopt delimiter ';'"); | ||
| box.schema.func.create('CORRUPT_SELECT', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T:select() | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| box.schema.func.create('CORRUPT_GET', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T:get('aaaaaaaaaaaa') | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| box.schema.func.create('CORRUPT_COUNT', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T:count() | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| box.schema.func.create('CORRUPT_MAX', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T.index[0]:max() | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| box.schema.func.create('CORRUPT_MIN', { | ||
| returns = 'integer', | ||
| body = [[ | ||
| function() | ||
| box.space.T.index[0]:min() | ||
| return 1 | ||
| end]], | ||
| exports = {'LUA', 'SQL'}, | ||
| }); | ||
| test_run:cmd("setopt delimiter ''"); | ||
|
|
||
| values = {"aaaaaaaaaaaa", "aaaaaaaaaaaa"} | ||
| query = [[select %s() from t where t.b = ? and t.b <= ? order by t.b;]] | ||
| box.execute(string.format(query, 'CORRUPT_SELECT'), values) | ||
| box.execute(string.format(query, 'CORRUPT_GET'), values) | ||
| box.execute(string.format(query, 'CORRUPT_COUNT'), values) | ||
| box.execute(string.format(query, 'CORRUPT_MAX'), values) | ||
| box.execute(string.format(query, 'CORRUPT_MIN'), values) | ||
| box.execute([[DROP TABLE t;]]) | ||
|
|
||
| box.func.CORRUPT_SELECT:drop() | ||
| box.func.CORRUPT_GET:drop() | ||
| box.func.CORRUPT_COUNT:drop() | ||
| box.func.CORRUPT_MAX:drop() | ||
| box.func.CORRUPT_MIN:drop() |