database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Remove incorrect ALWAYS() macros from the window function logic.

Browse Source 
FossilOrigin-Name: 94ac51cc4e7fdf484214e1936fc96104b96134632a8eb99558b3af743ac8bb8b
This commit is contained in:
drh
2018-07-10 23:31:17 +00:00
parent c3649417fe
commit 5d6374fa39
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/window.c
View File

@@ -150,9 +150,7 @@ static void row_numberStepFunc(
sqlite3_value **apArg
){
i64 *p = (i64*)sqlite3_aggregate_context(pCtx, sizeof(*p));
/* row_numberValueFunc() is always called first, so the aggregate context
** is guaranteed to already exist. */
if( ALWAYS(p) ) (*p)++;
if( p ) (*p)++;
UNUSED_PARAMETER(nArg);
UNUSED_PARAMETER(apArg);
}
@@ -184,8 +182,7 @@ static void dense_rankStepFunc(
){
struct CallCount *p;
p = (struct CallCount*)sqlite3_aggregate_context(pCtx, sizeof(*p));
/* p is not NULL because dense_rankValueFunc() will have been called first */
if( ALWAYS(p) ) p->nStep = 1;
if( p ) p->nStep = 1;
UNUSED_PARAMETER(nArg);
UNUSED_PARAMETER(apArg);
}
@@ -214,8 +211,7 @@ static void rankStepFunc(
){
struct CallCount *p;
p = (struct CallCount*)sqlite3_aggregate_context(pCtx, sizeof(*p));
/* p is not NULL because rankValueFunc() will have been called first */
if( ALWAYS(p) ){
if( p ){
p->nStep++;
if( p->nValue==0 ){
p->nValue = p->nStep;
@@ -248,8 +244,7 @@ static void percent_rankStepFunc(
UNUSED_PARAMETER(nArg); assert( nArg==1 );
p = (struct CallCount*)sqlite3_aggregate_context(pCtx, sizeof(*p));
/* p is not NULL because percent_rankValueFunc() will have been called */
if( ALWAYS(p) ){
if( p ){
if( p->nTotal==0 ){
p->nTotal = sqlite3_value_int64(apArg[0]);
}
@@ -288,8 +283,7 @@ static void cume_distStepFunc(
assert( nArg==1 ); UNUSED_PARAMETER(nArg);
p = (struct CallCount*)sqlite3_aggregate_context(pCtx, sizeof(*p));
/* p is not NULL because cume_distValueFunc() will have been called first */
if( ALWAYS(p) ){
if( p ){
if( p->nTotal==0 ){
p->nTotal = sqlite3_value_int64(apArg[0]);
}
@@ -328,8 +322,7 @@ static void ntileStepFunc(
struct NtileCtx *p;
assert( nArg==2 ); UNUSED_PARAMETER(nArg);
p = (struct NtileCtx*)sqlite3_aggregate_context(pCtx, sizeof(*p));
/* p is not NULL because ntimeValueFunc() will have been called first */
if( ALWAYS(p) ){
if( p ){
if( p->nTotal==0 ){
p->nParam = sqlite3_value_int64(apArg[0]);
p->nTotal = sqlite3_value_int64(apArg[1]);