database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

When doing a DISTINCT aggregate that contains an ORDER BY, only the

Browse Source 
arguments to the aggregate need to be distinct, not the ORDER BY terms.

FossilOrigin-Name: d2dbbdf7194bab4e5e3b74d3dbffb012a335829824c775c72dd7347c013d2125
This commit is contained in:
drh
2023-10-25 14:54:16 +00:00
parent a9a7d118f6
commit 8f99cb9ad6
5 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/select.c
View File

@@ -6771,6 +6771,7 @@ static void updateAccumulator(
int addrNext = 0;
int regAgg;
int regAggSz = 0;
int regDistinct = 0;
ExprList *pList;
assert( ExprUseXList(pF->pFExpr) );
assert( !IsWindowFunc(pF->pFExpr) );
@@ -6820,6 +6821,7 @@ static void updateAccumulator(
}
regAggSz++; /* One extra register to hold result of MakeRecord */
regAgg = sqlite3GetTempRange(pParse, regAggSz);
regDistinct = regAgg;
sqlite3ExprCodeExprList(pParse, pOBList, regAgg, 0, SQLITE_ECEL_DUP);
jj = pOBList->nExpr;
if( !pF->bOBUnique ){
@@ -6827,11 +6829,13 @@ static void updateAccumulator(
jj++;
}
if( pF->bOBPayload ){
sqlite3ExprCodeExprList(pParse, pList, regAgg+jj, 0, SQLITE_ECEL_DUP);
regDistinct = regAgg+jj;
sqlite3ExprCodeExprList(pParse, pList, regDistinct, 0, SQLITE_ECEL_DUP);
}
}else if( pList ){
nArg = pList->nExpr;
regAgg = sqlite3GetTempRange(pParse, nArg);
regDistinct = regAgg;
sqlite3ExprCodeExprList(pParse, pList, regAgg, 0, SQLITE_ECEL_DUP);
}else{
nArg = 0;
@@ -6842,7 +6846,7 @@ static void updateAccumulator(
addrNext = sqlite3VdbeMakeLabel(pParse);
}
pF->iDistinct = codeDistinct(pParse, eDistinctType,
pF->iDistinct, addrNext, pList, regAgg);
pF->iDistinct, addrNext, pList, regDistinct);
}
if( pF->iOBTab>=0 ){
/* Insert a new record into the ORDER BY table */