Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Always clear the temporary register cache after coding a subroutine. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
b6f2a7f9cdb547c925f08306df82519e |
| User & Date: | drh 2019-09-18 20:34:54.304 |
Context
|
2019-09-19
| ||
| 13:51 | Fix an assert() in fts3 that could fail when accessing a corrupt database. (check-in: 601ce9532d user: dan tags: trunk) | |
|
2019-09-18
| ||
| 20:34 | Always clear the temporary register cache after coding a subroutine. (check-in: b6f2a7f9cd user: drh tags: trunk) | |
| 17:22 | Add extra tests for the handling of corrupt records in fts3. (check-in: 40e29a47d1 user: dan tags: trunk) | |
Changes
Changes to src/expr.c.
| ︙ | ︙ | |||
2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 |
sqlite3VdbeChangeP4(v, addr, (void *)pKeyInfo, P4_KEYINFO);
}
if( addrOnce ){
sqlite3VdbeJumpHere(v, addrOnce);
/* Subroutine return */
sqlite3VdbeAddOp1(v, OP_Return, pExpr->y.sub.regReturn);
sqlite3VdbeChangeP1(v, pExpr->y.sub.iAddr-1, sqlite3VdbeCurrentAddr(v)-1);
}
}
#endif /* SQLITE_OMIT_SUBQUERY */
/*
** Generate code for scalar subqueries used as a subquery expression
** or EXISTS operator:
| > | 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 |
sqlite3VdbeChangeP4(v, addr, (void *)pKeyInfo, P4_KEYINFO);
}
if( addrOnce ){
sqlite3VdbeJumpHere(v, addrOnce);
/* Subroutine return */
sqlite3VdbeAddOp1(v, OP_Return, pExpr->y.sub.regReturn);
sqlite3VdbeChangeP1(v, pExpr->y.sub.iAddr-1, sqlite3VdbeCurrentAddr(v)-1);
sqlite3ClearTempRegCache(pParse);
}
}
#endif /* SQLITE_OMIT_SUBQUERY */
/*
** Generate code for scalar subqueries used as a subquery expression
** or EXISTS operator:
|
| ︙ | ︙ | |||
2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 |
ExprSetVVAProperty(pExpr, EP_NoReduce);
if( addrOnce ){
sqlite3VdbeJumpHere(v, addrOnce);
/* Subroutine return */
sqlite3VdbeAddOp1(v, OP_Return, pExpr->y.sub.regReturn);
sqlite3VdbeChangeP1(v, pExpr->y.sub.iAddr-1, sqlite3VdbeCurrentAddr(v)-1);
}
return rReg;
}
#endif /* SQLITE_OMIT_SUBQUERY */
#ifndef SQLITE_OMIT_SUBQUERY
| > | 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 |
ExprSetVVAProperty(pExpr, EP_NoReduce);
if( addrOnce ){
sqlite3VdbeJumpHere(v, addrOnce);
/* Subroutine return */
sqlite3VdbeAddOp1(v, OP_Return, pExpr->y.sub.regReturn);
sqlite3VdbeChangeP1(v, pExpr->y.sub.iAddr-1, sqlite3VdbeCurrentAddr(v)-1);
sqlite3ClearTempRegCache(pParse);
}
return rReg;
}
#endif /* SQLITE_OMIT_SUBQUERY */
#ifndef SQLITE_OMIT_SUBQUERY
|
| ︙ | ︙ | |||
5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 |
pParse->nRangeReg = nReg;
pParse->iRangeReg = iReg;
}
}
/*
** Mark all temporary registers as being unavailable for reuse.
*/
void sqlite3ClearTempRegCache(Parse *pParse){
pParse->nTempReg = 0;
pParse->nRangeReg = 0;
}
/*
| > > > > > | 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 |
pParse->nRangeReg = nReg;
pParse->iRangeReg = iReg;
}
}
/*
** Mark all temporary registers as being unavailable for reuse.
**
** Always invoke this procedure after coding a subroutine or co-routine
** that might be invoked from other parts of the code, to ensure that
** the sub/co-routine does not use registers in common with the code that
** invokes the sub/co-routine.
*/
void sqlite3ClearTempRegCache(Parse *pParse){
pParse->nTempReg = 0;
pParse->nRangeReg = 0;
}
/*
|
| ︙ | ︙ |
Changes to test/tkt-3a77c9714e.test.
|
| | | 1 2 3 4 5 6 7 8 | # 2011-12-06 # # 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. |
| ︙ | ︙ | |||
64 65 66 67 68 69 70 |
SELECT SrcWord, B.Id as BeginningId, B.Title || E.Title As Connected
FROM Beginnings B LEFT JOIN Endings E ON B.EndingId=E.EndingId
WHERE Connected=SrcWord LIMIT 1
)
)
} {FACTORING FACTOR SWIMMING SWIMM}
| > | > > > > > > > > > > > > > | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 |
SELECT SrcWord, B.Id as BeginningId, B.Title || E.Title As Connected
FROM Beginnings B LEFT JOIN Endings E ON B.EndingId=E.EndingId
WHERE Connected=SrcWord LIMIT 1
)
)
} {FACTORING FACTOR SWIMMING SWIMM}
# Similar problem discovered by dbsqlfuzz on 2019-09-18
#
do_execsql_test 3.0 {
DROP TABLE IF EXISTS t1;
CREATE TABLE t1(i INT PRIMARY KEY, a, b);
INSERT INTO t1 VALUES(NULL,'one','i');
CREATE INDEX i1a ON t1(a);
CREATE INDEX i1b ON t1(b);
SELECT (SELECT 1
FROM (SELECT 1 FROM t1 WHERE a=1 OR b='i')
WHERE a='o'
OR b IN (SELECT a=('b' IN (SELECT 'a'))))
FROM t1;
} {{}}
finish_test
|