diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_unix.c | 2 | ||||
| -rw-r--r-- | src/sqliteInt.h | 9 | ||||
| -rw-r--r-- | src/vdbe.c | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index f20763e5b..103df1d19 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -7603,7 +7603,7 @@ static int proxyFileControl(sqlite3_file *id, int op, void *pArg){ assert( 0 ); /* The call assures that only valid opcodes are sent */ } } - /*NOTREACHED*/ + /*NOTREACHED*/ assert(0); return SQLITE_ERROR; } diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 037d09e42..c123dfffb 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3560,10 +3560,11 @@ struct TreeView { #endif /* SQLITE_DEBUG */ /* -** This object is used in various ways, all related to window functions +** This object is used in various ways, most (but not all) related to window +** functions. ** ** (1) A single instance of this structure is attached to the -** the Expr.pWin field for each window function in an expression tree. +** the Expr.y.pWin field for each window function in an expression tree. ** This object holds the information contained in the OVER clause, ** plus additional fields used during code generation. ** @@ -3574,6 +3575,10 @@ struct TreeView { ** (3) The terms of the WINDOW clause of a SELECT are instances of this ** object on a linked list attached to Select.pWinDefn. ** +** (4) For an aggregate function with a FILTER clause, an instance +** of this object is stored in Expr.y.pWin with eFrmType set to +** TK_FILTER. In this case the only field used is Window.pFilter. +** ** The uses (1) and (2) are really the same Window object that just happens ** to be accessible in two different ways. Use case (3) are separate objects. */ diff --git a/src/vdbe.c b/src/vdbe.c index 018ba97d3..8dead8cdf 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3376,7 +3376,7 @@ case OP_AutoCommit: { rc = SQLITE_ERROR; goto abort_due_to_error; } - break; + /*NOTREACHED*/ assert(0); } /* Opcode: Transaction P1 P2 P3 P4 P5 @@ -4132,8 +4132,8 @@ case OP_SeekGT: { /* jump, in3, group */ if( (pIn3->flags & (MEM_Int|MEM_IntReal))==0 ){ if( (pIn3->flags & MEM_Real)==0 ){ if( (pIn3->flags & MEM_Null) || oc>=OP_SeekGE ){ - VdbeBranchTaken(1,2); goto jump_to_p2; - break; + VdbeBranchTaken(1,2); + goto jump_to_p2; }else{ rc = sqlite3BtreeLast(pC->uc.pCursor, &res); if( rc!=SQLITE_OK ) goto abort_due_to_error; |