database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Minor improvements to ".selecttrace". No changes to non-debug code.

Browse Source 
FossilOrigin-Name: 03e541f606ead1a13e1084db88e168278c82a2ba72b18c89baafeab3141367b4
This commit is contained in:
drh
2018-03-19 22:28:34 +00:00
parent 8c1eba75a3
commit cfd74700da
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Enhance\sthe\scommand-line\scompletion\sextension\sto\sreturn\sthe\snames\sof\ntriggers\sand\sviews\salong\swith\sthe\snames\sof\stables. C Minor\simprovements\sto\s".selecttrace".\s\sNo\schanges\sto\snon-debug\scode.
D 2018-03-19T19:05:45.247 D 2018-03-19T22:28:34.252
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -478,7 +478,7 @@ F src/os_win.c eb03c6d52f893bcd7fdd4c6006674c13c1b5e49543fec98d605201af2997171c
F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
F src/pager.c 3e3b659b6b3f40b5a5efef6b8890ced490c397a81d96feb5266fde1f7362e608 F src/pager.c 3e3b659b6b3f40b5a5efef6b8890ced490c397a81d96feb5266fde1f7362e608
F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
F src/parse.y 3be4b2b5e33ef7dab3128b765898ee786fc6cd698a7f053f756a68f2f238f0aa F src/parse.y 140bbc53b5f67f731239f7fc8704a4f1e60cbbc10fb84bf9577322f974725f19
F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd
F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170 F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880 F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
@@ -489,12 +489,12 @@ F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660
F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6 F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
F src/select.c 1e9f53890f746f26d6955b38a6be37e65e32a6e5aea098c19cf7114730ea72e6 F src/select.c a69962ae4faa8afd8149ca2897714580ff212c19bdcc2c733c3f5375295ffe98
F src/shell.c.in 52b1b3f52159144391d598f43ef7ce13f58f35fcc18ae04df68e879695a1747f F src/shell.c.in 52b1b3f52159144391d598f43ef7ce13f58f35fcc18ae04df68e879695a1747f
F src/sqlite.h.in 2619d00bccc0454e875bce5e90b1dc986f87975c267dd7bbbe251f1be297d2f3 F src/sqlite.h.in 2619d00bccc0454e875bce5e90b1dc986f87975c267dd7bbbe251f1be297d2f3
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
F src/sqliteInt.h 2ef60a6d9a50e6eef224e9eae71b29a9fb91c301e882d9fbbb77afd50b6cf815 F src/sqliteInt.h 51d03b44036108edf29cec31765c4b9706a2189cce17f25e9eed83efe80bbf14
F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1712,7 +1712,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 1ec339fd109b31e1d2b1e73345bd7a00c3d755f2c45c14d050a8203969163d60 P 10e32204e1850354ff16fc052145726e903f87185a37f172831dddad1955184e
R 69307f298767656da036188fd7e04892 R 012c6c14620983eaab087972d93c496b
U drh U drh
Z 6ac86335f2d36be7a35b1bb439cc07e4 Z c34bb330da7e0cc04245a4c39fd98568

2
manifest.uuid
View File

@@ -1 +1 @@
10e32204e1850354ff16fc052145726e903f87185a37f172831dddad1955184e 03e541f606ead1a13e1084db88e168278c82a2ba72b18c89baafeab3141367b4

3
src/parse.y
View File

@@ -523,8 +523,7 @@ oneselect(A) ::= SELECT(S) distinct(D) selcollist(W) from(X) where_opt(Y)
if( A!=0 ){ if( A!=0 ){
const char *z = s.z+6; const char *z = s.z+6;
int i; int i;
sqlite3_snprintf(sizeof(A->zSelName), A->zSelName, "#%d", sqlite3_snprintf(sizeof(A->zSelName), A->zSelName,"#%d",++pParse->nSelect);
++pParse->nSelect);
while( z[0]==' ' ) z++; while( z[0]==' ' ) z++;
if( z[0]=='/' && z[1]=='*' ){ if( z[0]=='/' && z[1]=='*' ){
z += 2; z += 2;

9
src/select.c
View File

@@ -21,8 +21,7 @@
/***/ int sqlite3SelectTrace = 0; /***/ int sqlite3SelectTrace = 0;
# define SELECTTRACE(K,P,S,X) \ # define SELECTTRACE(K,P,S,X) \
if(sqlite3SelectTrace&(K)) \ if(sqlite3SelectTrace&(K)) \
sqlite3DebugPrintf("%*s%s/%p: ",(P)->nSelectIndent*2-2,"",\ sqlite3DebugPrintf("%s/%p: ",(S)->zSelName,(S)),\
(S)->zSelName,(S)),\
sqlite3DebugPrintf X sqlite3DebugPrintf X
#else #else
# define SELECTTRACE(K,P,S,X) # define SELECTTRACE(K,P,S,X)
@@ -5142,7 +5141,6 @@ int sqlite3Select(
if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1; if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
memset(&sAggInfo, 0, sizeof(sAggInfo)); memset(&sAggInfo, 0, sizeof(sAggInfo));
#if SELECTTRACE_ENABLED #if SELECTTRACE_ENABLED
pParse->nSelectIndent++;
SELECTTRACE(1,pParse,p, ("begin processing:\n")); SELECTTRACE(1,pParse,p, ("begin processing:\n"));
if( sqlite3SelectTrace & 0x100 ){ if( sqlite3SelectTrace & 0x100 ){
sqlite3TreeViewSelect(0, p, 0); sqlite3TreeViewSelect(0, p, 0);
@@ -5263,7 +5261,6 @@ int sqlite3Select(
explainSetInteger(pParse->iSelectId, iRestoreSelectId); explainSetInteger(pParse->iSelectId, iRestoreSelectId);
#if SELECTTRACE_ENABLED #if SELECTTRACE_ENABLED
SELECTTRACE(1,pParse,p,("end compound-select processing\n")); SELECTTRACE(1,pParse,p,("end compound-select processing\n"));
pParse->nSelectIndent--;
#endif #endif
return rc; return rc;
} }
@@ -5547,6 +5544,7 @@ int sqlite3Select(
wctrlFlags |= p->selFlags & SF_FixedLimit; wctrlFlags |= p->selFlags & SF_FixedLimit;
/* Begin the database scan. */ /* Begin the database scan. */
SELECTTRACE(1,pParse,p,("WhereBegin\n"));
pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, sSort.pOrderBy, pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, sSort.pOrderBy,
p->pEList, wctrlFlags, p->nSelectRow); p->pEList, wctrlFlags, p->nSelectRow);
if( pWInfo==0 ) goto select_end; if( pWInfo==0 ) goto select_end;
@@ -5735,6 +5733,7 @@ int sqlite3Select(
** in the right order to begin with. ** in the right order to begin with.
*/ */
sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset); sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
SELECTTRACE(1,pParse,p,("WhereBegin\n"));
pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, 0, pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, 0,
WHERE_GROUPBY | (orderByGrp ? WHERE_SORTBYGROUP : 0), 0 WHERE_GROUPBY | (orderByGrp ? WHERE_SORTBYGROUP : 0), 0
); );
@@ -5990,6 +5989,7 @@ int sqlite3Select(
assert( minMaxFlag==WHERE_ORDERBY_NORMAL || pMinMaxOrderBy!=0 ); assert( minMaxFlag==WHERE_ORDERBY_NORMAL || pMinMaxOrderBy!=0 );
assert( pMinMaxOrderBy==0 || pMinMaxOrderBy->nExpr==1 ); assert( pMinMaxOrderBy==0 || pMinMaxOrderBy->nExpr==1 );
SELECTTRACE(1,pParse,p,("WhereBegin\n"));
pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pMinMaxOrderBy, pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pMinMaxOrderBy,
0, minMaxFlag, 0); 0, minMaxFlag, 0);
if( pWInfo==0 ){ if( pWInfo==0 ){
@@ -6045,7 +6045,6 @@ select_end:
sqlite3DbFree(db, sAggInfo.aFunc); sqlite3DbFree(db, sAggInfo.aFunc);
#if SELECTTRACE_ENABLED #if SELECTTRACE_ENABLED
SELECTTRACE(1,pParse,p,("end processing\n")); SELECTTRACE(1,pParse,p,("end processing\n"));
pParse->nSelectIndent--;
#endif #endif
return rc; return rc;
} }

1
src/sqliteInt.h
View File

@@ -2993,7 +2993,6 @@ struct Parse {
int nMaxArg; /* Max args passed to user function by sub-program */ int nMaxArg; /* Max args passed to user function by sub-program */
#if SELECTTRACE_ENABLED #if SELECTTRACE_ENABLED
int nSelect; /* Number of SELECT statements seen */ int nSelect; /* Number of SELECT statements seen */
int nSelectIndent; /* How far to indent SELECTTRACE() output */
#endif #endif
#ifndef SQLITE_OMIT_SHARED_CACHE #ifndef SQLITE_OMIT_SHARED_CACHE
int nTableLock; /* Number of locks in aTableLock */ int nTableLock; /* Number of locks in aTableLock */