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 70CCF2DA6B for ; Tue, 17 Apr 2018 11:01: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 ADLxRx8Wzqmt for ; Tue, 17 Apr 2018 11:01:44 -0400 (EDT) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 257DF2DA5E for ; Tue, 17 Apr 2018 11:01:44 -0400 (EDT) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v2 1/1] sql: remove ephemeral Expr from AddDefaultValue Date: Tue, 17 Apr 2018 18:01:39 +0300 Message-Id: <0a797b62416743d6e6494949710b70a330f36c04.1523977261.git.kshcherbatov@tarantool.org> 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 Cc: v.shpilevoy@tarantool.org, Kirill Shcherbatov As we don't need Expr tree in DDL we could store only string representation that's better to understand. Needed for #3051. --- src/box/sql.c | 10 ++++------ src/box/sql/build.c | 32 ++++++++++++++------------------ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/box/sql.c b/src/box/sql.c index 6bc82c2..4df9eeb 100644 --- a/src/box/sql.c +++ b/src/box/sql.c @@ -1467,7 +1467,7 @@ int tarantoolSqlite3MakeTableFormat(Table *pTable, void *buf) const char *t; struct coll *coll = NULL; struct field_def *field = &pTable->def->fields[i]; - struct Expr *def = field->default_value_expr; + const char *zToken = field->default_value; if (aCol[i].zColl != NULL && strcasecmp(aCol[i].zColl, "binary") != 0) { coll = sqlite3FindCollSeq(aCol[i].zColl); @@ -1475,7 +1475,7 @@ int tarantoolSqlite3MakeTableFormat(Table *pTable, void *buf) int base_len = 4; if (coll != NULL) base_len += 1; - if (def != NULL) + if (zToken != NULL) base_len += 1; p = enc->encode_map(p, base_len); p = enc->encode_str(p, "name", 4); @@ -1499,11 +1499,9 @@ int tarantoolSqlite3MakeTableFormat(Table *pTable, void *buf) p = enc->encode_str(p, "collation", strlen("collation")); p = enc->encode_uint(p, coll->id); } - if (def != NULL) { - assert((def->flags & EP_IntValue) == 0); - assert(def->u.zToken != NULL); + if (zToken != NULL) { p = enc->encode_str(p, "default", strlen("default")); - p = enc->encode_str(p, def->u.zToken, strlen(def->u.zToken)); + p = enc->encode_str(p, zToken, strlen(zToken)); } } return (int)(p - base); diff --git a/src/box/sql/build.c b/src/box/sql/build.c index 394ee3a..4406955 100644 --- a/src/box/sql/build.c +++ b/src/box/sql/build.c @@ -399,6 +399,8 @@ deleteTable(sqlite3 * db, Table * pTable) if (pTable->def) { /* fields has been allocated on separate region */ struct field_def *fields = pTable->def->fields; + for (uint32_t i = 0; i < pTable->def->field_count; ++i) + sqlite3DbFree(sql_get(), fields[i].default_value); space_def_delete(pTable->def); sqlite3DbFree(db, fields); } @@ -889,27 +891,21 @@ sqlite3AddDefaultValue(Parse * pParse, ExprSpan * pSpan) "default value of column [%s] is not constant", pCol->zName); } else { - /* A copy of pExpr is used instead of the original, as pExpr contains - * tokens that point to volatile memory. The 'span' of the expression - * is required by pragma table_info. - */ - Expr x; assert(p->def); struct field_def *field = &p->def->fields[p->nCol - 1]; - sql_expr_free(db, field->default_value_expr, false); - - memset(&x, 0, sizeof(x)); - x.op = TK_SPAN; - x.u.zToken = sqlite3DbStrNDup(db, (char *)pSpan->zStart, - (int)(pSpan->zEnd - - pSpan->zStart)); - x.pLeft = pSpan->pExpr; - x.flags = EP_Skip; - - field->default_value_expr = - sqlite3ExprDup(db, &x, EXPRDUP_REDUCE); - sqlite3DbFree(db, x.u.zToken); + + sqlite3DbFree(db, field->default_value); + field->default_value = + sqlite3DbStrNDup(db, (char *)pSpan->zStart, + (int)(pSpan->zEnd - + pSpan->zStart)); + if (field->default_value == NULL) { + assert(db->mallocFailed); + pParse->rc = SQLITE_NOMEM_BKPT; + pParse->nErr++; + return; + } } } sql_expr_free(db, pSpan->pExpr, false); -- 2.7.4