[tarantool-patches] Re: [PATCH v3 1/6] sql: remove unused macros from pragma.c and pragma.h
n.pettik
korablev at tarantool.org
Wed Jan 16 18:34:57 MSK 2019
> On 26 Dec 2018, at 20:17, imeevma at tarantool.org wrote:
>
> Hi! Thank you for review! My answers and new version below. I
> didn't include diff, because all that changed was the commit
> message.
>
>
> On 12/24/18 5:01 PM, n.pettik wrote:
>> Nit: at the end of commit subject redundant ‘*’ and dot.
> Fixed.
>
>> They weren’t deleted, they are simply not used.
>> I guess they still can be enabled, if add appropriate commands
>> to cmake lists. On the other hand, I doubt that someday we
>> really may need them.
> Made changes in in commit-message.
>
>> In fact, this commit has nothing in common with mentioned issue.
> Removed from commit-message.
>
>> Why didn’t you remove ENABLE_SELECTTRACE as well?
> I didn't remove it because it can be set through cmake.
So? As I already said, I also was able to set OMIT_FLAG_PRAGMAS
Look:
diff --git a/src/box/sql/CMakeLists.txt b/src/box/sql/CMakeLists.txt
index 7f7b60e22..4d4cbb21f 100644
--- a/src/box/sql/CMakeLists.txt
+++ b/src/box/sql/CMakeLists.txt
@@ -1,6 +1,7 @@
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions(-DSQLITE_DEBUG=1)
add_definitions(-DSQLITE_ENABLE_SELECTTRACE)
+ add_definitions(-DSQLITE_OMIT_FLAG_PRAGMAS=1)
add_definitions(-DSQLITE_ENABLE_WHERETRACE)
endif()
Make sure that build is debug but flag-pragmas are disabled:
tarantool> \set language sql
---
- true
...
tarantool> pragma vdbe_debug=1
---
- error: 'no such pragma: VDBE_DEBUG'
...
tarantool> pragma parser_trace=1
parser: Shift 'cmd', go to state 419
parser: Shift 'SEMI'
parser: Return. Stack=[explain cmd SEMI]
parser: Input '$'
parser: Reduce [ecmd ::= explain cmdx SEMI], go to state 0.
parser: Shift 'ecmd', go to state 420
parser: Reduce [input ::= ecmd], go to state 0.
parser: Accept!
parser: Return. Stack=]
---
- []
...
Lets remove it and replace with simple ifdef debug.
The same if for ENABLE_WHERETRACE
More information about the Tarantool-patches
mailing list