From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 82E4D6EC55; Tue, 27 Jul 2021 11:53:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 82E4D6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1627376038; bh=3iY0QO7cTZIjk5/heEbbq9uIFkbUbolyA7QwMS0Ypag=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ywoV7K/oFK8Ey6l5t12KOXSYvE92KdYsTG8nuxCdP0gEPEiDkk5HW0tvJfDuLMRxG XrEJQGohZ51AU2o6fw3VIMc+vYZmR85uUrIfEZwhJ8sqdTjEgLq7YRO0FdVS5HUZ6M nGZh064yryApCV34s37318VNAuk2K6jfbCXc+NJU= Received: from smtpng2.i.mail.ru (smtpng2.i.mail.ru [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D5E106EC55 for ; Tue, 27 Jul 2021 11:53:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D5E106EC55 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1m8Iqa-0000fq-TW; Tue, 27 Jul 2021 11:53:57 +0300 Date: Tue, 27 Jul 2021 11:53:55 +0300 To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210727085355.GA45476@tarantool.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-4EC0790: 10 X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD941C43E597735A9C34755E0A9F196FCB739C645213AB7C8E0182A05F538085040B41C47BF8A362463B9BD6805804DAFCB22CB2273BD4339ACFE33FCC8C5A40DEA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C8DD139BC0BB8586EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063748424D8FCCA3295D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D83C2441296804326602C70117884BEC68117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B505574CD55152DE9993397A5A6289CE3CF6 X-C1DE0DAB: 0D63561A33F958A5B0A8BA450F948B7C3FF68F9D60846B0640D0C06346C8EBAED59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7536C62C4FBC402878410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348BF433665406F390A71EB33F87B5A1F9876AD9F4F630EA0C441ED4C75367A70DADDE217F0A8DC95A1D7E09C32AA3244CA0C86DD8D108D17809F09BCF21F5FE88E646F07CC2D4F3D8729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMEANdStWW5/T1e0xH0CGYA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D9DE88531D1AD69294AA1C99616F8C34B83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 1/1] sql: remove OP_Realify X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mergen Imeev via Tarantool-patches Reply-To: Mergen Imeev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thank you for the review! My answers, diff and new patch below. On Mon, Jul 26, 2021 at 10:58:05PM +0200, Vladislav Shpilevoy wrote: > Thanks for the patch! > > See 2 comments below. > > > src/box/sql/expr.c | 13 ------- > > src/box/sql/vdbe.c | 17 -------- > > .../gh-5335-wrong-int-to-double-cast.test.lua | 39 +++++++++++++++++++ > > 1. Please, add a changelog file. > Added. > > diff --git a/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua b/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua > > new file mode 100755 > > index 000000000..efcae911c > > --- /dev/null > > +++ b/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua > > @@ -0,0 +1,39 @@ > > +#!/usr/bin/env tarantool > > +local test = require("sqltester") > > +test:plan(2) > > + > > +test:execsql([[ > > + CREATE TABLE t1 (i NUMBER PRIMARY KEY, n NUMBER); > > + CREATE TABLE t2 (i NUMBER PRIMARY KEY, n NUMBER); > > + CREATE TRIGGER r AFTER INSERT ON t1 FOR EACH ROW BEGIN UPDATE t1 SET n = new.n; END; > > + INSERT INTO t1 VALUES (1, 1); > > + INSERT INTO t2 VALUES (1, 1); > > +]]) > > + > > +-- > > +-- Make sure that implicit cast from string to integer works correctly in > > +-- arithmetic operations. > > 2. From string to integer? Where are the strings? > Fixed. Most likely I forgot to change this comment after I copied tests to use as a template. > > +-- > > +test:do_execsql_test( > > + "gh-5335-1", > > + [[ > > + SELECT i / 2, n / 2 FROM t1; > > + ]], { > > + 0, 0 > > + }) > > + > > +test:do_execsql_test( > > + "gh-5335-2", > > + [[ > > + SELECT i / 2, n / 2 FROM t2 GROUP BY n; > > + ]], { > > + 0, 0 > > + }) > > + > > +test:execsql([[ > > + DROP TRIGGER r; > > + DROP TABLE t1; > > + DROP TABLE t2; > > +]]) > > + > > +test:finish_test() > > Diff: diff --git a/changelogs/unreleased/gh-5335-remove-wrong-double-to-int-cast.md b/changelogs/unreleased/gh-5335-remove-wrong-double-to-int-cast.md new file mode 100644 index 000000000..b06805a7f --- /dev/null +++ b/changelogs/unreleased/gh-5335-remove-wrong-double-to-int-cast.md @@ -0,0 +1,4 @@ +## bugfix/sql + +* Removed spontaneous conversion from INTEGER to DOUBLE in a field of type + NUMBER (gh-5335). diff --git a/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua b/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua index efcae911c..d29324a28 100755 --- a/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua +++ b/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua @@ -11,8 +11,8 @@ test:execsql([[ ]]) -- --- Make sure that implicit cast from string to integer works correctly in --- arithmetic operations. +-- Make sure that there are no unnecesary INTEGER to DOUBLE implicit cast in +-- field of type NUMBER. -- test:do_execsql_test( "gh-5335-1", Patch: commit f15e1aefdd7cafd380e66f7b5acdafb7ae5bdca6 Author: Mergen Imeev Date: Sat Sep 26 12:43:18 2020 +0300 sql: remove OP_Realify This opcode was used to convert INTEGER values to REAL. It is not necessary in Tarantool and causes errors. Due to OP_Realify two type of errors appeared: 1) In some cases in trigger INTEGER may be converted to DOUBLE. For example: box.execute("CREATE TABLE t (i NUMBER PRIMARY KEY, n NUMBER);") box.execute("CREATE TRIGGER t AFTER INSERT ON t FOR EACH ROW BEGIN UPDATE t SET n = new.n; END;") box.execute("INSERT INTO t VALUES (1, 1);") box.execute("SELECT i / 2, n / 2 FROM t;") Result: tarantool> box.execute("SELECT i / 2, n / 2 FROM t;") --- - metadata: - name: COLUMN_1 type: number - name: COLUMN_2 type: number rows: - [0, 0.5] ... 2) If SELECT uses GROUP BY then it may return DOUBLE instead of INTEGER. For example: box.execute("CREATE TABLE t (i NUMBER PRIMARY KEY, n NUMBER);") box.execute("INSERT INTO t VALUES (1,1);") box.execute("SELECT i / 2, n / 2 FROM t GROUP BY n;") Result: tarantool> box.execute("SELECT i / 2, n / 2 FROM t GROUP BY n;") --- - metadata: - name: COLUMN_1 type: number - name: COLUMN_2 type: number rows: - [0.5, 0.5] ... This patch removes OP_Realify, after which these errors disappear. Closes #5335 diff --git a/changelogs/unreleased/gh-5335-remove-wrong-double-to-int-cast.md b/changelogs/unreleased/gh-5335-remove-wrong-double-to-int-cast.md new file mode 100644 index 000000000..b06805a7f --- /dev/null +++ b/changelogs/unreleased/gh-5335-remove-wrong-double-to-int-cast.md @@ -0,0 +1,4 @@ +## bugfix/sql + +* Removed spontaneous conversion from INTEGER to DOUBLE in a field of type + NUMBER (gh-5335). diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c index 3772596d6..d2624516c 100644 --- a/src/box/sql/expr.c +++ b/src/box/sql/expr.c @@ -3700,11 +3700,6 @@ sqlExprCodeTarget(Parse * pParse, Expr * pExpr, int target) sqlVdbeAddOp3(v, OP_Column, pAggInfo->sortingIdxPTab, pCol->iSorterColumn, target); - if (pCol->space_def->fields[pExpr->iAgg].type == - FIELD_TYPE_NUMBER) { - sqlVdbeAddOp1(v, OP_Realify, - target); - } return target; } /* @@ -4260,14 +4255,6 @@ sqlExprCodeTarget(Parse * pParse, Expr * pExpr, int target) (pExpr->iTable ? "new" : "old"), pExpr->space_def->fields[ pExpr->iColumn].name, target)); - - /* If the column has type NUMBER, it may currently be stored as an - * integer. Use OP_Realify to make sure it is really real. - */ - if (pExpr->iColumn >= 0 && def->fields[ - pExpr->iColumn].type == FIELD_TYPE_NUMBER) { - sqlVdbeAddOp1(v, OP_Realify, target); - } break; } diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 9e763ed85..0a3c904b1 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1445,23 +1445,6 @@ case OP_MustBeInt: { /* jump, in1 */ break; } -/* Opcode: Realify P1 * * * * - * - * If register P1 holds an integer convert it to a real value. - * - * This opcode is used when extracting information from a column that - * has float type. Such column values may still be stored as - * integers, for space efficiency, but after extraction we want them - * to have only a real value. - */ -case OP_Realify: { /* in1 */ - pIn1 = &aMem[pOp->p1]; - if (mem_is_int(pIn1)) { - mem_to_double(pIn1); - } - break; -} - /* Opcode: Cast P1 P2 * * * * Synopsis: type(r[P1]) * diff --git a/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua b/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua new file mode 100755 index 000000000..d29324a28 --- /dev/null +++ b/test/sql-tap/gh-5335-wrong-int-to-double-cast.test.lua @@ -0,0 +1,39 @@ +#!/usr/bin/env tarantool +local test = require("sqltester") +test:plan(2) + +test:execsql([[ + CREATE TABLE t1 (i NUMBER PRIMARY KEY, n NUMBER); + CREATE TABLE t2 (i NUMBER PRIMARY KEY, n NUMBER); + CREATE TRIGGER r AFTER INSERT ON t1 FOR EACH ROW BEGIN UPDATE t1 SET n = new.n; END; + INSERT INTO t1 VALUES (1, 1); + INSERT INTO t2 VALUES (1, 1); +]]) + +-- +-- Make sure that there are no unnecesary INTEGER to DOUBLE implicit cast in +-- field of type NUMBER. +-- +test:do_execsql_test( + "gh-5335-1", + [[ + SELECT i / 2, n / 2 FROM t1; + ]], { + 0, 0 + }) + +test:do_execsql_test( + "gh-5335-2", + [[ + SELECT i / 2, n / 2 FROM t2 GROUP BY n; + ]], { + 0, 0 + }) + +test:execsql([[ + DROP TRIGGER r; + DROP TABLE t1; + DROP TABLE t2; +]]) + +test:finish_test()