From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id D7841290E2 for ; Wed, 15 Aug 2018 04:54:44 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mJ4UwjsJCcn0 for ; Wed, 15 Aug 2018 04:54:44 -0400 (EDT) Received: from smtp57.i.mail.ru (smtp57.i.mail.ru [217.69.128.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 6E1AE290D1 for ; Wed, 15 Aug 2018 04:54:44 -0400 (EDT) Date: Wed, 15 Aug 2018 11:54:42 +0300 From: Kirill Yukhin Subject: [tarantool-patches] Re: [PATCH] sql: after table rename properly update indexes Message-ID: <20180815085442.7bajsapuf7wrlu3r@tarantool.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: Vladislav Shpilevoy Cc: tarantool-patches@freelists.org Hello Vlad, Thanks for review! My answers are inlined. Updated patch in the bottom. On 15 авг 01:22, Vladislav Shpilevoy wrote: > Hi! Thanks for the patch! > See 6 comments below and a patch on the branch. > > On 13/08/2018 07:54, Kirill Yukhin wrote: > > After table was altered due to rename, indexes were not updated. > > Re-create all table's indexes (in legacy SQL DD), also perform > > udate of corresponding entry in _index for each index to fix table > > 1. Typo: 'udate'. Fixed. > 2. Please, put here the links to the issue and branch. Sure, will do that in future. Here they're, for reference: Branch: https://github.com/tarantool/tarantool/commits/kyukhin/gh-3613-update-idx-afer-alter Issue: https://github.com/tarantool/tarantool/issues/3613 > 3. Running the tests I caught an assertion: > [010] sql-tap/alter.test.lua vinyl [ fail ] > [010] Test failed! Output from reject file sql-tap/alter.reject: > [010] TAP version 13 > [010] 1..41 > [010] ok - alter-1.1 > [010] ok - alter-1.2 > [010] > [010] Last 15 lines of Tarantool Log file [Instance "app_server"][/Users/v.shpilevoy/Work/Repositories/tarantool/test/var/010_sql-tap/alter.test.lua:vinyl.tarantool.log]: > [010] ls: */: No such file or directory > [010] Assertion failed: (iid < space->index_count), function sql_update_index_table_name, file /Users/v.shpilevoy/Work/Repositories/tarantool/src/box/sql.c, line 851. > > Also just failing test: Good catch! I've added re-fetch of space pointer after alter. > > diff --git a/src/box/sql.c b/src/box/sql.c > > index ae12cae..e2d3cc1 100644 > > --- a/src/box/sql.c > > +++ b/src/box/sql.c > > @@ -840,6 +840,55 @@ rename_fail: > > return SQL_TARANTOOL_ERROR; > > } > > +int > > +sql_update_index_table_name(uint32_t space_id, uint32_t iid, > > + const char *new_tbl_name, char **sql_stmt) > > 4. I think, it would be enough to pass index_def (that you have > on the stack above). It has both index id and space id. And here > you use space_cache_find and struct space only to get index_def. Done. This fix cures assert in p 3 > > + char *op_begin = key; > > + char *op = mp_encode_array(op_begin, 1); > > + op = mp_encode_array(op, 3); > > + op = mp_encode_str(op, "=", 1); > > + op = mp_encode_uint(op, 4); > > + op += tarantoolSqlite3MakeIdxOpts(def->opts.is_unique, *sql_stmt, op); > > + > > + box_tuple_t *res = NULL; > 5. You do not need this dummy res. box_update (as all other DML > C API functions) is tolerant to NULL in the last parameter. Fixed. > > + if (box_update(BOX_INDEX_ID, 0, key_begin, key, op_begin, op, > > + 0, &res) != 0) { > > + diag_set(ClientError, ER_UPDATE_FIELD, 4, > > + "while updating SQL field"); > > 6. box_update has already set diag. Removed. -- Regards, Kirill Yukhin commit 4cf29331f3730658351701122d8714e157e0d77b Author: Kirill Yukhin Date: Fri Aug 10 15:22:19 2018 +0300 sql: after table rename properly update indexes After table was altered due to rename, indexes were not updated. Re-create all table's indexes (in legacy SQL DD), also perform update of corresponding entry in _index for each index to fix table name in create statement. Closes #3613 --- src/box/sql.c | 49 +++++++++++++++++++++++++++--- src/box/sql/build.c | 6 ++-- src/box/sql/tarantoolInt.h | 25 +++++++++++++-- src/box/sql/vdbe.c | 27 ++++++++++++++-- test/sql/gh-3613-idx-alter-update.result | 38 +++++++++++++++++++++++ test/sql/gh-3613-idx-alter-update.test.lua | 21 +++++++++++++ 6 files changed, 156 insertions(+), 10 deletions(-) diff --git a/src/box/sql.c b/src/box/sql.c index ae12cae..d9c4df2 100644 --- a/src/box/sql.c +++ b/src/box/sql.c @@ -840,6 +840,49 @@ rename_fail: return SQL_TARANTOOL_ERROR; } +int +sql_update_index_table_name(uint32_t space_id, struct index_def *def, + const char *new_tbl_name, char **sql_stmt) +{ + assert(space_id != 0); + assert(new_tbl_name != NULL); + struct space *space = space_cache_find(space_id); + assert(space != NULL); + uint32_t iid = def->iid; + + bool is_quoted = false; + *sql_stmt = rename_table(db, *sql_stmt, new_tbl_name, &is_quoted); + + uint32_t key_len = mp_sizeof_uint(space_id) + mp_sizeof_uint(iid) + + mp_sizeof_array(2); + uint32_t new_opts_sz = tarantoolSqlite3MakeIdxOpts(def->opts.is_unique, + *sql_stmt, NULL); + uint32_t op_sz = mp_sizeof_array(1) + mp_sizeof_array(3) + + mp_sizeof_str(1) + mp_sizeof_uint(4) + new_opts_sz; + + char *key_begin = (char*) region_alloc(&fiber()->gc, key_len + op_sz); + if (key_begin == NULL) { + diag_set(OutOfMemory, key_len, "region_alloc", "key_begin"); + return SQL_TARANTOOL_ERROR; + } + char *key = mp_encode_array(key_begin, 2); + key = mp_encode_uint(key, space_id); + key = mp_encode_uint(key, iid); + + char *op_begin = key; + char *op = mp_encode_array(op_begin, 1); + op = mp_encode_array(op, 3); + op = mp_encode_str(op, "=", 1); + op = mp_encode_uint(op, 4); + op += tarantoolSqlite3MakeIdxOpts(def->opts.is_unique, *sql_stmt, op); + + if (box_update(BOX_INDEX_ID, 0, key_begin, key, op_begin, op, + 0, NULL) != 0) + return SQL_TARANTOOL_ERROR; + + return SQLITE_OK; +} + int tarantoolSqlite3IdxKeyCompare(struct BtCursor *cursor, struct UnpackedRecord *unpacked) @@ -1494,13 +1537,11 @@ int tarantoolSqlite3MakeIdxParts(SqliteIndex *pIndex, void *buf) * "sql": "CREATE INDEX student_by_name ON students(name)" * } */ -int tarantoolSqlite3MakeIdxOpts(SqliteIndex *index, const char *zSql, void *buf) +int tarantoolSqlite3MakeIdxOpts(bool is_unique, const char *zSql, void *buf) { const struct Enc *enc = get_enc(buf); char *base = buf, *p; - (void)index; - p = enc->encode_map(base, 2); /* Mark as unique pk and unique indexes */ p = enc->encode_str(p, "unique", 6); @@ -1511,7 +1552,7 @@ int tarantoolSqlite3MakeIdxOpts(SqliteIndex *index, const char *zSql, void *buf) * INSERT OR REPLACE/IGNORE uniqueness checks will be also done by * Tarantool. */ - p = enc->encode_bool(p, IsUniqueIndex(index)); + p = enc->encode_bool(p, is_unique); p = enc->encode_str(p, "sql", 3); p = enc->encode_str(p, zSql, zSql ? strlen(zSql) : 0); return (int)(p - base); diff --git a/src/box/sql/build.c b/src/box/sql/build.c index cdf2bfc..6247f18 100644 --- a/src/box/sql/build.c +++ b/src/box/sql/build.c @@ -1245,13 +1245,15 @@ createIndex(Parse * pParse, Index * pIndex, int iSpaceId, int iIndexId, /* Format "opts" and "parts" for _index entry. */ zOpts = sqlite3DbMallocRaw(pParse->db, - tarantoolSqlite3MakeIdxOpts(pIndex, zSql, + tarantoolSqlite3MakeIdxOpts(IsUniqueIndex(pIndex), + zSql, NULL) + tarantoolSqlite3MakeIdxParts(pIndex, NULL) + 2); if (!zOpts) return; - zOptsSz = tarantoolSqlite3MakeIdxOpts(pIndex, zSql, zOpts); + zOptsSz = tarantoolSqlite3MakeIdxOpts(IsUniqueIndex(pIndex), zSql, + zOpts); zParts = zOpts + zOptsSz + 1; zPartsSz = tarantoolSqlite3MakeIdxParts(pIndex, zParts); #if SQLITE_DEBUG diff --git a/src/box/sql/tarantoolInt.h b/src/box/sql/tarantoolInt.h index 94517f6..234c94b 100644 --- a/src/box/sql/tarantoolInt.h +++ b/src/box/sql/tarantoolInt.h @@ -89,6 +89,23 @@ int tarantoolSqlite3ClearTable(struct space *space); int sql_rename_table(uint32_t space_id, const char *new_name, char **sql_stmt); +/** + * Update CREATE INDEX field (def->opt.sql) replacing table name + * w/ new one in _index space. + * + * @param space_id Table's space identifier. + * @param idef Index definition. + * @param new_tbl_name new name of table + * @param[out] sql_stmt CREATE INDEX statement for new name table, + * can be NULL. + * + * @retval SQLITE_OK on success, SQLITE_TARANTOOL_ERROR otherwise. + */ +int +sql_update_index_table_name(uint32_t space_id, struct index_def *idef, + const char *new_tbl_name, char **sql_stmt); + + /* Alter trigger statement after rename table. */ int tarantoolSqlite3RenameTrigger(const char *zTriggerName, const char *zOldName, const char *zNewName); @@ -171,12 +188,16 @@ fkey_encode_links(const struct fkey_def *def, int type, char *buf); */ int tarantoolSqlite3MakeIdxParts(Index * index, void *buf); -/* +/** * Format "opts" dictionary for _index entry. * Returns result size. * If buf==NULL estimate result size. + * + * @param is_unique Flag if index is unique. + * @param zSql SQL create stmt. + * @param[out] buf destination buffer. */ -int tarantoolSqlite3MakeIdxOpts(Index * index, const char *zSql, void *buf); +int tarantoolSqlite3MakeIdxOpts(bool is_unique, const char *zSql, void *buf); /** * Extract next id from _sequence space. diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index dc5146f..1166ddb 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -4625,13 +4625,36 @@ case OP_RenameTable: { db->init.busy = 1; init.rc = SQLITE_OK; sql_init_callback(&init, zNewTableName, space_id, 0, zSqlStmt); - db->init.busy = 0; rc = init.rc; - if (rc) { + if (rc != SQLITE_OK) { sqlite3CommitInternalChanges(); + db->init.busy = 0; goto abort_due_to_error; } + /* Space was altered, refetch the pointer. */ + space = space_by_id(space_id); + for (uint32_t i = 0; i < space->index_count; ++i) { + char *sql_stmt = space->index[i]->def->opts.sql; + if (sql_stmt == NULL) + continue; + rc = sql_update_index_table_name(space_id, space->index[i]->def, + zNewTableName, &sql_stmt); + if (rc != SQLITE_OK) + goto abort_due_to_error; + + space = space_by_id(space_id); + sql_init_callback(&init, zNewTableName, space_id, + space->index[i]->def->iid, sql_stmt); + rc = init.rc; + if (rc != SQLITE_OK) { + sqlite3CommitInternalChanges(); + db->init.busy = 0; + goto abort_due_to_error; + } + } + db->init.busy = 0; + /* * Rebuild 'CREATE TRIGGER' expressions of all triggers * created on this table. Sure, this action is not atomic diff --git a/test/sql/gh-3613-idx-alter-update.result b/test/sql/gh-3613-idx-alter-update.result new file mode 100644 index 0000000..2dcb88e --- /dev/null +++ b/test/sql/gh-3613-idx-alter-update.result @@ -0,0 +1,38 @@ +test_run = require('test_run').new() +--- +... +engine = test_run:get_cfg('engine') +--- +... +box.sql.execute('pragma sql_default_engine=\''..engine..'\'') +--- +... +box.sql.execute('CREATE TABLE t (s1 INT PRIMARY KEY)') +--- +... +box.sql.execute('CREATE INDEX i ON t (s1)') +--- +... +box.sql.execute('ALTER TABLE t RENAME TO j3') +--- +... +-- Due to gh-3613, next stmt caused segfault +box.sql.execute('DROP INDEX i ON j3') +--- +... +box.sql.execute('CREATE INDEX i ON j3 (s1)') +--- +... +-- Check that _index was altered properly +box.snapshot() +--- +- ok +... +test_run:cmd('restart server default') +box.sql.execute('DROP INDEX i ON j3') +--- +... +-- Cleanup +box.sql.execute('DROP TABLE j3') +--- +... diff --git a/test/sql/gh-3613-idx-alter-update.test.lua b/test/sql/gh-3613-idx-alter-update.test.lua new file mode 100644 index 0000000..287096b --- /dev/null +++ b/test/sql/gh-3613-idx-alter-update.test.lua @@ -0,0 +1,21 @@ +test_run = require('test_run').new() +engine = test_run:get_cfg('engine') +box.sql.execute('pragma sql_default_engine=\''..engine..'\'') + +box.sql.execute('CREATE TABLE t (s1 INT PRIMARY KEY)') +box.sql.execute('CREATE INDEX i ON t (s1)') +box.sql.execute('ALTER TABLE t RENAME TO j3') + +-- Due to gh-3613, next stmt caused segfault +box.sql.execute('DROP INDEX i ON j3') + +box.sql.execute('CREATE INDEX i ON j3 (s1)') + +-- Check that _index was altered properly +box.snapshot() +test_run:cmd('restart server default') + +box.sql.execute('DROP INDEX i ON j3') + +-- Cleanup +box.sql.execute('DROP TABLE j3')