mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync the vt02.c test virtual table with TH3, in order to pull in the fix 

for long delays when there are huge OFFSET values.

FossilOrigin-Name: 49ba030080dd00b4fdf788fd3da057b333e705fa0fe37d653e2461bf96ca3785
This commit is contained in:
drh 2023-04-10 13:20:51 +00:00
parent d27c18818c
commit 8346f8dacc
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Fix\san\sassertion\sfault\sthat\scan\soccur\swhen\scompiling\swith\sboth\nSQLITE_ENABLE_UNKNOWN_SQL_FUNCTIONS\sand\sSQLITE_ENABLE_STAT4. C Sync\sthe\svt02.c\stest\svirtual\stable\swith\sTH3,\sin\sorder\sto\spull\sin\sthe\sfix\nfor\slong\sdelays\swhen\sthere\sare\shuge\sOFFSET\svalues.
D 2023-04-09T20:44:09.894 D 2023-04-10T13:20:51.922
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -1807,7 +1807,7 @@ F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
F test/view.test d4c4281e1679245829db35597817282f60dc513fc39cc5439078f009bd118487 F test/view.test d4c4281e1679245829db35597817282f60dc513fc39cc5439078f009bd118487
F test/view2.test db32c8138b5b556f610b35dfddd38c5a58a292f07fda5281eedb0851b2672679 F test/view2.test db32c8138b5b556f610b35dfddd38c5a58a292f07fda5281eedb0851b2672679
F test/view3.test ad8a8290ee2b55ff6ce66c9ef1ce3f1e47926273a3814e1c425293e128a95456 F test/view3.test ad8a8290ee2b55ff6ce66c9ef1ce3f1e47926273a3814e1c425293e128a95456
F test/vt02.c 86253b57d6bc2170dfca33f45fd099b66d0bf874e95ecd7786dcbb134f179469 F test/vt02.c f4a357c8180d71120ca2b466a8df48d9c40fc50873694840327d9647450485f3
F test/vtab1.test 09a72330d0f31eda2ffaa828b06a6b917fb86250ee72de0301570af725774c07 F test/vtab1.test 09a72330d0f31eda2ffaa828b06a6b917fb86250ee72de0301570af725774c07
F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082 F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082
F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
@ -2052,8 +2052,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 8ba9b08bd976ed2c024f5f378b4dd40a55226e950af77c476c21273fccaf7e26 P 9ff69e599817610d14948a3eebcc4d3c18245f78a1433c23ae659211cbbdb017
R 889add789cd2553848be57f0d2fe0e07 R 7cdb734827060f13b761710e5ee55378
U drh U drh
Z a5ce80245e588ea8ba300425da779261 Z 7d4200ee23a188536db0fc075de1e41b
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@ -1 +1 @@
9ff69e599817610d14948a3eebcc4d3c18245f78a1433c23ae659211cbbdb017 49ba030080dd00b4fdf788fd3da057b333e705fa0fe37d653e2461bf96ca3785

10
test/vt02.c
View File

@ -177,8 +177,6 @@
#include <assert.h> #include <assert.h>
#endif #endif
#ifndef SQLITE_OMIT_VIRTUALTABLE
/* Forward declarations */ /* Forward declarations */
typedef struct vt02_vtab vt02_vtab; typedef struct vt02_vtab vt02_vtab;
typedef struct vt02_cur vt02_cur; typedef struct vt02_cur vt02_cur;
@ -381,7 +379,7 @@ static int vt02Filter(
sqlite3_int64 v; sqlite3_int64 v;
pVal = 0; pVal = 0;
if( sqlite3_vtab_in_first(0, &pVal)!=SQLITE_MISUSE if( sqlite3_vtab_in_first(0, &pVal)!=SQLITE_MISUSE
|| sqlite3_vtab_in_first(argv[iArg], &pVal)!=SQLITE_MISUSE || sqlite3_vtab_in_first(argv[iArg], &pVal)!=SQLITE_ERROR
){ ){
vt02ErrMsg(pCursor->pVtab, vt02ErrMsg(pCursor->pVtab,
"unexpected success from sqlite3_vtab_in_first()"); "unexpected success from sqlite3_vtab_in_first()");
@ -420,7 +418,7 @@ static int vt02Filter(
} }
if( bUseOffset ){ if( bUseOffset ){
int nSkip = sqlite3_value_int(argv[iArg]); int nSkip = sqlite3_value_int(argv[iArg]);
while( nSkip-- > 0 ) vt02Next(pCursor); while( nSkip-- > 0 && pCur->i<pCur->iEof ) vt02Next(pCursor);
} }
return SQLITE_OK; return SQLITE_OK;
@ -1001,10 +999,6 @@ static void vt02CoreInit(sqlite3 *db){
sqlite3_create_module(db, "vt02pkabcd", &vt02Module, (void*)zPkABCDSchema); sqlite3_create_module(db, "vt02pkabcd", &vt02Module, (void*)zPkABCDSchema);
} }
#else
# define vt02CoreInit(db)
#endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
#ifdef TH3_VERSION #ifdef TH3_VERSION
static void vt02_init(th3state *p, int iDb, char *zArg){ static void vt02_init(th3state *p, int iDb, char *zArg){
vt02CoreInit(th3dbPointer(p, iDb)); vt02CoreInit(th3dbPointer(p, iDb));