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 151D82FA25 for ; Fri, 9 Nov 2018 04:25:05 -0500 (EST) 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 GKy7uv9Qw28n for ; Fri, 9 Nov 2018 04:25:05 -0500 (EST) Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (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 81D632FDE9 for ; Fri, 9 Nov 2018 04:25:04 -0500 (EST) Subject: [tarantool-patches] Re: [PATCH 2/2] sql: use vtab::rowid_next() instead of index_max() References: <4545090c3c5873e881c67afa58e656be2d5aae44.1540838910.git.korablev@tarantool.org> From: Vladislav Shpilevoy Message-ID: <09285440-67e3-3b42-0ba3-287d8c61af4c@tarantool.org> Date: Fri, 9 Nov 2018 12:25:00 +0300 MIME-Version: 1.0 In-Reply-To: <4545090c3c5873e881c67afa58e656be2d5aae44.1540838910.git.korablev@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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: tarantool-patches@freelists.org, Nikita Pettik Thanks for the patch! I moved the new error code there, and removed errinj test. My review fixes here and on the branch: =============================================================================== diff --git a/src/box/errcode.h b/src/box/errcode.h index 04f4f34ee..d64b6f3ba 100644 --- a/src/box/errcode.h +++ b/src/box/errcode.h @@ -223,6 +223,7 @@ struct errcode_record { /*168 */_(ER_DROP_FK_CONSTRAINT, "Failed to drop foreign key constraint '%s': %s") \ /*169 */_(ER_NO_SUCH_CONSTRAINT, "Constraint %s does not exist") \ /*170 */_(ER_CONSTRAINT_EXISTS, "Constraint %s already exists") \ + /*171 */_(ER_ROWID_OVERFLOW, "Rowid is overflowed: too many entries in ephemeral space") \ /* * !IMPORTANT! Please follow instructions at start of the file diff --git a/test/sql/errinj.result b/test/sql/errinj.result index 60f776c3c..a0ba60f45 100644 --- a/test/sql/errinj.result +++ b/test/sql/errinj.result @@ -279,18 +279,3 @@ errinj.set("ERRINJ_WAL_IO", false) box.sql.execute("DROP TABLE t3;") --- ... --- Make sure that overflow of rowid used for ephemeral spaces --- is hadnled properly. --- -box.error.injection.set("ERRINJ_ROWID_OVERFLOW", true) ---- -- ok -... -box.sql.execute("WITH RECURSIVE tmp AS (SELECT 1 UNION ALL SELECT * FROM tmp LIMIT 2) SELECT * FROM tmp;") ---- -- error: 'Rowid is overflowed: too many entries in ephemeral space' -... -box.error.injection.set("ERRINJ_ROWID_OVERFLOW", false) ---- -- ok -... diff --git a/test/sql/errinj.test.lua b/test/sql/errinj.test.lua index 034a43d4e..25d73f0c2 100644 --- a/test/sql/errinj.test.lua +++ b/test/sql/errinj.test.lua @@ -97,10 +97,3 @@ box.sql.execute("ALTER TABLE t3 DROP CONSTRAINT fk1;") box.sql.execute("INSERT INTO t3 VALUES(1, 1, 3);") errinj.set("ERRINJ_WAL_IO", false) box.sql.execute("DROP TABLE t3;") - --- Make sure that overflow of rowid used for ephemeral spaces --- is hadnled properly. --- -box.error.injection.set("ERRINJ_ROWID_OVERFLOW", true) -box.sql.execute("WITH RECURSIVE tmp AS (SELECT 1 UNION ALL SELECT * FROM tmp LIMIT 2) SELECT * FROM tmp;") -box.error.injection.set("ERRINJ_ROWID_OVERFLOW", false)