database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-09 14:21:03 +03:00
Code Activity

Performance optimization in the tokenizer/parser loop.

Browse Source 
FossilOrigin-Name: 2cb71583d631cd417acbeebbb4ee950573a9deef
This commit is contained in:
drh
2017-03-07 14:38:52 +00:00
parent 567bd44917
commit 9b38d6660f
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Minor\scomment\stypo\sfixes.\s\sNo\schanges\sto\scode. C Performance\soptimization\sin\sthe\stokenizer/parser\sloop.
D 2017-03-07T12:18:23.791 D 2017-03-07T14:38:52.463
F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2 F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@ -457,7 +457,7 @@ F src/test_windirent.c 17f91f5f2aa1bb7328abb49414c363b5d2a9d3ff
F src/test_windirent.h 5d67483a55442e31e1bde0f4a230e6e932ad5906 F src/test_windirent.h 5d67483a55442e31e1bde0f4a230e6e932ad5906
F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
F src/tokenize.c 25ccc63ae2c4163933221f3181c9982b47cd08d2 F src/tokenize.c dc748c5afcb9e5beb3ef5651bc99a4622e30f6a1
F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c
F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182 F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58 F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
@@ -1562,7 +1562,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 e0a3d39f51a50420bae97e2bc9a8c01a5b0d3db8 P 01cd9fb176cde30658233e36aad44e4a5519612e
R 3a57497a1a3fd47f649c0fa2a10dc005 R 71cd7c04663535bedf446cdfbe42cd2c
U drh U drh
Z 8979ee765002edd7cbb3fe90b0cd803b Z ad71d7ac120da8173e9f5ee4d75c7bc4

2
manifest.uuid
View File

@@ -1 +1 @@
01cd9fb176cde30658233e36aad44e4a5519612e 2cb71583d631cd417acbeebbb4ee950573a9deef

23
src/tokenize.c
View File

@@ -475,8 +475,8 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
*/ */
int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
int nErr = 0; /* Number of errors encountered */ int nErr = 0; /* Number of errors encountered */
int i; /* Loop counter */
void *pEngine; /* The LEMON-generated LALR(1) parser */ void *pEngine; /* The LEMON-generated LALR(1) parser */
int n = 0; /* Length of the next token token */
int tokenType; /* type of the next token */ int tokenType; /* type of the next token */
int lastTokenParsed = -1; /* type of the previous token */ int lastTokenParsed = -1; /* type of the previous token */
sqlite3 *db = pParse->db; /* The database connection */ sqlite3 *db = pParse->db; /* The database connection */
@@ -492,7 +492,6 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
} }
pParse->rc = SQLITE_OK; pParse->rc = SQLITE_OK;
pParse->zTail = zSql; pParse->zTail = zSql;
i = 0;
assert( pzErrMsg!=0 ); assert( pzErrMsg!=0 );
/* sqlite3ParserTrace(stdout, "parser: "); */ /* sqlite3ParserTrace(stdout, "parser: "); */
#ifdef sqlite3Parser_ENGINEALWAYSONSTACK #ifdef sqlite3Parser_ENGINEALWAYSONSTACK
@@ -510,12 +509,10 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
assert( pParse->nVar==0 ); assert( pParse->nVar==0 );
assert( pParse->pVList==0 ); assert( pParse->pVList==0 );
while( 1 ){ while( 1 ){
assert( i>=0 ); if( zSql[0]!=0 ){
if( zSql[i]!=0 ){ n = sqlite3GetToken((u8*)zSql, &tokenType);
pParse->sLastToken.z = &zSql[i]; mxSqlLen -= n;
pParse->sLastToken.n = sqlite3GetToken((u8*)&zSql[i],&tokenType); if( mxSqlLen<0 ){
i += pParse->sLastToken.n;
if( i>mxSqlLen ){
pParse->rc = SQLITE_TOOBIG; pParse->rc = SQLITE_TOOBIG;
break; break;
} }
@@ -529,6 +526,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
}else{ }else{
tokenType = TK_SEMI; tokenType = TK_SEMI;
} }
zSql -= n;
} }
if( tokenType>=TK_SPACE ){ if( tokenType>=TK_SPACE ){
assert( tokenType==TK_SPACE || tokenType==TK_ILLEGAL ); assert( tokenType==TK_SPACE || tokenType==TK_ILLEGAL );
@@ -537,18 +535,21 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
break; break;
} }
if( tokenType==TK_ILLEGAL ){ if( tokenType==TK_ILLEGAL ){
sqlite3ErrorMsg(pParse, "unrecognized token: \"%T\"", sqlite3ErrorMsg(pParse, "unrecognized token: \"%.*s\"", n, zSql);
&pParse->sLastToken);
break; break;
} }
zSql += n;
}else{ }else{
pParse->sLastToken.z = zSql;
pParse->sLastToken.n = n;
sqlite3Parser(pEngine, tokenType, pParse->sLastToken, pParse); sqlite3Parser(pEngine, tokenType, pParse->sLastToken, pParse);
lastTokenParsed = tokenType; lastTokenParsed = tokenType;
zSql += n;
if( pParse->rc!=SQLITE_OK || db->mallocFailed ) break; if( pParse->rc!=SQLITE_OK || db->mallocFailed ) break;
} }
} }
assert( nErr==0 ); assert( nErr==0 );
pParse->zTail = &zSql[i]; pParse->zTail = zSql;
#ifdef YYTRACKMAXSTACKDEPTH #ifdef YYTRACKMAXSTACKDEPTH
sqlite3_mutex_enter(sqlite3MallocMutex()); sqlite3_mutex_enter(sqlite3MallocMutex());
sqlite3StatusHighwater(SQLITE_STATUS_PARSER_STACK, sqlite3StatusHighwater(SQLITE_STATUS_PARSER_STACK,