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 111AC71061; Wed, 1 Dec 2021 11:06:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 111AC71061 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1638346010; bh=Xkl2xcJMtiliEJezMBgrTEoksjZvsaAQmQKiggg+Tt4=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=pgQbrRmn0QKDOV1lJw8nvNNLUQuuVHOeKw3bZEasBzyf6m+Q+YtjX+FJrqBUHYekI oBX7+wUbeCnN7cy7hXkZIwaFC9TFi1u+VlgFH68oq8gi8TSgYNtPPz3f8hFpnRmsZx QdJw9iP6xl5gqAICFDummd1Fm+FP8gb1wmE1zKSo= 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 62D0471061 for ; Wed, 1 Dec 2021 11:06:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 62D0471061 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1msKdb-0002XF-67; Wed, 01 Dec 2021 11:06:47 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Wed, 1 Dec 2021 11:06:46 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD979319CBFD1B938ABFB76D7A8072D733AFF22BB55ABBC36A6182A05F5380850401865E075D76E3C7654166120D66D4A3E9280B8F7FCB9E895D10D1AEAB71D9FC7 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77F3E0A4828C8B68EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006374F638C8F0F4AA0FB8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8385EEEE239256DFA0D43D4A25D1422EB117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6300D3B61E77C8D3B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBD1FC2C1415E7E9D0518B006DD7D42F88482E0BB9BA5A4A09C2B6934AE262D3EE7EAB7254005DCED556CBE7F905700A49510FB958DCE06DB6ED91DBE5ABE359AC8952F428387DEC023D4379F09C64C7393EDB24507CE13387DFF0A840B692CF8 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D343C45ADCD169245FAE29AE94C34683DC9B48ECA313105BE951D32C46FF38F3D5234E1EBADE7A106951D7E09C32AA3244C7E3F3B745C7D3D894CBD020DF2A8FB0EF94338140B71B8EE729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojLBs75AcgWjPn1V2icbLAKw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DDB41D1D029DC019B41A9DC16DDF90A7A83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 1/1] sql: remove registerTrace() from mem.c 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" This patch changes the way values are displayed in debug information. --- https://github.com/tarantool/tarantool/tree/imeevma/gh-3050-drop-registerTrace src/box/sql/mem.c | 119 --------------------------------------------- src/box/sql/mem.h | 3 -- src/box/sql/vdbe.c | 13 +++-- 3 files changed, 8 insertions(+), 127 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 76d129c4c..296c96aba 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -2595,125 +2595,6 @@ sqlVdbeCheckMemInvariants(Mem * p) } return 1; } - -/* - * Write a nice string representation of the contents of cell pMem - * into buffer zBuf, length nBuf. - */ -void -sqlVdbeMemPrettyPrint(Mem *pMem, char *zBuf) -{ - char *zCsr = zBuf; - int f = pMem->flags; - - if (pMem->type == MEM_TYPE_BIN) { - int i; - char c; - if ((f & MEM_Static) != 0) { - c = 't'; - assert((f & MEM_Ephem) == 0); - } else if (f & MEM_Ephem) { - c = 'e'; - assert((f & MEM_Static) == 0); - } else { - c = 's'; - } - - sql_snprintf(100, zCsr, "%c", c); - zCsr += sqlStrlen30(zCsr); - sql_snprintf(100, zCsr, "%d[", pMem->n); - zCsr += sqlStrlen30(zCsr); - for(i=0; i<16 && in; i++) { - sql_snprintf(100, zCsr, "%02X", ((int)pMem->z[i] & 0xFF)); - zCsr += sqlStrlen30(zCsr); - } - for(i=0; i<16 && in; i++) { - char z = pMem->z[i]; - if (z<32 || z>126) *zCsr++ = '.'; - else *zCsr++ = z; - } - sql_snprintf(100, zCsr, "]%s", "(8)"); - zCsr += sqlStrlen30(zCsr); - *zCsr = '\0'; - } else if (pMem->type == MEM_TYPE_STR) { - int j, k; - zBuf[0] = ' '; - if ((f & MEM_Static) != 0) { - zBuf[1] = 't'; - assert((f & MEM_Ephem) == 0); - } else if (f & MEM_Ephem) { - zBuf[1] = 'e'; - assert((f & MEM_Static) == 0); - } else { - zBuf[1] = 's'; - } - k = 2; - sql_snprintf(100, &zBuf[k], "%d", pMem->n); - k += sqlStrlen30(&zBuf[k]); - zBuf[k++] = '['; - for(j=0; j<15 && jn; j++) { - u8 c = pMem->z[j]; - if (c>=0x20 && c<0x7f) { - zBuf[k++] = c; - } else { - zBuf[k++] = '.'; - } - } - zBuf[k++] = ']'; - sql_snprintf(100,&zBuf[k],"(8)"); - k += sqlStrlen30(&zBuf[k]); - zBuf[k++] = 0; - } -} - -/* - * Print the value of a register for tracing purposes: - */ -static void -memTracePrint(Mem *p) -{ - switch (p->type) { - case MEM_TYPE_NULL: - printf(" NULL"); - return; - case MEM_TYPE_INT: - printf(" i:%lld", p->u.i); - return; - case MEM_TYPE_UINT: - printf(" u:%"PRIu64"", p->u.u); - return; - case MEM_TYPE_DOUBLE: - printf(" r:%g", p->u.r); - return; - case MEM_TYPE_INVALID: - printf(" undefined"); - return; - case MEM_TYPE_BOOL: - printf(" bool:%s", SQL_TOKEN_BOOLEAN(p->u.b)); - return; - case MEM_TYPE_UUID: - printf(" uuid:%s", tt_uuid_str(&p->u.uuid)); - return; - case MEM_TYPE_DEC: - printf(" decimal:%s", decimal_str(&p->u.d)); - return; - default: { - char zBuf[200]; - sqlVdbeMemPrettyPrint(p, zBuf); - printf(" %s", zBuf); - if ((p->type & (MEM_TYPE_MAP | MEM_TYPE_ARRAY)) != 0) - printf(" subtype=0x%02x", SQL_SUBTYPE_MSGPACK); - return; - } - } -} - -void -registerTrace(int iReg, Mem *p) { - printf("REG[%d] = ", iReg); - memTracePrint(p); - printf("\n"); -} #endif static int diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index e59f8ea44..ba36d17a7 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -784,9 +784,6 @@ mem_mp_type(const struct Mem *mem); #ifdef SQL_DEBUG int sqlVdbeCheckMemInvariants(struct Mem *); -void sqlVdbeMemPrettyPrint(Mem * pMem, char *zBuf); -void -registerTrace(int iReg, Mem *p); /* * Return true if a memory cell is not marked as invalid. This macro diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 0c4e38557..1d68d387f 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -253,7 +253,8 @@ allocateCursor( #ifdef SQL_DEBUG # define REGISTER_TRACE(P,R,M) \ - if(P->sql_flags&SQL_VdbeTrace) registerTrace(R,M); + if ((P->sql_flags & SQL_VdbeTrace) != 0) \ + printf("REG[%d] = %s\n", R, mem_str(M)); #else # define REGISTER_TRACE(P,R,M) #endif @@ -4393,11 +4394,13 @@ default: { /* This is really OP_Noop and OP_Explain */ if ((p->sql_flags & SQL_VdbeTrace) != 0) { u8 opProperty = sqlOpcodeProperty[pOrigOp->opcode]; if (rc!=0) printf("rc=%d\n",rc); - if (opProperty & (OPFLG_OUT2)) { - registerTrace(pOrigOp->p2, &aMem[pOrigOp->p2]); + if ((opProperty & OPFLG_OUT2) != 0) { + REGISTER_TRACE(p, pOrigOp->p2, + &aMem[pOrigOp->p2]); } - if (opProperty & OPFLG_OUT3) { - registerTrace(pOrigOp->p3, &aMem[pOrigOp->p3]); + if ((opProperty & OPFLG_OUT3) != 0) { + REGISTER_TRACE(p, pOrigOp->p3, + &aMem[pOrigOp->p3]); } } #endif /* SQL_DEBUG */ -- 2.25.1