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 BDE786F3F2; Fri, 8 Oct 2021 20:37:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BDE786F3F2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633714636; bh=HfCmd4tJmUSPLWLtNrhXPlqexrnGZ7vkmgdkzT/UE2E=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=YeZJ4d/nXnX+7Qk16ppfrajBSwCp1GgsQjPJ7BGFI2LjoI4pxtDtcREUZQE4z1cUe h05UyPy0hLZbgpepxeVVweNMpgpcQXe7QYPdGrLy28lU5UczdQRAD00ZBeq2dxsO/7 migkQitX/ETDCpuBF1vVfklp5JBpc9qmXM+38u4w= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 C655D6E469 for ; Fri, 8 Oct 2021 20:31:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C655D6E469 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mYtis-00084o-6b; Fri, 08 Oct 2021 20:31:54 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 8 Oct 2021 20:31:53 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9A6D4E3B1981C4C7D860EA8B700EC2F3556310D6870B6F840182A05F5380850402F8DA5D808EF6E4DE8CB89881861F5055B49BA8A5F205B1A2C5D60DB311ADCC3 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7011EB7026DD4A9BAEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637578F58D66D7052C48638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D82163DF8989C7168A0B8AB75FD0BF03E4117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD1828451B159A507268D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C650BD2383FF25EF58C3225E15F78E575CF000E6702AA14FA9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34087368DEEB028F17D19A638E9C826FA19166001C3FFD70F71738CF85A5B5EDAF5FFB05A07B746DFD1D7E09C32AA3244C8430549A6CF6759B56DFB6E95FEAD6C35A1673A01BA68E40729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMZ06aokA6bqdOGqePWPkYQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DCE9C5F4DB8D5A35FB528A109C84CBC1C83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 11/21] sql: refactor ROW_COUNT() function 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: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Part of #4145 --- src/box/sql/func.c | 12 +++++++++++- src/box/sql/main.c | 10 ---------- src/box/sql/sqlInt.h | 8 +------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 65da47da1..ca7c41d96 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -969,6 +969,16 @@ func_round(struct sql_context *ctx, int argc, struct Mem *argv) return mem_set_double(res, (double)(int64_t)(d + delta)); } +/** Implementation of the ROW_COUNT() function. */ +static void +func_row_count(struct sql_context *ctx, int argc, struct Mem *argv) +{ + (void)argc; + (void)argv; + assert(sql_get()->nChange >= 0); + return mem_set_uint(ctx->pOut, sql_get()->nChange); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1850,7 +1860,7 @@ static struct sql_func_definition definitions[] = { {"ROUND", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, func_round, NULL}, {"ROUND", 2, {FIELD_TYPE_DOUBLE, FIELD_TYPE_INTEGER}, FIELD_TYPE_DOUBLE, func_round, NULL}, - {"ROW_COUNT", 0, {}, FIELD_TYPE_INTEGER, sql_row_count, NULL}, + {"ROW_COUNT", 0, {}, FIELD_TYPE_INTEGER, func_row_count, NULL}, {"SOUNDEX", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_STRING, soundexFunc, NULL}, {"SUBSTR", 2, {FIELD_TYPE_STRING, FIELD_TYPE_INTEGER}, diff --git a/src/box/sql/main.c b/src/box/sql/main.c index a4247c760..ae872aaa1 100644 --- a/src/box/sql/main.c +++ b/src/box/sql/main.c @@ -220,16 +220,6 @@ setupLookaside(sql * db, void *pBuf, int sz, int cnt) return 0; } -void -sql_row_count(struct sql_context *context, int argc, struct Mem *argv) -{ - (void)argc; - (void)argv; - sql *db = sql_context_db_handle(context); - assert(db->nChange >= 0); - sql_result_uint(context, db->nChange); -} - /* * Close all open savepoints. * This procedure is trivial as savepoints are allocated on the "region" and diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index cfdf71f1f..72f349944 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -470,12 +470,6 @@ enum sql_subtype { void sql_randomness(int N, void *P); -/** - * Return the number of affected rows in the last SQL statement. - */ -void -sql_row_count(struct sql_context *context, int argc, struct Mem *argv); - int sql_column_count(sql_stmt * pStmt); @@ -1065,7 +1059,7 @@ struct sql { u8 dfltLockMode; /* Default locking-mode for attached dbs */ u8 mTrace; /* zero or more sql_TRACE flags */ u32 magic; /* Magic number for detect library misuse */ - /** Value returned by sql_row_count(). */ + /** Value returned by ROW_COUNT(). */ int nChange; int aLimit[SQL_N_LIMIT]; /* Limits */ int nMaxSorterMmap; /* Maximum size of regions mapped by sorter */ -- 2.25.1