From: drh Date: Fri, 21 Jul 2017 03:09:35 +0000 (+0000) Subject: Add new interfaces sqlite3_result_pointer(), and X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fbranch-3.7.11;p=thirdparty%2Fsqlite.git Add new interfaces sqlite3_result_pointer(), and sqlite3_value_pointer() and use them to transfer the eponymous FTS3 column pointer to the snippet() and offsets() routines. This changes is inspired by check-in [72de49f2] but is new implementation, not a cherry-pick. FossilOrigin-Name: f0f492245e957f5339c5aef02716321e45c18914b9a78387e4158f87fc2d83f9 --- diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index 67537896b9..2fae31704d 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -3067,7 +3067,7 @@ static int fts3ColumnMethod( }else if( iCol==p->nColumn ){ /* The extra column whose name is the same as the table. ** Return a blob which is a pointer to the cursor. */ - sqlite3_result_blob(pCtx, &pCsr, sizeof(pCsr), SQLITE_TRANSIENT); + sqlite3_result_pointer(pCtx, pCsr); }else if( iCol==p->nColumn+2 && pCsr->pExpr ){ sqlite3_result_int64(pCtx, pCsr->iLangid); }else{ @@ -3194,16 +3194,13 @@ static int fts3FunctionArg( sqlite3_value *pVal, /* argv[0] passed to function */ Fts3Cursor **ppCsr /* OUT: Store cursor handle here */ ){ - Fts3Cursor *pRet; - if( sqlite3_value_type(pVal)!=SQLITE_BLOB - || sqlite3_value_bytes(pVal)!=sizeof(Fts3Cursor *) - ){ + Fts3Cursor *pRet = (Fts3Cursor*)sqlite3_value_pointer(pVal); + if( pRet==0 ){ char *zErr = sqlite3_mprintf("illegal first argument to %s", zFunc); sqlite3_result_error(pContext, zErr, -1); sqlite3_free(zErr); return SQLITE_ERROR; } - memcpy(&pRet, sqlite3_value_blob(pVal), sizeof(Fts3Cursor *)); *ppCsr = pRet; return SQLITE_OK; } diff --git a/manifest b/manifest index ad97399d07..442e21f3b8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Silently\signore\sany\sattempt\sto\sadd\sa\sprefix\sindex\sfor\sprefixes\szero\sbytes\sin\ssize\sto\san\sfts3/4\stable.\sOr\sany\sprefix\sindex\ssize\sso\slarge\sthat\sit\soverflows\sa\s32-bit\ssigned\sinteger.\s\sCherrypick\s[ad4b19d2ac0889a] -D 2015-05-21T02:24:35.011 +C Add\snew\sinterfaces\ssqlite3_result_pointer(),\sand\nsqlite3_value_pointer()\sand\suse\sthem\sto\stransfer\sthe\seponymous\sFTS3\scolumn\npointer\sto\sthe\ssnippet()\sand\soffsets()\sroutines.\s\sThis\schanges\sis\ninspired\sby\scheck-in\s[72de49f2]\sbut\sis\snew\simplementation,\snot\sa\scherry-pick. +D 2017-07-21T03:09:35.560 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -63,7 +63,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c 64d50e38c2b8087c164b150a813d2330bfa21979 +F ext/fts3/fts3.c eca471e5a9c5b13efbd97f67cec501e666320d1e93d0851226356e289edbf545 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3Int.h d1d7f964ddee067bcd16a6af4ba7ecf66220056d F ext/fts3/fts3_aux.c 5205182bd8f372782597888156404766edf5781e @@ -182,7 +182,7 @@ F src/resolve.c 3d3e80a98f203ac6b9329e9621e29eda85ddfd40 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c 44ccdcb5d2a1c48622c179b2d72167b716388581 F src/shell.c a31c37ed0959173dce7a565359e6372c68aa0268 -F src/sqlite.h.in 6af2d92925bfed3dfd2c022fef48469762ccd435 +F src/sqlite.h.in fe9d87c4e45203ddffa508f14ab39932ba6efdfae1c8fcb1bfbc04170fb9eeaf F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477 F src/sqliteInt.h ce9a4d64a183a0d3500123445a905607abaeb0a1 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d @@ -242,8 +242,8 @@ F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3 F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8 F src/vdbe.c 32720e873ed0a23e6ee928b676cd995864b984d6 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb -F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91 +F src/vdbeInt.h 0fb63a812b973f2f845de68f82b552a7e4f9d3ac28602da448a7a4c0ad58c477 +F src/vdbeapi.c ac2f07c42b18ad3f5703a8bd3c5102549676594c154e0e49cca3adf5b9f75651 F src/vdbeaux.c 79cf42b70e211a52d664fc4d585ee2da0a64deac F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a @@ -992,8 +992,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P 9e3f64a4f4182ad80e82edb53095ed508e8b1d13 -Q +ad4b19d2ac0889a23fe3b0fd844286efc10cdd82 -R eb8d361274a46c018e06afbba8f0a59c +P 000197cc4e3874711388d79d9ad5af6f0aba6cf9 +R 216f1f59a17a7632e354caa909677e48 U drh -Z 2bdf48b209e1a6d6f4d758c56e896ebb +Z 5a09f7760c2f0f7c70af841ad176b2e0 diff --git a/manifest.uuid b/manifest.uuid index a630e364f3..579e93fbd0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -000197cc4e3874711388d79d9ad5af6f0aba6cf9 \ No newline at end of file +f0f492245e957f5339c5aef02716321e45c18914b9a78387e4158f87fc2d83f9 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 15a1b603a3..9b976a0689 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -3945,6 +3945,7 @@ int sqlite3_value_bytes16(sqlite3_value*); double sqlite3_value_double(sqlite3_value*); int sqlite3_value_int(sqlite3_value*); sqlite3_int64 sqlite3_value_int64(sqlite3_value*); +void *sqlite3_value_pointer(sqlite3_value*); const unsigned char *sqlite3_value_text(sqlite3_value*); const void *sqlite3_value_text16(sqlite3_value*); const void *sqlite3_value_text16le(sqlite3_value*); @@ -4202,6 +4203,7 @@ void sqlite3_result_error_code(sqlite3_context*, int); void sqlite3_result_int(sqlite3_context*, int); void sqlite3_result_int64(sqlite3_context*, sqlite3_int64); void sqlite3_result_null(sqlite3_context*); +void sqlite3_result_pointer(sqlite3_context*, void*); void sqlite3_result_text(sqlite3_context*, const char*, int, void(*)(void*)); void sqlite3_result_text16(sqlite3_context*, const void*, int, void(*)(void*)); void sqlite3_result_text16le(sqlite3_context*, const void*, int,void(*)(void*)); diff --git a/src/vdbeInt.h b/src/vdbeInt.h index 9c1af35c33..cf01688aef 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -151,6 +151,7 @@ struct Mem { union { i64 i; /* Integer value used when MEM_Int is set in flags */ int nZero; /* Used when bit MEM_Zero is set in flags */ + void *pPtr; /* Pointer when flags==MEM_Ptr|MEM_Null */ FuncDef *pDef; /* Used only when flags==MEM_Agg */ RowSet *pRowSet; /* Used only when flags==MEM_RowSet */ VdbeFrame *pFrame; /* Used when flags==MEM_Frame */ @@ -194,6 +195,7 @@ struct Mem { ** policy for Mem.z. The MEM_Term flag tells us whether or not the ** string is \000 or \u0000 terminated */ +#define MEM_Ptr 0x8000 /* u.pPtr is valid if type==SQLITE_NULL */ #define MEM_Term 0x0200 /* String rep is nul terminated */ #define MEM_Dyn 0x0400 /* Need to call sqliteFree() on Mem.z */ #define MEM_Static 0x0800 /* Mem.z points to a static string */ @@ -209,7 +211,7 @@ struct Mem { ** Clear any existing type flags from a Mem and replace them with f */ #define MemSetTypeFlag(p, f) \ - ((p)->flags = ((p)->flags&~(MEM_TypeMask|MEM_Zero))|f) + ((p)->flags = ((p)->flags&~(MEM_TypeMask|MEM_Zero|MEM_Ptr))|f) /* ** Return true if a memory cell is not marked as invalid. This macro diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 94db205e1f..eeaaab8729 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -163,6 +163,11 @@ int sqlite3_value_int(sqlite3_value *pVal){ sqlite_int64 sqlite3_value_int64(sqlite3_value *pVal){ return sqlite3VdbeIntValue((Mem*)pVal); } +void *sqlite3_value_pointer(sqlite3_value *pVal){ + Mem *p = (Mem*)pVal; + if( (p->flags&(MEM_TypeMask|MEM_Ptr))==(MEM_Null|MEM_Ptr) ) return p->u.pPtr; + return 0; +} const unsigned char *sqlite3_value_text(sqlite3_value *pVal){ return (const unsigned char *)sqlite3ValueText(pVal, SQLITE_UTF8); } @@ -234,6 +239,13 @@ void sqlite3_result_int64(sqlite3_context *pCtx, i64 iVal){ assert( sqlite3_mutex_held(pCtx->s.db->mutex) ); sqlite3VdbeMemSetInt64(&pCtx->s, iVal); } +void sqlite3_result_pointer(sqlite3_context *pCtx, void *pPtr){ + assert( sqlite3_mutex_held(pCtx->s.db->mutex) ); + sqlite3VdbeMemSetNull(&pCtx->s); + assert( (pCtx->s.flags & (MEM_TypeMask|MEM_Ptr))==MEM_Null ); + pCtx->s.flags |= MEM_Ptr; + pCtx->s.u.pPtr = pPtr; +} void sqlite3_result_null(sqlite3_context *pCtx){ assert( sqlite3_mutex_held(pCtx->s.db->mutex) ); sqlite3VdbeMemSetNull(&pCtx->s);