diff --git a/ext/misc/qpvtab.c b/ext/misc/qpvtab.c index fb22b61d68..fe79b966bd 100644 --- a/ext/misc/qpvtab.c +++ b/ext/misc/qpvtab.c @@ -16,18 +16,50 @@ ** ** The schema of the virtual table is this: ** -** CREATE TABLE qpvtab(a,b,c,d,e, f,g,h,i,j, k,l,m,n,o, p,q,r,s,t); +** CREATE TABLE qpvtab( +** vn TEXT, -- Name of an sqlite3_index_info field +** ix INTEGER, -- Array index or value +** cn TEXT, -- Column name +** op INTEGER, -- operator +** ux BOOLEAN, -- "usable" field +** rhs TEXT, -- sqlite3_vtab_rhs_value() ** -** There is also a HIDDEN column "flags". +** a, b, c, d, e, -- Extra columns to attach constraints to ** -** All columns except column "a" have a value that is either TEXT that -** is there name, or INTEGER which is their index (b==1). TEXT is the -** default, but INTEGER is used of there is a constraint on flags where the -** right-hand side is an integer that includes the 1 bit. +** flags INTEGER HIDDEN -- control flags +** ); ** -** The "a" column returns text that describes one of the parameters that -** xBestIndex was called with. A completely query of the table should -** show all details of how xBestIndex was called. +** The virtual table returns a description of the sqlite3_index_info object +** that was provided to the (successful) xBestIndex method. There is one +** row in the result table for each field in the sqlite3_index_info object. +** +** The values of the "a" through "e" columns are one of: +** +** 1. TEXT - the same as the column name +** 2. INTEGER - 1 for "a", 2 for "b", and so forth +** +** Option 1 is the default behavior. 2 is use if there is a usable +** constraint on "flags" with an integer right-hand side that where the +** value of the right-hand side has its 0x01 bit set. +** +** All constraints on columns "a" through "e" are marked as "omit". +** +** If there is a usable constraint on "flags" that has a RHS value that +** is an integer and that integer has its 0x02 bit set, then the +** orderByConsumed flag is set. +** +** COMPILE: +** +** gcc -Wall -g -shared -fPIC -I. qpvtab.c -o qqvtab.so +** +** EXAMPLE USAGE: +** +** .load ./qpvtab +** SELECT rowid, *, flags FROM qpvtab(102) +** WHERE a=19 +** AND b BETWEEN 4.5 and 'hello' +** AND c<>x'aabbcc' +** ORDER BY d, e DESC; */ #if !defined(SQLITEINT_H) #include "sqlite3ext.h" @@ -35,6 +67,7 @@ SQLITE_EXTENSION_INIT1 #include #include +#include #if !defined(SQLITE_OMIT_VIRTUALTABLE) @@ -59,6 +92,20 @@ struct qpvtab_cursor { int flags; /* Flags value */ }; +/* +** Names of columns +*/ +static const char *azColname[] = { + "vn", + "ix", + "cn", + "op", + "ux", + "rhs", + "a", "b", "c", "d", "e", + "flags" +}; + /* ** The qpvtabConnect() method is invoked to create a new ** qpvtab virtual table. @@ -74,13 +121,28 @@ static int qpvtabConnect( int rc; rc = sqlite3_declare_vtab(db, - "CREATE TABLE x(a,b,c,d,e, f,g,h,i,j, k,l,m,n,o, p,q,r,s,t," - " flags HIDDEN)" + "CREATE TABLE x(" + " vn TEXT," + " ix INT," + " cn TEXT," + " op INT," + " ux BOOLEAN," + " rhs TEXT," + " a, b, c, d, e," + " flags INT HIDDEN)" ); -#define QPVTAB_A 0 -#define QPVTAB_B 1 -#define QPVTAB_T 19 -#define QPVTAB_FLAGS 20 +#define QPVTAB_VN 0 +#define QPVTAB_IX 1 +#define QPVTAB_CN 2 +#define QPVTAB_OP 3 +#define QPVTAB_UX 4 +#define QPVTAB_RHS 5 +#define QPVTAB_A 6 +#define QPVTAB_B 7 +#define QPVTAB_C 8 +#define QPVTAB_D 9 +#define QPVTAB_E 10 +#define QPVTAB_FLAGS 11 if( rc==SQLITE_OK ){ pNew = sqlite3_malloc( sizeof(*pNew) ); *ppVtab = (sqlite3_vtab*)pNew; @@ -126,10 +188,12 @@ static int qpvtabClose(sqlite3_vtab_cursor *cur){ */ static int qpvtabNext(sqlite3_vtab_cursor *cur){ qpvtab_cursor *pCur = (qpvtab_cursor*)cur; - while( pCur->iRowidnData && pCur->zData[pCur->iRowid]!='\n' ){ - pCur->iRowid++; + if( pCur->iRowidnData ){ + const char *z = &pCur->zData[pCur->iRowid]; + const char *zEnd = strchr(z, '\n'); + if( zEnd ) zEnd++; + pCur->iRowid = (int)(zEnd - pCur->zData); } - if( pCur->zData[pCur->iRowid]=='\n' ) pCur->iRowid++; return SQLITE_OK; } @@ -143,16 +207,29 @@ static int qpvtabColumn( int i /* Which column to return */ ){ qpvtab_cursor *pCur = (qpvtab_cursor*)cur; - if( i==0 && pCur->iRowidnData ){ + if( i>=QPVTAB_VN && i<=QPVTAB_RHS && pCur->iRowidnData ){ + const char *z = &pCur->zData[pCur->iRowid]; + const char *zEnd; int j; - for(j=pCur->iRowid; jnData && pCur->zData[j]!='\n'; j++){} - sqlite3_result_text64(ctx, &pCur->zData[pCur->iRowid], j-pCur->iRowid, - SQLITE_TRANSIENT, SQLITE_UTF8); - }else if( i>=QPVTAB_B && i<=QPVTAB_T ){ - if( pCur->flags & 1 ){ - sqlite3_result_int(ctx, i); + j = QPVTAB_VN; + while(1){ + zEnd = strchr(z, j==QPVTAB_RHS ? '\n' : ','); + if( j==i || zEnd==0 ) break; + z = zEnd+1; + j++; + } + if( zEnd==z ){ + sqlite3_result_null(ctx); + }else if( i==QPVTAB_IX || i==QPVTAB_OP || i==QPVTAB_UX ){ + sqlite3_result_int(ctx, atoi(z)); }else{ - char x = 'a'+i; + sqlite3_result_text64(ctx, z, zEnd-z, SQLITE_TRANSIENT, SQLITE_UTF8); + } + }else if( i>=QPVTAB_A && i<=QPVTAB_E ){ + if( pCur->flags & 1 ){ + sqlite3_result_int(ctx, i-QPVTAB_A+1); + }else{ + char x = 'a'+i-QPVTAB_A; sqlite3_result_text64(ctx, &x, 1, SQLITE_TRANSIENT, SQLITE_UTF8); } }else if( i==QPVTAB_FLAGS ){ @@ -216,9 +293,20 @@ static void qpvtabStrAppendValue( case SQLITE_FLOAT: sqlite3_str_appendf(pStr, "%f", sqlite3_value_double(pVal)); break; - case SQLITE_TEXT: - sqlite3_str_appendf(pStr, "%Q", sqlite3_value_text(pVal)); + case SQLITE_TEXT: { + int i; + const char *a = (const char*)sqlite3_value_text(pVal); + int n = sqlite3_value_bytes(pVal); + sqlite3_str_append(pStr, "'", 1); + for(i=0; inConstraint); + sqlite3_str_appendf(pStr, "nConstraint,%d,,,,\n", pIdxInfo->nConstraint); for(i=0; inConstraint; i++){ sqlite3_value *pVal; int iCol = pIdxInfo->aConstraint[i].iColumn; - char zCol[8]; - if( iCol==QPVTAB_FLAGS ){ - strcpy(zCol, "flags"); - if( pIdxInfo->aConstraint[i].usable ){ - pVal = 0; - sqlite3_vtab_rhs_value(pIdxInfo, i, &pVal); - if( pVal ){ - pIdxInfo->idxNum = sqlite3_value_int(pVal); - } + if( iCol==QPVTAB_FLAGS && pIdxInfo->aConstraint[i].usable ){ + pVal = 0; + sqlite3_vtab_rhs_value(pIdxInfo, i, &pVal); + if( pVal ){ + pIdxInfo->idxNum = sqlite3_value_int(pVal); + if( pIdxInfo->idxNum & 2 ) pIdxInfo->orderByConsumed = 1; } - }else{ - zCol[0] = iCol+'a'; - zCol[1] = 0; } - sqlite3_str_appendf(pStr,"aConstraint[%d]: iColumn=%s op=%d usable=%d", + sqlite3_str_appendf(pStr,"aConstraint,%d,%s,%d,%d,", i, - zCol, + azColname[iCol], pIdxInfo->aConstraint[i].op, pIdxInfo->aConstraint[i].usable); pVal = 0; sqlite3_vtab_rhs_value(pIdxInfo, i, &pVal); if( pVal ){ - sqlite3_str_appendf(pStr, " value="); qpvtabStrAppendValue(pStr, pVal); } sqlite3_str_append(pStr, "\n", 1); - if( pIdxInfo->aConstraint[i].usable ){ + if( iCol>=QPVTAB_A && pIdxInfo->aConstraint[i].usable ){ pIdxInfo->aConstraintUsage[i].argvIndex = ++k; pIdxInfo->aConstraintUsage[i].omit = 1; } } + sqlite3_str_appendf(pStr, "nOrderBy,%d,,,,\n", pIdxInfo->nOrderBy); + for(i=0; inOrderBy; i++){ + int iCol = pIdxInfo->aOrderBy[i].iColumn; + sqlite3_str_appendf(pStr, "aOrderBy,%d,%s,%d,,\n",i, + iCol>=0 ? azColname[iCol] : "rowid", + pIdxInfo->aOrderBy[i].desc + ); + } + sqlite3_str_appendf(pStr, "idxFlags,%d,,,,\n", pIdxInfo->idxFlags); + sqlite3_str_appendf(pStr, "colUsed,%d,,,,\n", (int)pIdxInfo->colUsed); pIdxInfo->estimatedCost = (double)10; pIdxInfo->estimatedRows = 10; - sqlite3_str_appendf(pStr, "idxNum=%d\n", pIdxInfo->idxNum); + sqlite3_str_appendf(pStr, "idxNum,%d,,,,\n", pIdxInfo->idxNum); + sqlite3_str_appendf(pStr, "orderByConsumed,%d,,,,\n", + pIdxInfo->orderByConsumed); pIdxInfo->idxStr = sqlite3_str_finish(pStr); pIdxInfo->needToFreeIdxStr = 1; return SQLITE_OK; diff --git a/manifest b/manifest index 426d57cde5..9fcc7fcf6d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Initial\simplementation\sof\sthe\ssqlite3_vtab_rhs_value()\sinterface\sand\sthe\nqpvtab\sextension\sused\sfor\stesting\sthe\svirtual\stable\sinterface. -D 2022-01-20T17:10:59.757 +C Enhancements\sto\sthe\sqpvtab\svirtual\stable\sto\smake\sit\smore\suseful\sfor\stesting\nand\sverification\sof\svirtual\stable\sinterfaces. +D 2022-01-20T18:27:54.219 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -316,7 +316,7 @@ F ext/misc/noop.c 81efe4cad9ec740e64388b14281cb983e6e2c223fed43eb77ab3e34946e0c1 F ext/misc/normalize.c bd84355c118e297522aba74de34a4fd286fc775524e0499b14473918d09ea61f F ext/misc/percentile.c b9086e223d583bdaf8cb73c98a6539d501a2fc4282654adbfea576453d82e691 F ext/misc/prefixes.c 0f4f8cff5aebc00a7e3ac4021fd59cfe1a8e17c800ceaf592859ecb9cbc38196 -F ext/misc/qpvtab.c 0f6e3f4081f6ad0104d016bf6e21de8a7f5e3f14b984a2158940a1809741fd96 +F ext/misc/qpvtab.c 38f0753b264cb206574c720eb8a118b0d6b7be077aaefd3229711de7d6a65dee F ext/misc/regexp.c b267fd05ff8d38b22f4c2809d7b7a2c61d522e9faf2feb928dbb9662e4a3a386 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c @@ -1939,11 +1939,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 71bfd0b57ab197405606b8096b8521d784ff174c4eecf1d9804d38342c03cc80 -R 2d7b697c8fff979e242ffc760548c840 -T *branch * sqlite3_vtab_rhs_value -T *sym-sqlite3_vtab_rhs_value * -T -sym-trunk * +P 0873c76b9b96b66fa9d13ddc8bca126d575ea3352349c7fd648f0c2f75d770f5 +R d96d8f6f20ceef7302e199b2da925b92 U drh -Z 906d4e9a8d8e3be5e145d8027611963e +Z 918c35408c3bb1880315f1de3ce596eb # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 87e9323d0e..2bc9990cb8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0873c76b9b96b66fa9d13ddc8bca126d575ea3352349c7fd648f0c2f75d770f5 \ No newline at end of file +850efc4cf3d136fba9173c380e9417b43bb93c050f7eeb85d07fd39a4b1cc6aa \ No newline at end of file