Merge enhancements and fixes from trunk into the right-join branch.
FossilOrigin-Name: 2fb165cf8bd1e43248612aa2922bd311df30dcbb3c2f1daee73c363e409c501f
This commit is contained in:
drh
@@ -1,5 +1,5 @@
|
||||
C Fix\san\soperator\stypo\s-\sThis\sindicates\sthat\sthe\sbranch\sneeds\sfurther\ninvestigation\sand\sverification.
|
||||
D 2022-04-23T14:30:22.661
|
||||
C Merge\senhancements\sand\sfixes\sfrom\strunk\sinto\sthe\sright-join\sbranch.
|
||||
D 2022-04-23T19:26:34.244
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@@ -626,10 +626,10 @@ F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
|
||||
F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
|
||||
F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
|
||||
F src/vdbe.c 9527ab7f71c5b0291e5ed7727f213f4d7f6e0a82af019da5b365fd5a0f56bb96
|
||||
F src/vdbe.h 89f5edb1422c8783a0b29db836e409876f2b3e847f78e2b21b1fbcc48a93f85f
|
||||
F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
|
||||
F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
|
||||
F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
|
||||
F src/vdbeaux.c d1fce1d9c1045622d2a878ddcbec1c431eb186a17674b64ffe231e8d14db0451
|
||||
F src/vdbeaux.c f406d8d8b461f260aeaa69d265c5d175ff0a9f84d6153c87975cdfbf9d681922
|
||||
F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
|
||||
F src/vdbemem.c 7189090b72baa025f945a1ac8c61ee420c645254476e8a191d555db76dfea5d4
|
||||
F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
|
||||
@@ -640,9 +640,9 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
|
||||
F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
|
||||
F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
|
||||
F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
|
||||
F src/where.c 45102d682f6efd450d89c0c5f09b838be6d69c84c6105336730ee38d3b452fad
|
||||
F src/whereInt.h eecce79edc6f7005f91f35be6b18b7053f794e1b50e95bcd06a2d537fc176734
|
||||
F src/wherecode.c 1bff158d8672524d0e9a398b01a8ed2d98fffb9ae38837a8335c7162500a1d8f
|
||||
F src/where.c bd4895fbb6ac9cc5b772d191b93dd5a240a505e3113be9aee0dc8c957568dd41
|
||||
F src/whereInt.h 4db5a877a9d1f38b5c928c1c84297c07f30b9a3bc1f5f66214cf1a8ef90a0556
|
||||
F src/wherecode.c 55a33d9db1759970c30220904bcc628ba66a1ccb63b5437ef4642f7ea6267b03
|
||||
F src/whereexpr.c 174d4ad5be165c610c907abb779ef4a97974d22b84e1ce7898d2d9f6947249e5
|
||||
F src/window.c 924e04fd6e0e113d4dba18b78d43fcb8e42b8ebffc8fc728da52cf3ab014cf3c
|
||||
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
|
||||
@@ -1148,7 +1148,7 @@ F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
|
||||
F test/join5.test c4df54e2e204d7f1417bfbdd21ca324b4b07415c647595cc47798eacfddc96d3
|
||||
F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c
|
||||
F test/join7.test 8e72de4b45e5e930d18c305c7efe86015fb2552731e4e03ea226353036b0dab0
|
||||
F test/join8.test fdab1aef8bebced45b3664c869a43dc3eeff658e98d183edf513b262369703f6
|
||||
F test/join8.test 8b1cc9592aa8f623fc2878353b16c81257591908de06d2a4916f7cbe3ca75ecd
|
||||
F test/join9.test 9056ddd3b0c0f4f9d658f4521038d9a37dc23ead8ca9a505d0b0db2b6a471e05
|
||||
F test/joinA.test 7eab225dc1c1ab258a5e62513a4ed7cabbd3db971d59d5d92f4fb6fa14c12f6a
|
||||
F test/joinB.test 1b2ba3fc8568b49411787fccbf540570c148e9b6a53a30f80691cb6268098ded
|
||||
@@ -1951,8 +1951,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P ea91aba88c31a042f4e32d66dfa089f95d0f9d316ab26f298085eb34dbf73e86
|
||||
R 9549b2a87feb210cf9948c9189de46e6
|
||||
P f6ab67965b718b0c6d7faf769c7e47384cfd2ddbb03df518e0c5d367f8583387 3aefc874d31885c64a5e02868edb2aa56a2b4429252d494e67e4088a9298ce5b
|
||||
R 3897a09d3fd5e51780f1f3781df050fc
|
||||
U drh
|
||||
Z 18a2689e41cce135eac2a900bbfdf7c7
|
||||
Z b6d265eae00430fdbf139ad32757b2a2
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
f6ab67965b718b0c6d7faf769c7e47384cfd2ddbb03df518e0c5d367f8583387
|
||||
2fb165cf8bd1e43248612aa2922bd311df30dcbb3c2f1daee73c363e409c501f
|
||||
@@ -198,8 +198,10 @@ void sqlite3VdbeEndCoroutine(Vdbe*,int);
|
||||
#endif
|
||||
#if defined(SQLITE_DEBUG)
|
||||
void sqlite3VdbeVerifyAbortable(Vdbe *p, int);
|
||||
void sqlite3VdbeNoJumpsOutsideSubrtn(Vdbe*,int,int,int);
|
||||
#else
|
||||
# define sqlite3VdbeVerifyAbortable(A,B)
|
||||
# define sqlite3VdbeNoJumpsOutsideSubrtn(A,B,C,D)
|
||||
#endif
|
||||
VdbeOp *sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp,int iLineno);
|
||||
#ifndef SQLITE_OMIT_EXPLAIN
|
||||
|
||||
@@ -880,6 +880,90 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
|
||||
assert( p->bIsReader!=0 || DbMaskAllZero(p->btreeMask) );
|
||||
}
|
||||
|
||||
#ifdef SQLITE_DEBUG
|
||||
/*
|
||||
** Check to see if a subroutine contains a jump to a location outside of
|
||||
** the subroutine. If a jump outside the subroutine is detected, add code
|
||||
** that will cause the program to halt with an error message.
|
||||
**
|
||||
** The subroutine consists of opcodes between iFirst and iLast. Jumps to
|
||||
** locations within the subroutine are acceptable. iRetReg is a register
|
||||
** that contains the return address. Jumps to outside the range of iFirst
|
||||
** through iLast are also acceptable as long as the jump destination is
|
||||
** an OP_Return to iReturnAddr.
|
||||
**
|
||||
** A jump to an unresolved label means that the jump destination will be
|
||||
** beyond the current address. That is normally a jump to an early
|
||||
** termination and is consider acceptable.
|
||||
**
|
||||
** This routine only runs during debug builds. The purpose is (of course)
|
||||
** to detect invalid escapes out of a subroutine. The OP_Halt opcode
|
||||
** is generated rather than an assert() or other error, so that ".eqp full"
|
||||
** will still work to show the original bytecode, to aid in debugging.
|
||||
*/
|
||||
void sqlite3VdbeNoJumpsOutsideSubrtn(
|
||||
Vdbe *v, /* The byte-code program under construction */
|
||||
int iFirst, /* First opcode of the subroutine */
|
||||
int iLast, /* Last opcode of the subroutine */
|
||||
int iRetReg /* Subroutine return address register */
|
||||
){
|
||||
VdbeOp *pOp;
|
||||
Parse *pParse;
|
||||
int i;
|
||||
sqlite3_str *pErr = 0;
|
||||
assert( v!=0 );
|
||||
pParse = v->pParse;
|
||||
assert( pParse!=0 );
|
||||
if( pParse->nErr ) return;
|
||||
assert( iLast>=iFirst );
|
||||
assert( iLast<v->nOp );
|
||||
pOp = &v->aOp[iFirst];
|
||||
for(i=iFirst; i<=iLast; i++, pOp++){
|
||||
if( (sqlite3OpcodeProperty[pOp->opcode] & OPFLG_JUMP)!=0 ){
|
||||
int iDest = pOp->p2; /* Jump destination */
|
||||
if( iDest==0 ) continue;
|
||||
if( pOp->opcode==OP_Gosub ) continue;
|
||||
if( iDest<0 ){
|
||||
int j = ADDR(iDest);
|
||||
assert( j>=0 );
|
||||
if( j>=-pParse->nLabel || pParse->aLabel[j]<0 ){
|
||||
continue;
|
||||
}
|
||||
iDest = pParse->aLabel[j];
|
||||
}
|
||||
if( iDest<iFirst || iDest>iLast ){
|
||||
int j = iDest;
|
||||
for(; j<v->nOp; j++){
|
||||
VdbeOp *pX = &v->aOp[j];
|
||||
if( pX->opcode==OP_Return ){
|
||||
if( pX->p1==iRetReg ) break;
|
||||
continue;
|
||||
}
|
||||
if( pX->opcode==OP_Noop ) continue;
|
||||
if( pX->opcode==OP_Explain ) continue;
|
||||
if( pErr==0 ){
|
||||
pErr = sqlite3_str_new(0);
|
||||
}else{
|
||||
sqlite3_str_appendchar(pErr, 1, '\n');
|
||||
}
|
||||
sqlite3_str_appendf(pErr,
|
||||
"Opcode at %d jumps to %d which is outside the "
|
||||
"subroutine at %d..%d",
|
||||
i, iDest, iFirst, iLast);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if( pErr ){
|
||||
char *zErr = sqlite3_str_finish(pErr);
|
||||
sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_INTERNAL, OE_Abort, 0, zErr, 0);
|
||||
sqlite3_free(zErr);
|
||||
sqlite3MayAbort(pParse);
|
||||
}
|
||||
}
|
||||
#endif /* SQLITE_DEBUG */
|
||||
|
||||
/*
|
||||
** Return the address of the next instruction to be inserted.
|
||||
*/
|
||||
|
||||
+2
-1
@@ -102,7 +102,7 @@ int sqlite3WhereOrderByLimitOptLabel(WhereInfo *pWInfo){
|
||||
}
|
||||
pInner = &pWInfo->a[pWInfo->nLevel-1];
|
||||
assert( pInner->addrNxt!=0 );
|
||||
return pInner->addrNxt;
|
||||
return pInner->pRJ ? pWInfo->iContinue : pInner->addrNxt;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -6024,6 +6024,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
|
||||
WhereRightJoin *pRJ = pLevel->pRJ;
|
||||
sqlite3VdbeResolveLabel(v, pLevel->addrCont);
|
||||
pLevel->addrCont = 0;
|
||||
pRJ->endSubrtn = sqlite3VdbeCurrentAddr(v);
|
||||
sqlite3VdbeAddOp3(v, OP_Return, pRJ->regReturn, pRJ->addrSubrtn, 1);
|
||||
VdbeCoverage(v);
|
||||
assert( pParse->withinRJSubrtn>0 );
|
||||
|
||||
@@ -52,6 +52,7 @@ struct WhereRightJoin {
|
||||
int regBloom; /* Bloom filter for iRJMatch */
|
||||
int regReturn; /* Return register for the interior subroutine */
|
||||
int addrSubrtn; /* Starting address for the interior subroutine */
|
||||
int endSubrtn; /* The last opcode in the interior subroutine */
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@@ -2819,6 +2819,8 @@ SQLITE_NOINLINE void sqlite3WhereRightJoinLoop(
|
||||
int k;
|
||||
|
||||
ExplainQueryPlan((pParse, 1, "RIGHT-JOIN %s", pTabItem->pTab->zName));
|
||||
sqlite3VdbeNoJumpsOutsideSubrtn(v, pRJ->addrSubrtn, pRJ->endSubrtn,
|
||||
pRJ->regReturn);
|
||||
for(k=0; k<iLevel; k++){
|
||||
int iIdxCur;
|
||||
mAll |= pWInfo->a[k].pWLoop->maskSelf;
|
||||
|
||||
@@ -142,4 +142,18 @@ do_execsql_test join8-4000 {
|
||||
SELECT a FROM t1 NATURAL RIGHT JOIN t1 WHERE a=5555 OR (1,b)==(SELECT 2 IN (2,2),4);
|
||||
} {5555}
|
||||
|
||||
# 2022-04-23 dbsqlfuzz c7ee5500e3abddec3557016de777713b80c790d3
|
||||
# Escape from the right-join body subroutine via the ORDER BY LIMIT optimization.
|
||||
#
|
||||
reset_db
|
||||
db null -
|
||||
do_catchsql_test join8-5000 {
|
||||
CREATE TABLE t1(x);
|
||||
INSERT INTO t1(x) VALUES(NULL),(NULL);
|
||||
CREATE TABLE t2(c, d);
|
||||
INSERT INTO t2(c,d) SELECT x, x FROM t1;
|
||||
CREATE INDEX t2dc ON t2(d, c);
|
||||
SELECT (SELECT c FROM sqlite_temp_schema FULL JOIN t2 ON d IN (1,2,3) ORDER BY d) AS x FROM t1;
|
||||
} {0 {- -}}
|
||||
|
||||
finish_test
|
||||
|
||||
Reference in New Issue
Block a user