database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-15 11:41:13 +03:00
Code Activity

Change the names of SRT_DistTable and SRT_Table used by CTE to more

Browse Source 
meaningful SRT_DistFifo and SRT_Fifo, respectively.  Simplify the
IgnorableOrderby() macro in the process.

FossilOrigin-Name: 45d8cc678d128f1dda6469864215a8ed9de4366a
This commit is contained in:
drh
2014-03-21 19:56:09 +00:00
parent 9afccba269
commit 8e1ee88c88
4 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Avoid\sleaking\smemory\sin\san\sobscure\scase\swhere\sthe\sflattener\sadds\san\sORDER\sBY\sclause\sto\sthe\srecursive\spart\sof\sa\srecursive\squery. C Change\sthe\snames\sof\sSRT_DistTable\sand\sSRT_Table\sused\sby\sCTE\sto\smore\nmeaningful\sSRT_DistFifo\sand\sSRT_Fifo,\srespectively.\s\sSimplify\sthe\nIgnorableOrderby()\smacro\sin\sthe\sprocess.
D 2014-03-21T19:27:54.828 D 2014-03-21T19:56:09.443
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -217,12 +217,12 @@ F src/printf.c e5a0005f8b3de21f85da6a709d2fbee76775bf4b
F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66 F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
F src/select.c 0f7542b85f92d8b0c59a21d7ddcf5c0228e60fdc F src/select.c cbee644f795a5fa14fa79bd760c3c9c883a6b4d8
F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf
F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80 F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
F src/sqliteInt.h 828f61d3c58608ad2e871369950f3cf70428e917 F src/sqliteInt.h 76b1cf0836f0d022aec5045474f5c6c90f7b9730
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1156,7 +1156,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P 179ef81648b0ad557df78b7712f216b876b6fb65 P 1f413aca00015100224273480e1ce39a76bf93ab
R d6ea5c2b32ee3608a1c16a03630c7806 R 26118dcbaf585402aab527afe8f97345
U dan U drh
Z 37d6162a1c996286e576ee6c912ca01b Z d7e9ffdc5a42e976a5961e8287a0561b

2
manifest.uuid
View File

@@ -1 +1 @@
1f413aca00015100224273480e1ce39a76bf93ab 45d8cc678d128f1dda6469864215a8ed9de4366a

22
src/select.c
View File

@@ -700,7 +700,8 @@ static void selectInnerLoop(
/* Store the result as data using a unique key. /* Store the result as data using a unique key.
*/ */
case SRT_DistTable: case SRT_Fifo:
case SRT_DistFifo:
case SRT_Table: case SRT_Table:
case SRT_EphemTab: { case SRT_EphemTab: {
int r1 = sqlite3GetTempReg(pParse); int r1 = sqlite3GetTempReg(pParse);
@@ -708,8 +709,8 @@ static void selectInnerLoop(
testcase( eDest==SRT_EphemTab ); testcase( eDest==SRT_EphemTab );
sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nResultCol, r1); sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nResultCol, r1);
#ifndef SQLITE_OMIT_CTE #ifndef SQLITE_OMIT_CTE
if( eDest==SRT_DistTable ){ if( eDest==SRT_DistFifo ){
/* If the destination is DistTable, then cursor (iParm+1) is open /* If the destination is DistFifo, then cursor (iParm+1) is open
** on an ephemeral index. If the current row is already present ** on an ephemeral index. If the current row is already present
** in the index, do not write it to the output. If not, add the ** in the index, do not write it to the output. If not, add the
** current row to the index and proceed with writing it to the ** current row to the index and proceed with writing it to the
@@ -1835,7 +1836,7 @@ static void generateWithRecursiveQuery(
int regCurrent; /* Register holding Current table */ int regCurrent; /* Register holding Current table */
int iQueue; /* The Queue table */ int iQueue; /* The Queue table */
int iDistinct = 0; /* To ensure unique results if UNION */ int iDistinct = 0; /* To ensure unique results if UNION */
int eDest = SRT_Table; /* How to write to Queue */ int eDest = SRT_Fifo; /* How to write to Queue */
SelectDest destQueue; /* SelectDest targetting the Queue table */ SelectDest destQueue; /* SelectDest targetting the Queue table */
int i; /* Loop counter */ int i; /* Loop counter */
int rc; /* Result code */ int rc; /* Result code */
@@ -1867,13 +1868,13 @@ static void generateWithRecursiveQuery(
/* Allocate cursors numbers for Queue and Distinct. The cursor number for /* Allocate cursors numbers for Queue and Distinct. The cursor number for
** the Distinct table must be exactly one greater than Queue in order ** the Distinct table must be exactly one greater than Queue in order
** for the SRT_DistTable and SRT_DistQueue destinations to work. */ ** for the SRT_DistFifo and SRT_DistQueue destinations to work. */
iQueue = pParse->nTab++; iQueue = pParse->nTab++;
if( p->op==TK_UNION ){ if( p->op==TK_UNION ){
eDest = pOrderBy ? SRT_DistQueue : SRT_DistTable; eDest = pOrderBy ? SRT_DistQueue : SRT_DistFifo;
iDistinct = pParse->nTab++; iDistinct = pParse->nTab++;
}else{ }else{
eDest = pOrderBy ? SRT_Queue : SRT_Table; eDest = pOrderBy ? SRT_Queue : SRT_Fifo;
} }
sqlite3SelectDestInit(&destQueue, eDest, iQueue); sqlite3SelectDestInit(&destQueue, eDest, iQueue);
@@ -4488,14 +4489,15 @@ 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));
assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistTable ); assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistFifo );
assert( p->pOrderBy==0 || pDest->eDest!=SRT_Fifo );
assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistQueue ); assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistQueue );
assert( p->pOrderBy==0 || pDest->eDest!=SRT_Queue ); assert( p->pOrderBy==0 || pDest->eDest!=SRT_Queue );
if( IgnorableOrderby(pDest) ){ if( IgnorableOrderby(pDest) ){
assert(pDest->eDest==SRT_Exists || pDest->eDest==SRT_Union || assert(pDest->eDest==SRT_Exists || pDest->eDest==SRT_Union ||
pDest->eDest==SRT_Except || pDest->eDest==SRT_Discard || pDest->eDest==SRT_Except || pDest->eDest==SRT_Discard ||
pDest->eDest==SRT_Queue || pDest->eDest==SRT_DistTable || pDest->eDest==SRT_Queue || pDest->eDest==SRT_DistFifo ||
pDest->eDest==SRT_DistQueue); pDest->eDest==SRT_DistQueue || pDest->eDest==SRT_Fifo);
/* If ORDER BY makes no difference in the output then neither does /* If ORDER BY makes no difference in the output then neither does
** DISTINCT so it can be removed too. */ ** DISTINCT so it can be removed too. */
sqlite3ExprListDelete(db, p->pOrderBy); sqlite3ExprListDelete(db, p->pOrderBy);

31
src/sqliteInt.h
View File

@@ -2261,13 +2261,15 @@ struct Select {
** starting with pDest->iSdst. ** starting with pDest->iSdst.
** **
** SRT_Table Store results in temporary table pDest->iSDParm. ** SRT_Table Store results in temporary table pDest->iSDParm.
** This is like SRT_EphemTab except that the table ** SRT_Fifo This is like SRT_EphemTab except that the table
** is assumed to already be open. ** is assumed to already be open. SRT_Fifo has
** the additional property of being able to ignore
** the ORDER BY clause.
** **
** SRT_DistTable Store results in a temporary table pDest->iSDParm. ** SRT_DistFifo Store results in a temporary table pDest->iSDParm.
** But also use temporary table pDest->iSDParm+1 as ** But also use temporary table pDest->iSDParm+1 as
** a record of all prior results and ignore any duplicate ** a record of all prior results and ignore any duplicate
** rows. Name means: "Distinct Table". ** rows. Name means: "Distinct Fifo".
** **
** SRT_Queue Store results in priority queue pDest->iSDParm (really ** SRT_Queue Store results in priority queue pDest->iSDParm (really
** an index). Append a sequence number so that all entries ** an index). Append a sequence number so that all entries
@@ -2281,19 +2283,20 @@ struct Select {
#define SRT_Except 2 /* Remove result from a UNION index */ #define SRT_Except 2 /* Remove result from a UNION index */
#define SRT_Exists 3 /* Store 1 if the result is not empty */ #define SRT_Exists 3 /* Store 1 if the result is not empty */
#define SRT_Discard 4 /* Do not save the results anywhere */ #define SRT_Discard 4 /* Do not save the results anywhere */
#define SRT_Fifo 5 /* Store result as data with an automatic rowid */
#define SRT_DistFifo 6 /* Like SRT_Fifo, but unique results only */
#define SRT_Queue 7 /* Store result in an queue */
#define SRT_DistQueue 8 /* Like SRT_Queue, but unique results only */
/* The ORDER BY clause is ignored for all of the above */ /* The ORDER BY clause is ignored for all of the above */
#define IgnorableOrderby(X) ((X->eDest)<=SRT_Discard || (X->eDest)>SRT_Table) #define IgnorableOrderby(X) ((X->eDest)<=SRT_DistQueue)
#define SRT_Output 5 /* Output each row of result */ #define SRT_Output 9 /* Output each row of result */
#define SRT_Mem 6 /* Store result in a memory cell */ #define SRT_Mem 10 /* Store result in a memory cell */
#define SRT_Set 7 /* Store results as keys in an index */ #define SRT_Set 11 /* Store results as keys in an index */
#define SRT_EphemTab 8 /* Create transient tab and store like SRT_Table */ #define SRT_EphemTab 12 /* Create transient tab and store like SRT_Table */
#define SRT_Coroutine 9 /* Generate a single row of result */ #define SRT_Coroutine 13 /* Generate a single row of result */
#define SRT_Table 10 /* Store result as data with an automatic rowid */ #define SRT_Table 14 /* Store result as data with an automatic rowid */
#define SRT_DistTable 11 /* Like SRT_Table, but unique results only */
#define SRT_Queue 12 /* Store result in an queue */
#define SRT_DistQueue 13 /* Like SRT_Queue, but unique results only */
/* /*
** An instance of this object describes where to put of the results of ** An instance of this object describes where to put of the results of