From: drh Date: Fri, 17 Mar 2006 13:56:34 +0000 (+0000) Subject: Miscellaneous code cleanup. (CVS 3143) X-Git-Tag: version-3.6.10~3024 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8875400e417ec7e777baf665f34ccdff41edf4f;p=thirdparty%2Fsqlite.git Miscellaneous code cleanup. (CVS 3143) FossilOrigin-Name: 8f60139f688903f0e635b0a904ab9ca401fbe71f --- diff --git a/manifest b/manifest index 9e561eb5c2..491bbfaeba 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Code\sand\scomment\scleanup\sfor\sthe\ssorting\soptimization\sof\sthe\sprevious\scheck-in.\s(CVS\s3142) -D 2006-03-17T00:26:00 +C Miscellaneous\scode\scleanup.\s(CVS\s3143) +D 2006-03-17T13:56:34 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -42,7 +42,7 @@ F src/complete.c 7d1a44be8f37de125fcafd3d3a018690b3799675 F src/date.c cd2bd5d1ebc6fa12d6312f69789ae5b0a2766f2e F src/delete.c 2dea1a83e6ef534346e74fd03114d3a7b16f08fc F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b -F src/expr.c 105e8e17babd4dec832d4a0c88bea12ec074cbbe +F src/expr.c c85d7bee7d8e3184e00166c2c2ab6edd57b60486 F src/func.c 380f2f8e555ccbf899e65f01475c4ac13c478dc2 F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564 @@ -66,11 +66,11 @@ F src/pragma.c 27d5e395c5d950931c7ac4fe610e7c2993e2fa55 F src/prepare.c 6afd730cc8851c0920b5f9050294646b1c2ab28c F src/printf.c 341e488b549b1a41f83b05a69ce1d7a8258b624c F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261 -F src/select.c c95d5cd4331f68d8de947586edb06dc710167317 +F src/select.c eefb46a67c8d154aa87e9fad2ffb0671f1fe4027 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c 7a4b16f85d8f6f25d917cdc3d0f7e18f84867adf F src/sqlite.h.in 0bf6f03f9a14dde5f3a4f87471840803acaa4497 -F src/sqliteInt.h dba7385fa5a03148ffcf44536d65e263e07bb2e3 +F src/sqliteInt.h 18a99e57fd6c8fc4a309107230bcb05556f2194e F src/table.c f64ec4fbfe333f8df925bc6ba494f55e05b0e75e F src/tclsqlite.c d20bdf1822c47e367f5acd37823ffe67df40301c F src/test1.c d1f210f3a295670e5d82d620bea46fabc73bb0ea @@ -90,10 +90,10 @@ F src/utf.c 1d51225bce1ea8d1978e8ab28e862a0c12c7a8e8 F src/util.c 59389ed717f0fa9d8023b3f482ba09dcf41343a8 F src/vacuum.c 5b37d0f436f8e1ffacd17934e44720b38d2247f9 F src/vdbe.c dcc469dabef9462b3e8bc77193f83a57f3084363 -F src/vdbe.h 80ba1c391ec28180dd07a630577f50b22c2062da +F src/vdbe.h 44ff995a8b4e87016794095273e9e7300f0001bb F src/vdbeInt.h 85cd5f81d38edb1b8f4786f407c77a7a3ba636fb F src/vdbeapi.c 7dc662e7c905ce666bb506dced932e0307115cbf -F src/vdbeaux.c 2ee7d951161769bf3429df2a9cd2c4f2e358807e +F src/vdbeaux.c 4002e6b19d7c9719cb81f9797316b9ad118e4370 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3 F src/where.c 39af47e7f48be8df8a14a5965a38326bccf8eeed @@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 6b3717aeb4ac45a433f2a30bdd0264ed728676e1 -R f6f3e7e6d067c9a94240a0959ac790cf +P f3fbe72733b49264a6e0a91bf65c7fd80c7b65ea +R 7b1aa054fc6b49f4e8c9600b3bfb5da8 U drh -Z 6dcf6a197f2543f12524c83228a1e433 +Z 586be5c0c2d47198993602b46076379e diff --git a/manifest.uuid b/manifest.uuid index 55710c070b..b901a5318b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f3fbe72733b49264a6e0a91bf65c7fd80c7b65ea \ No newline at end of file +8f60139f688903f0e635b0a904ab9ca401fbe71f \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 857294739f..f427c3fa61 100644 --- a/src/expr.c +++ b/src/expr.c @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: expr.c,v 1.256 2006/03/06 20:55:46 drh Exp $ +** $Id: expr.c,v 1.257 2006/03/17 13:56:34 drh Exp $ */ #include "sqliteInt.h" #include @@ -1381,11 +1381,7 @@ void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ ** expression we need to rerun this code each time. */ if( testAddr>0 && !sqlite3ExprIsConstant(pE2) ){ - VdbeOp *aOp = sqlite3VdbeGetOp(v, testAddr-1); - int j; - for(j=0; j<3; j++){ - aOp[j].opcode = OP_Noop; - } + sqlite3VdbeChangeToNoop(v, testAddr-1, 3); testAddr = 0; } diff --git a/src/select.c b/src/select.c index d1b6df2f73..7566c117e2 100644 --- a/src/select.c +++ b/src/select.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id: select.c,v 1.308 2006/03/17 00:04:03 drh Exp $ +** $Id: select.c,v 1.309 2006/03/17 13:56:34 drh Exp $ */ #include "sqliteInt.h" @@ -411,22 +411,18 @@ static void codeOffset( ** seen combinations of the N values. A new entry is made in iTab ** if the current N values are new. ** -** A jump to addrRepeat is made and the K values are popped from the +** A jump to addrRepeat is made and the N+1 values are popped from the ** stack if the top N elements are not distinct. */ static void codeDistinct( Vdbe *v, /* Generate code into this VM */ int iTab, /* A sorting index used to test for distinctness */ int addrRepeat, /* Jump to here if not distinct */ - int N, /* The top N elements of the stack must be distinct */ - int K /* Pop K elements from the stack if indistinct */ + int N /* The top N elements of the stack must be distinct */ ){ -#if NULL_ALWAYS_DISTINCT - sqlite3VdbeAddOp(v, OP_IsNull, -N, sqlite3VdbeCurrentAddr(v)+6); -#endif sqlite3VdbeAddOp(v, OP_MakeRecord, -N, 0); sqlite3VdbeAddOp(v, OP_Distinct, iTab, sqlite3VdbeCurrentAddr(v)+3); - sqlite3VdbeAddOp(v, OP_Pop, K, 0); + sqlite3VdbeAddOp(v, OP_Pop, N+1, 0); sqlite3VdbeAddOp(v, OP_Goto, 0, addrRepeat); VdbeComment((v, "# skip indistinct records")); sqlite3VdbeAddOp(v, OP_IdxInsert, iTab, 0); @@ -487,8 +483,9 @@ static int selectInnerLoop( ** part of the result. */ if( hasDistinct ){ - int n = pEList->nExpr; - codeDistinct(v, distinct, iContinue, n, n+1); + assert( pEList!=0 ); + assert( pEList->nExpr==nColumn ); + codeDistinct(v, distinct, iContinue, nColumn); if( pOrderBy==0 ){ codeOffset(v, p, iContinue, nColumn); } @@ -500,7 +497,7 @@ static int selectInnerLoop( */ #ifndef SQLITE_OMIT_COMPOUND_SELECT case SRT_Union: { - sqlite3VdbeAddOp(v, OP_MakeRecord, nColumn, NULL_ALWAYS_DISTINCT); + sqlite3VdbeAddOp(v, OP_MakeRecord, nColumn, 0); if( aff ){ sqlite3VdbeChangeP3(v, -1, aff, P3_STATIC); } @@ -514,7 +511,7 @@ static int selectInnerLoop( */ case SRT_Except: { int addr; - addr = sqlite3VdbeAddOp(v, OP_MakeRecord, nColumn, NULL_ALWAYS_DISTINCT); + addr = sqlite3VdbeAddOp(v, OP_MakeRecord, nColumn, 0); sqlite3VdbeChangeP3(v, -1, aff, P3_STATIC); sqlite3VdbeAddOp(v, OP_NotFound, iParm, addr+3); sqlite3VdbeAddOp(v, OP_Delete, iParm, 0); @@ -1546,20 +1543,6 @@ static void createSortingIndex(Parse *pParse, Select *p, ExprList *pOrderBy){ } } -/* -** The opcode at addr is an OP_OpenVirtual that created a sorting -** index tha we ended up not needing. This routine changes that -** opcode to OP_Noop. -*/ -static void uncreateSortingIndex(Parse *pParse, int addr){ - Vdbe *v = pParse->pVdbe; - VdbeOp *pOp = sqlite3VdbeGetOp(v, addr); - sqlite3VdbeChangeP3(v, addr, 0, 0); - pOp->opcode = OP_Noop; - pOp->p1 = 0; - pOp->p2 = 0; -} - #ifndef SQLITE_OMIT_COMPOUND_SELECT /* ** Return the appropriate collating sequence for the iCol-th column of @@ -2693,7 +2676,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){ if( pF->iDistinct>=0 ){ addrNext = sqlite3VdbeMakeLabel(v); assert( nArg==1 ); - codeDistinct(v, pF->iDistinct, addrNext, 1, 2); + codeDistinct(v, pF->iDistinct, addrNext, 1); } if( pF->pFunc->needCollSeq ){ CollSeq *pColl = 0; @@ -2984,7 +2967,7 @@ int sqlite3Select( ** into an OP_Noop. */ if( addrSortIndex>=0 && pOrderBy==0 ){ - uncreateSortingIndex(pParse, addrSortIndex); + sqlite3VdbeChangeToNoop(v, addrSortIndex, 1); p->addrOpenVirt[2] = -1; } @@ -3230,7 +3213,7 @@ int sqlite3Select( sqlite3VdbeAddOp(v, OP_Next, sAggInfo.sortingIdx, addrTopOfLoop); }else{ sqlite3WhereEnd(pWInfo); - uncreateSortingIndex(pParse, addrSortingIdx); + sqlite3VdbeChangeToNoop(v, addrSortingIdx, 1); } /* Output the final row of result diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 93d7b9df1d..719397dac0 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.490 2006/03/17 00:04:04 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.491 2006/03/17 13:56:34 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -112,18 +112,6 @@ #define OMIT_TEMPDB 0 #endif -/* -** If the following macro is set to 1, then NULL values are considered -** distinct for the SELECT DISTINCT statement and for UNION or EXCEPT -** compound queries. No other SQL database engine (among those tested) -** works this way except for OCELOT. But the SQL92 spec implies that -** this is how things should work. -** -** If the following macro is set to 0, then NULLs are indistinct for -** SELECT DISTINCT and for UNION. -*/ -#define NULL_ALWAYS_DISTINCT 0 - /* ** If the following macro is set to 1, then NULL values are considered ** distinct when determining whether or not two entries are the same diff --git a/src/vdbe.h b/src/vdbe.h index b79efcbd13..46045423d6 100644 --- a/src/vdbe.h +++ b/src/vdbe.h @@ -15,7 +15,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: vdbe.h,v 1.101 2006/02/10 03:06:10 danielk1977 Exp $ +** $Id: vdbe.h,v 1.102 2006/03/17 13:56:34 drh Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -117,6 +117,7 @@ int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp); void sqlite3VdbeChangeP1(Vdbe*, int addr, int P1); void sqlite3VdbeChangeP2(Vdbe*, int addr, int P2); void sqlite3VdbeJumpHere(Vdbe*, int addr); +void sqlite3VdbeChangeToNoop(Vdbe*, int addr, int N); void sqlite3VdbeChangeP3(Vdbe*, int addr, const char *zP1, int N); VdbeOp *sqlite3VdbeGetOp(Vdbe*, int); int sqlite3VdbeMakeLabel(Vdbe*); diff --git a/src/vdbeaux.c b/src/vdbeaux.c index 4214352dbb..f5710b121a 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -361,7 +361,7 @@ void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){ } /* -** Change teh P2 operand of instruction addr so that it points to +** Change the P2 operand of instruction addr so that it points to ** the address of the next instruction to be coded. */ void sqlite3VdbeJumpHere(Vdbe *p, int addr){ @@ -395,6 +395,19 @@ static void freeP3(int p3type, void *p3){ } +/* +** Change N opcodes starting at addr to No-ops. +*/ +void sqlite3VdbeChangeToNoop(Vdbe *p, int addr, int N){ + VdbeOp *pOp = &p->aOp[addr]; + while( N-- ){ + freeP3(pOp->p3type, pOp->p3); + memset(pOp, 0, sizeof(pOp[0])); + pOp->opcode = OP_Noop; + pOp++; + } +} + /* ** Change the value of the P3 operand for a specific instruction. ** This routine is useful when a large program is loaded from a