Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Back out the change at [47cd634c98b502d4] which was incorrect. Add a test case so that we don't accidently back out that change again. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
596ac2a4eab28b74f4050fb4eb71883f |
| User & Date: | drh 2019-08-30 18:02:49 |
Context
|
2019-08-30
| ||
| 19:45 | Add test case to window8.test. Also fix an error in a comment in window.c. (check-in: 2925bfa5 user: dan tags: trunk) | |
| 18:02 | Back out the change at [47cd634c98b502d4] which was incorrect. Add a test case so that we don't accidently back out that change again. (check-in: 596ac2a4 user: drh tags: trunk) | |
| 17:28 | Add further comments to window.c. (check-in: 90046456 user: dan tags: trunk) | |
|
2019-08-29
| ||
| 16:17 | Remove an unreachable branch in the NULLS LAST logic of RANGE window functions. (check-in: 47cd634c user: drh tags: trunk) | |
Changes
Changes to src/window.c.
2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 |
/* This block runs if reg1 contains a NULL. */
int addr = sqlite3VdbeAddOp1(v, OP_NotNull, reg1); VdbeCoverage(v);
switch( op ){
case OP_Ge:
sqlite3VdbeAddOp2(v, OP_Goto, 0, lbl);
break;
case OP_Gt:
sqlite3VdbeAddOp2(v, OP_NotNull, reg2, lbl); VdbeCoverage(v);
break;
default: assert( op==OP_Le );
sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); VdbeCoverage(v);
break;
}
sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+3);
/* This block runs if reg1 is not NULL, but reg2 is. */
sqlite3VdbeJumpHere(v, addr);
sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); VdbeCoverage(v);
if( op==OP_Gt || op==OP_Ge ){
|
| > < > | > > |
2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 |
/* This block runs if reg1 contains a NULL. */
int addr = sqlite3VdbeAddOp1(v, OP_NotNull, reg1); VdbeCoverage(v);
switch( op ){
case OP_Ge:
sqlite3VdbeAddOp2(v, OP_Goto, 0, lbl);
break;
case OP_Gt:
sqlite3VdbeAddOp2(v, OP_NotNull, reg2, lbl);
VdbeCoverage(v);
break;
case OP_Le:
sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl);
VdbeCoverage(v);
break;
default: assert( op==OP_Lt ); /* no-op */ break;
}
sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+3);
/* This block runs if reg1 is not NULL, but reg2 is. */
sqlite3VdbeJumpHere(v, addr);
sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); VdbeCoverage(v);
if( op==OP_Gt || op==OP_Ge ){
|
Changes to test/windowA.test.
284 285 286 287 288 289 290 291 292 |
7 N NULL NNEDCBA \ 5 E 10.26 EDCBA \ 4 D 10.25 DCBA \ 3 C 8.0 CBA \ 2 B 5.55 BA \ 1 A 5.4 A \ ] finish_test |
> > > > > > > > > > > > > > > > > |
284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 |
7 N NULL NNEDCBA \ 5 E 10.26 EDCBA \ 4 D 10.25 DCBA \ 3 C 8.0 CBA \ 2 B 5.55 BA \ 1 A 5.4 A \ ] do_execsql_test 4.0 { SELECT a, b, quote(d), group_concat(b,'') OVER w1 FROM t1 WINDOW w1 AS (ORDER BY d DESC NULLS FIRST RANGE BETWEEN 2.50 PRECEDING AND 0.5 PRECEDING) ORDER BY +d DESC NULLS FIRST, +a; } [list \ 6 N NULL NN \ 7 N NULL NN \ 5 E 10.26 {} \ 4 D 10.25 {} \ 3 C 8.0 ED \ 2 B 5.55 C \ 1 A 5.4 {} \ ] finish_test |