SQLite: Check-in [c16125a884]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Allow min() and max() to be used as window functions.
Downloads:	Tarball \| ZIP archive
Timelines:	family \| ancestors \| descendants \| both \| exp-window-functions
Files:	files \| file ages \| folders
SHA3-256:	c16125a884a9131b707ac20033968c4c3177ea79625a15efb64d754568c6c7a0
User & Date:	dan 2018-05-30 20:44:58.014

Context

2018-06-01
21:00		Allow an entire partition to be cached in a temp table for all types of window frames. This is required by nth_value() and others. (check-in: b5b18f6613 user: dan tags: exp-window-functions)
2018-05-30
20:44		Allow min() and max() to be used as window functions. (check-in: c16125a884 user: dan tags: exp-window-functions)
2018-05-28
18:30		Further window frame tests and fixes. (check-in: e74c6e9185 user: dan tags: exp-window-functions)

Changes

Changes to src/sqliteInt.h.

Changes to src/window.c.

Added test/pg_common.tcl.

Changes to test/window2.tcl.

Added test/window3.tcl.

Added test/window3.test.

︙
61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 ~~106 107 108 109 110 111 112~~ 113 114 115 116 117 118 119 120 ~~121 122 123 124 125 126 127 128 129~~ 130 131 132 133 134 135 136	61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198	+ + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + +	if( p1->eEnd!=p2->eEnd ) return 1; if( sqlite3ExprCompare(pParse, p1->pStart, p2->pStart, -1) ) return 1; if( sqlite3ExprCompare(pParse, p1->pEnd, p2->pEnd, -1) ) return 1; if( sqlite3ExprListCompare(p1->pPartition, p2->pPartition, -1) ) return 1; if( sqlite3ExprListCompare(p1->pOrderBy, p2->pOrderBy, -1) ) return 1; return 0; } static void windowAggInit(Parse pParse, Window pMWin){ Window pWin; for(pWin=pMWin; pWin; pWin=pWin->pNextWin){ int funcFlags = pWin->pFunc->funcFlags; if( (funcFlags & SQLITE_FUNC_MINMAX) && pWin->eStart!=TK_UNBOUNDED ){ ExprList pList = pWin->pOwner->x.pList; KeyInfo pKeyInfo = sqlite3KeyInfoFromExprList(pParse, pList, 0, 0); Vdbe v = sqlite3GetVdbe(pParse); pWin->csrApp = pParse->nTab++; pWin->regApp = pParse->nMem+1; pParse->nMem += 3; if( pKeyInfo && pWin->pFunc->zName[1]=='i' ){ assert( pKeyInfo->aSortOrder[0]==0 ); pKeyInfo->aSortOrder[0] = 1; } sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pWin->csrApp, 2); sqlite3VdbeAppendP4(v, pKeyInfo, P4_KEYINFO); sqlite3VdbeAddOp2(v, OP_Integer, 0, pWin->regApp+1); } } } void sqlite3WindowCodeInit(Parse pParse, Window pWin){ Vdbe v = sqlite3GetVdbe(pParse); int nPart = (pWin->pPartition ? pWin->pPartition->nExpr : 0); nPart += (pWin->pOrderBy ? pWin->pOrderBy->nExpr : 0); if( nPart ){ pWin->regPart = pParse->nMem+1; pParse->nMem += nPart; sqlite3VdbeAddOp3(v, OP_Null, 0, pWin->regPart, pWin->regPart+nPart-1); } windowAggInit(pParse, pWin); } static void windowCheckFrameValue(Parse pParse, int reg, int bEnd){ static const char azErr[] = { "frame starting offset must be a non-negative integer", "frame ending offset must be a non-negative integer" }; Vdbe v = sqlite3GetVdbe(pParse); int regZero = ++pParse->nMem; sqlite3VdbeAddOp2(v, OP_Integer, 0, regZero); sqlite3VdbeAddOp2(v, OP_MustBeInt, reg, sqlite3VdbeCurrentAddr(v)+2); sqlite3VdbeAddOp3(v, OP_Ge, regZero, sqlite3VdbeCurrentAddr(v)+2, reg); sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_ERROR, OE_Abort); sqlite3VdbeAppendP4(v, (void)azErr[bEnd], P4_STATIC); } / Generate VM code to invoke either xStep() (if bInverse is 0) or xInverse (if bInverse is non-zero) for each window function in the ** linked list starting at pMWin. / static void windowAggStep( Parse pParse, Window pMWin, int csr, int bInverse, int reg ){ Vdbe v = sqlite3GetVdbe(pParse); Window pWin; for(pWin=pMWin; pWin; pWin=pWin->pNextWin){ int regArg; if( csr>=0 ){ int i; for(i=0; i<pWin->nArg; i++){ sqlite3VdbeAddOp3(v, OP_Column, csr, pWin->iArgCol+i, reg+i); } sqlite3VdbeAddOp3(v, OP_AggStep0, bInverse, reg, pWin->regAccum); sqlite3VdbeAppendP4(v, pWin->pFunc, P4_FUNCDEF); sqlite3VdbeChangeP5(v, (u8)pWin->nArg); int i; for(i=0; i<pWin->nArg; i++){ sqlite3VdbeAddOp3(v, OP_Column, csr, pWin->iArgCol+i, reg+i); } regArg = reg; }else{ regArg = reg + pWin->iArgCol; } if( pWin->csrApp ){ if( bInverse==0 ){ sqlite3VdbeAddOp2(v, OP_AddImm, pWin->regApp+1, 1); sqlite3VdbeAddOp2(v, OP_SCopy, regArg, pWin->regApp); sqlite3VdbeAddOp3(v, OP_MakeRecord, pWin->regApp, 2, pWin->regApp+2); sqlite3VdbeAddOp2(v, OP_IdxInsert, pWin->csrApp, pWin->regApp+2); }else{ sqlite3VdbeAddOp4Int(v, OP_SeekGE, pWin->csrApp, 0, regArg, 1); sqlite3VdbeAddOp1(v, OP_Delete, pWin->csrApp); sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-2); } }else{ if( pWin->pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){ CollSeq pColl; pColl = sqlite3ExprCollSeq(pParse, pWin->pOwner->x.pList->a[0].pExpr); sqlite3VdbeAddOp4(v, OP_CollSeq, 0,0,0, (const char)pColl, P4_COLLSEQ); } sqlite3VdbeAddOp3(v, OP_AggStep0, bInverse, regArg, pWin->regAccum); sqlite3VdbeAppendP4(v, pWin->pFunc, P4_FUNCDEF); sqlite3VdbeChangeP5(v, (u8)pWin->nArg); } } } static void windowAggFinal(Parse pParse, Window pMWin, int bFinal){ Vdbe v = sqlite3GetVdbe(pParse); Window pWin; for(pWin=pMWin; pWin; pWin=pWin->pNextWin){ if( pWin->csrApp ){ sqlite3VdbeAddOp2(v, OP_Null, 0, pWin->regResult); sqlite3VdbeAddOp1(v, OP_Last, pWin->csrApp); sqlite3VdbeAddOp3(v, OP_Column, pWin->csrApp, 0, pWin->regResult); sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-2); if( bFinal ){ sqlite3VdbeAddOp1(v, OP_ResetSorter, pWin->csrApp); } }else{ if( bFinal==0 ){ sqlite3VdbeAddOp2(v, OP_Null, 0, pWin->regResult); } sqlite3VdbeAddOp2(v, OP_AggFinal, pWin->regAccum, pWin->nArg); sqlite3VdbeAppendP4(v, pWin->pFunc, P4_FUNCDEF); if( bFinal ){ sqlite3VdbeAddOp2(v, OP_Copy, pWin->regAccum, pWin->regResult); }else{ sqlite3VdbeChangeP3(v, -1, pWin->regResult); if( bFinal==0 ){ sqlite3VdbeAddOp2(v, OP_Null, 0, pWin->regResult); } sqlite3VdbeAddOp2(v, OP_AggFinal, pWin->regAccum, pWin->nArg); sqlite3VdbeAppendP4(v, pWin->pFunc, P4_FUNCDEF); if( bFinal ){ sqlite3VdbeAddOp2(v, OP_Copy, pWin->regAccum, pWin->regResult); }else{ sqlite3VdbeChangeP3(v, -1, pWin->regResult); } } } } / ** ROWS BETWEEN <expr1> PRECEDING AND <expr2> FOLLOWING
︙
329 330 331 332 333 334 335 ~~336~~ 337 338 339 340 341 ~~342~~ 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 ~~358~~ 359 360 361 362 363 364 365 366 367 368 369 370 371 372 ~~373 374 375 376 377 378~~ 379 380 381 382 383 384 385	391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452	- - + - + + + + + + + - - - - - - + + + + + +	sqlite3VdbeAddOp3(v, OP_MakeRecord, reg, nSub, regRecord); /* Check if this is the start of a new partition. If so, call the ** flush_partition sub-routine. / if( pMWin->pPartition ){ ExprList pPart = pMWin->pPartition; int nPart = (pPart ? pPart->nExpr : 0); ~~int addrJump = 0;~~ int regNewPart = reg + pMWin->nBufferCol; KeyInfo pKeyInfo = sqlite3KeyInfoFromExprList(pParse, pPart, 0, 0); addr = sqlite3VdbeAddOp3(v, OP_Compare, regNewPart, pMWin->regPart,nPart); sqlite3VdbeAppendP4(v, (void)pKeyInfo, P4_KEYINFO); ~~~~addrJump =~~ sqlite3VdbeAddOp3(v, OP_Jump, addr+2, addr+4, addr+2);~~ sqlite3VdbeAddOp3(v, OP_Jump, addr+2, addr+4, addr+2); sqlite3VdbeAddOp2(v, OP_Gosub, regFlushPart, lblFlushPart); sqlite3VdbeAddOp3(v, OP_Copy, regNewPart, pMWin->regPart, nPart); } /* Buffer the current row in the ephemeral table. / sqlite3VdbeAddOp2(v, OP_NewRowid, pMWin->iEphCsr, regRowid); sqlite3VdbeAddOp3(v, OP_Insert, pMWin->iEphCsr, regRecord, regRowid); / End of the input loop / sqlite3WhereEnd(pWInfo); / Invoke "flush_partition" to deal with the final (or only) partition / sqlite3VdbeAddOp2(v, OP_Gosub, regFlushPart, lblFlushPart); addrGoto = sqlite3VdbeAddOp0(v, OP_Goto); ~~/ flush_partition: /~~ / Start of "flush_partition" / sqlite3VdbeResolveLabel(v, lblFlushPart); sqlite3VdbeAddOp2(v, OP_Once, 0, sqlite3VdbeCurrentAddr(v)+3); sqlite3VdbeAddOp2(v, OP_OpenDup, csrStart, pMWin->iEphCsr); sqlite3VdbeAddOp2(v, OP_OpenDup, csrEnd, pMWin->iEphCsr); / If either regStart or regEnd are not non-negative integers, throw ** an exception. / if( pMWin->pStart ){ sqlite3ExprCode(pParse, pMWin->pStart, regStart); windowCheckFrameValue(pParse, regStart, 0); } if( pMWin->pEnd ){ sqlite3ExprCode(pParse, pMWin->pEnd, regEnd); windowCheckFrameValue(pParse, regEnd, 1); } / If this is "ROWS <expr1> FOLLOWING AND ROWS <expr2> FOLLOWING", do: regEnd = regEnd - regStart; / ~~~~if(~~ pMWin->pStart && pMWin->eStart==TK_FOLLOWING ){ assert( pMWin->eEnd==TK_FOLLOWING ); sqlite3VdbeAddOp3(v, OP_Subtract, regStart, regEnd, regEnd); } }~~ if( pMWin->pEnd && pMWin->pStart && pMWin->eStart==TK_FOLLOWING ){ assert( pMWin->eEnd==TK_FOLLOWING ); sqlite3VdbeAddOp3(v, OP_Subtract, regStart, regEnd, regEnd); } / Initialize the accumulator register for each window function to NULL */ for(pWin=pMWin; pWin; pWin=pWin->pNextWin){ sqlite3VdbeAddOp2(v, OP_Null, 0, pWin->regAccum); } sqlite3VdbeAddOp2(v, OP_Rewind, pMWin->iEphCsr, lblFlushDone); sqlite3VdbeAddOp2(v, OP_Rewind, csrStart, lblFlushDone); sqlite3VdbeChangeP5(v, 1);
︙
587 588 589 590 591 592 593 ~~594 595~~ ~~596 597 598~~ 599 600 601 602 603 604 605	654 655 656 657 658 659 660 661 662 663 664 665 666 667 668	- - + - - -	v, OP_Copy, reg+pMWin->nBufferCol, pMWin->regPart, nPart+nPeer-1 ); if( addrJump ) sqlite3VdbeJumpHere(v, addrJump); } /* Invoke step function for window functions / ~~~~for(pWin=pMWin; pWin; pWin=pWin->pNextWin){~~ ~~sql~~i~~te3VdbeAddOp3(v, OP_~~AggStep0, 0, reg~~+pWin->iArgCol, pWin->regAccum~~);~~ windowAggStep(pParse, pMWin, -1, 0, reg); ~~~~sqlite3VdbeAppendP4(v, pWin->pFunc, P4_FUNCDEF);~~ ~~sqlite3VdbeChangeP5(v, (u8)pWin->nArg);~~ }~~ / Buffer the current row in the ephemeral table. / if( pMWin->nBufferCol>0 ){ sqlite3VdbeAddOp3(v, OP_MakeRecord, reg, pMWin->nBufferCol, regRecord); }else{ sqlite3VdbeAddOp2(v, OP_Blob, 0, regRecord); sqlite3VdbeAppendP4(v, (void)"", 0);
︙














































































































1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	# 2018 May 19 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # package require sqlite3 package require Pgtcl set db [pg_connect -conninfo "dbname=postgres user=postgres password=postgres"] sqlite3 sqlite "" proc execsql {sql} { set lSql [list] set frag "" while {[string length $sql]>0} { set i [string first ";" $sql] if {$i>=0} { append frag [string range $sql 0 $i] set sql [string range $sql $i+1 end] if {[sqlite complete $frag]} { lappend lSql $frag set frag "" } } else { set frag $sql set sql "" } } if {$frag != ""} { lappend lSql $frag } #puts $lSql set ret "" foreach stmt $lSql { set res [pg_exec $::db $stmt] set err [pg_result $res -error] if {$err!=""} { error $err } for {set i 0} {$i < [pg_result $res -numTuples]} {incr i} { if {$i==0} { set ret [pg_result $res -getTuple 0] } else { append ret " [pg_result $res -getTuple $i]" } # lappend ret {}[pg_result $res -getTuple $i] } pg_result $res -clear } set ret } proc execsql_test {tn sql} { set res [execsql $sql] puts $::fd "do_execsql_test $tn {" puts $::fd " [string trim $sql]" puts $::fd "} {$res}" puts $::fd "" } proc start_test {name date} { set dir [file dirname $::argv0] set output [file join $dir $name.test] set ::fd [open $output w] puts $::fd [string trimleft " # $date # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #********************************************************************** # This file implements regression tests for SQLite library. # #################################################### # DO NOT EDIT! THIS FILE IS AUTOMATICALLY GENERATED! #################################################### "] puts $::fd {set testdir [file dirname $argv0]} puts $::fd {source $testdir/tester.tcl} puts $::fd "set testprefix $name" puts $::fd "" } proc -- {args} { puts $::fd "# $args" } proc ========== {args} { puts $::fd "#[string repeat = 74]" puts $::fd "" } proc finish_test {} { puts $::fd finish_test close $::fd }