-C Strive\sto\sskip\sthe\sevaluation\sof\sscalar\ssubqueries\sthat\sare\spart\sof\sa\nlarger\sexpression\sif\sthe\sresult\sfrom\sthe\sscalar\ssubquery\sdoes\snot\schange\sthe\nresult\sof\sthe\soverall\sexpression.
-D 2025-06-30T16:41:40.414
+C Restart\sthis\sbranch\susing\sa\sdifferent\stake:\sadd\snew\s"v2"\sroutines\sinstead\sof\srefactoring\sthe\sold\sones,\swhich\seliminating\sany\sperformance\simpact\sor\srisk\sof\sbehavior\schange\sfor\sexisting\sAPIs.\sNone\sof\sthis\scode\sis\sactually\scalled\sfrom\sanywhere\syet.
+D 2025-06-30T23:17:57.299
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
F src/select.c 882d739e0d5e6c7a8b46a3cca3ada37fe1a56301f1360d6b141312c666bbe482
F src/shell.c.in 4f14a1f5196b6006abc8e73cc8fd6c1a62cf940396f8ba909d6711f35f074bb6
-F src/sqlite.h.in 5c54f2461a1ea529bab8499148a2b238e2d4bb571d59e8ea5322d0c190abb693
+F src/sqlite.h.in 90bdcd7266ccff161aa3aa050f1cff8a0997217466d3661b808ad63d88786aec
F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
-F src/sqliteInt.h 005542f8760edf9b62f014abccb876cf64533b64475a40a89402054d62535288
+F src/sqliteInt.h 461d39b85ee97d8f1496388f5d6884e8a240cabaea26b915ac7fd59e7a2ef727
F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
F src/vdbe.c 7e29623ca387880b8893e69135a0ff240c3dcaf0710f7a46a5f95b062cf93883
F src/vdbe.h 93761ed7c6b8bc19524912fd9b9b587d41bf4f1d0ade650a00dadc10518d8958
F src/vdbeInt.h 0bc581a9763be385e3af715e8c0a503ba8422c2b7074922faf4bb0d6ae31b15e
-F src/vdbeapi.c f9a4881a9674fec3fa13da35044a1484d3c4b95f9ec891cc8ffb02ef2b7a41df
+F src/vdbeapi.c bfd865e163fa1fa58ebe1cb469a6798e64d114c84dd855079b6605e6bda75967
F src/vdbeaux.c fd2c6b19a8892c31a2adc719f156f313560f9cc490cdbd04ff08fdae5d7aedb7
F src/vdbeblob.c b1b4032cac46b41e44b957c4d00aee9851f862dfd85ecb68116ba49884b03dfd
-F src/vdbemem.c e67d9c6484d868c879d20c70d00bf4a9058082f1d4058607ca15d50eb3aebc21
+F src/vdbemem.c 4c4878f6b691650a484f8046015d9b4653a904113d90b1da5f019a8819eee5de
F src/vdbesort.c cb6f472e83ca12c46aa7de0ac0a9d11458b357986f2617a1c90dfb19a542ecbe
F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P b48d95191662e09659b5b55ae65cd462c9e1700c4f92dd9d40b59548f0797c02 d86eb16283c4b573c506d4faa422d5d9aeb6abc279d8e6a8e2104737162d417f
-R 9194e4789912b64a71b73947ca782430
-T +closed d86eb16283c4b573c506d4faa422d5d9aeb6abc279d8e6a8e2104737162d417f
-U drh
-Z 98e7e495521ce39084e96bf3212efc13
+P 0083d5169a46104a25355bdd9d5a2f4027b049191ebda571dd228477ec217296
+R 4239fe5683a0ec74248fc5c2088a43d0
+T *branch * column-text-blob-v2
+T *sym-column-text-blob-v2 *
+T -sym-trunk * Cancelled\sby\sbranch.
+U stephan
+Z 25bc418674281d77a7472549ccb81773
# Remove this line to create a well-formed Fossil manifest.
-0083d5169a46104a25355bdd9d5a2f4027b049191ebda571dd228477ec217296
+b0b1b4ccb9b135a6feab73113a31064bac0895464ae36e936fcdcffeaa0933d3
** other SQLite interface is called on the same [database connection].
*/
const void *sqlite3_value_blob(sqlite3_value*);
+int sqlite3_value_blob_v2(sqlite3_value*, const void **, int*);
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 char*);
const unsigned char *sqlite3_value_text(sqlite3_value*);
+int sqlite3_value_text_v2(sqlite3_value*, const unsigned char **, int*);
const void *sqlite3_value_text16(sqlite3_value*);
const void *sqlite3_value_text16le(sqlite3_value*);
const void *sqlite3_value_text16be(sqlite3_value*);
u8 sqlite3GetBoolean(const char *z,u8);
const void *sqlite3ValueText(sqlite3_value*, u8);
+int sqlite3ValueTextV2(sqlite3_value*, u8, const void **, int*);
+
int sqlite3ValueIsOfClass(const sqlite3_value*, void(*)(void*));
int sqlite3ValueBytes(sqlite3_value*, u8);
void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8,
return sqlite3_value_text(pVal);
}
}
+int sqlite3_value_blob_v2(sqlite3_value *pVal, const void **pOut,
+ int *pnOut){
+ Mem *p = (Mem*)pVal;
+#ifdef SQLITE_ENABLE_API_ARMOR
+ if( pVal==0 || pOut==0 ){
+ return SQLITE_MISUSE_BKPT;
+ }
+#endif
+ if( p->flags & (MEM_Blob|MEM_Str) ){
+ if( ExpandBlob(p)!=SQLITE_OK ){
+ assert( p->flags==MEM_Null && p->z==0 );
+ return SQLITE_NOMEM_BKPT;
+ }
+ p->flags |= MEM_Blob;
+ *pOut = p->n ? p->z : 0;
+ if( pnOut ) *pnOut = p->n;
+ return 0;
+ }else{
+ return sqlite3_value_text_v2(pVal, (const unsigned char **)pOut,
+ pnOut);
+ }
+}
int sqlite3_value_bytes(sqlite3_value *pVal){
return sqlite3ValueBytes(pVal, SQLITE_UTF8);
}
const unsigned char *sqlite3_value_text(sqlite3_value *pVal){
return (const unsigned char *)sqlite3ValueText(pVal, SQLITE_UTF8);
}
+int sqlite3_value_text_v2(sqlite3_value *pVal,
+ const unsigned char **pOut,
+ int *pnOut){
+ int n = 0;
+#ifdef SQLITE_ENABLE_API_ARMOR
+ if( pOut==0 ){
+ return SQLITE_MISUSE_BKPT;
+ }
+#endif
+ return sqlite3ValueTextV2(pVal, SQLITE_UTF8, (const void **)pOut,
+ pnOut ? pnOut : &n);
+}
#ifndef SQLITE_OMIT_UTF16
const void *sqlite3_value_text16(sqlite3_value* pVal){
return sqlite3ValueText(pVal, SQLITE_UTF16NATIVE);
}
}
+/*
+** This works like valueToText() but returns its result using
+** different semantics. On success, return 0, set *pOut to a
+** zero-terminated version of that string, and set *pnOut (which must
+** not be NULL, to avoid an extra branch in this function) to the
+** string-length of that memory. On error, return non-0 and do not
+** modify pOut or pnOut.
+*/
+static SQLITE_NOINLINE int valueToTextV2(sqlite3_value* pVal, u8 enc,
+ const void **pOut, int *pnOut){
+ assert( pVal!=0 );
+ assert( pVal->db==0 || sqlite3_mutex_held(pVal->db->mutex) );
+ assert( (enc&3)==(enc&~SQLITE_UTF16_ALIGNED) );
+ assert( !sqlite3VdbeMemIsRowSet(pVal) );
+ assert( (pVal->flags & (MEM_Null))==0 );
+ assert( pOut!=0 );
+ assert( pnOut!=0 );
+ if( pVal->flags & (MEM_Blob|MEM_Str) ){
+ if( ExpandBlob(pVal) ){
+ return SQLITE_NOMEM_BKPT;
+ }
+ pVal->flags |= MEM_Str;
+ if( pVal->enc != (enc & ~SQLITE_UTF16_ALIGNED) ){
+ sqlite3VdbeChangeEncoding(pVal, enc & ~SQLITE_UTF16_ALIGNED);
+ }
+ if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&SQLITE_PTR_TO_INT(pVal->z)) ){
+ assert( (pVal->flags & (MEM_Ephem|MEM_Static))!=0 );
+ const int rc = sqlite3VdbeMemMakeWriteable(pVal);
+ if( rc!=SQLITE_OK ){
+ assert( SQLITE_NOMEM==rc );
+ return SQLITE_NOMEM_BKPT;
+ }
+ }
+ sqlite3VdbeMemNulTerminate(pVal); /* IMP: R-31275-44060 */
+ }else{
+ sqlite3VdbeMemStringify(pVal, enc, 0);
+ assert( 0==(1&SQLITE_PTR_TO_INT(pVal->z)) );
+ }
+ assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || pVal->db==0
+ || pVal->db->mallocFailed );
+#if 0
+ if( pVal->db && pVal->db->mallocFailed ){
+ return SQLITE_NOMEM_BKPT;
+ }
+#endif
+ if( pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) ){
+ assert( sqlite3VdbeMemValidStrRep(pVal) );
+ *pOut = pVal->z;
+ *pnOut = pVal->n;
+ return 0;
+ }
+ return (pVal->db && pVal->db->mallocFailed)
+ ? SQLITE_NOMEM_BKPT
+ : SQLITE_ERROR;
+}
+
/* This function is only available internally, it is not part of the
** external API. It works in a similar way to sqlite3_value_text(),
** except the data returned is in the encoding specified by the second
return valueToText(pVal, enc);
}
+/* This works similarly to sqlite3ValueText() but returns its result
+** with different semantics.
+**
+** On success, returns 0, sets *pOut to the underlying value (or NULL
+** in the case of NULL), and sets *pnOut to the memory's usable
+** length. On error, neither *pOut nor *pnOut are modified.
+**
+** Design note: pnOut must not be NULL to avoid an extra branch in
+** this function. It is thought (but is untested) that such a branch
+** would be more expensive than ensuring that pnOut is not NULL
+** will. Public APIs wrapping this may optionally accept a NULL pnOut,
+** but must not pass that NULL on to here.
+*/
+int sqlite3ValueTextV2(sqlite3_value* pVal, u8 enc,
+ const void **pOut, int *pnOut){
+ if( !pVal ) return SQLITE_MISUSE_BKPT;
+ assert( pVal->db==0 || sqlite3_mutex_held(pVal->db->mutex) );
+ assert( (enc&3)==(enc&~SQLITE_UTF16_ALIGNED) );
+ assert( !sqlite3VdbeMemIsRowSet(pVal) );
+ assert( pOut!=0 );
+ assert( pnOut!=0 );
+ if( (pVal->flags&(MEM_Str|MEM_Term))==(MEM_Str|MEM_Term) && pVal->enc==enc ){
+ assert( sqlite3VdbeMemValidStrRep(pVal) );
+ *pOut = pVal->z;
+ *pnOut = pVal->n;
+ return 0;
+ }
+ if( pVal->flags&MEM_Null ){
+ *pOut = 0;
+ *pnOut = 0;
+ return 0;
+ }
+ return valueToTextV2(pVal, enc, pOut, pnOut);
+}
+
/* Return true if sqlit3_value object pVal is a string or blob value
** that uses the destructor specified in the second argument.
**
projects / thirdparty / sqlite.git / commitdiff
