From: drh <> Date: Sun, 14 Jun 2026 22:01:56 +0000 (+0000) Subject: Remove the unused, untested, experiemental "blobio.c" extension, to X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d59375ac8fe0d69ef28f70177ca66e535ea3a72;p=thirdparty%2Fsqlite.git Remove the unused, untested, experiemental "blobio.c" extension, to avoid confusing AIs. [bugs:/info/2026-06-14T15:12:50Z|Bug 2026-06-14T15:12:50Z] FossilOrigin-Name: 45918d5e97a0c29c6fa03d09ac8e131dcca3bf4268bf4f5c46c221b1f900651a --- diff --git a/ext/misc/blobio.c b/ext/misc/blobio.c deleted file mode 100644 index 3a1ee8465c..0000000000 --- a/ext/misc/blobio.c +++ /dev/null @@ -1,152 +0,0 @@ -/* -** 2019-03-30 -** -** The author disclaims copyright to this source code. In place of -** a legal notice, here is a blessing: -** -** May you do good and not evil. -** May you find forgiveness for yourself and forgive others. -** May you share freely, never taking more than you give. -** -****************************************************************************** -** -** An SQL function that uses the incremental BLOB I/O mechanism of SQLite -** to read or write part of a blob. This is intended for debugging use -** in the CLI. -** -** readblob(SCHEMA,TABLE,COLUMN,ROWID,OFFSET,N) -** -** Returns N bytes of the blob starting at OFFSET. -** -** writeblob(SCHEMA,TABLE,COLUMN,ROWID,OFFSET,NEWDATA) -** -** NEWDATA must be a blob. The content of NEWDATA overwrites the -** existing BLOB data at SCHEMA.TABLE.COLUMN for row ROWID beginning -** at OFFSET bytes into the blob. -*/ -#include "sqlite3ext.h" -SQLITE_EXTENSION_INIT1 -#include -#include - -static void readblobFunc( - sqlite3_context *context, - int argc, - sqlite3_value **argv -){ - sqlite3_blob *pBlob = 0; - const char *zSchema; - const char *zTable; - const char *zColumn; - sqlite3_int64 iRowid; - int iOfst; - unsigned char *aData; - int nData; - sqlite3 *db; - int rc; - - zSchema = (const char*)sqlite3_value_text(argv[0]); - zTable = (const char*)sqlite3_value_text(argv[1]); - if( zTable==0 ){ - sqlite3_result_error(context, "bad table name", -1); - return; - } - zColumn = (const char*)sqlite3_value_text(argv[2]); - if( zTable==0 ){ - sqlite3_result_error(context, "bad column name", -1); - return; - } - iRowid = sqlite3_value_int64(argv[3]); - iOfst = sqlite3_value_int(argv[4]); - nData = sqlite3_value_int(argv[5]); - if( nData<=0 ) return; - aData = sqlite3_malloc64( nData+1 ); - if( aData==0 ){ - sqlite3_result_error_nomem(context); - return; - } - db = sqlite3_context_db_handle(context); - rc = sqlite3_blob_open(db, zSchema, zTable, zColumn, iRowid, 0, &pBlob); - if( rc ){ - sqlite3_free(aData); - sqlite3_result_error(context, "cannot open BLOB pointer", -1); - return; - } - rc = sqlite3_blob_read(pBlob, aData, nData, iOfst); - sqlite3_blob_close(pBlob); - if( rc ){ - sqlite3_free(aData); - sqlite3_result_error(context, "BLOB read failed", -1); - }else{ - sqlite3_result_blob(context, aData, nData, sqlite3_free); - } -} - -static void writeblobFunc( - sqlite3_context *context, - int argc, - sqlite3_value **argv -){ - sqlite3_blob *pBlob = 0; - const char *zSchema; - const char *zTable; - const char *zColumn; - sqlite3_int64 iRowid; - int iOfst; - unsigned char *aData; - int nData; - sqlite3 *db; - int rc; - - zSchema = (const char*)sqlite3_value_text(argv[0]); - zTable = (const char*)sqlite3_value_text(argv[1]); - if( zTable==0 ){ - sqlite3_result_error(context, "bad table name", -1); - return; - } - zColumn = (const char*)sqlite3_value_text(argv[2]); - if( zTable==0 ){ - sqlite3_result_error(context, "bad column name", -1); - return; - } - iRowid = sqlite3_value_int64(argv[3]); - iOfst = sqlite3_value_int(argv[4]); - if( sqlite3_value_type(argv[5])!=SQLITE_BLOB ){ - sqlite3_result_error(context, "6th argument must be a BLOB", -1); - return; - } - nData = sqlite3_value_bytes(argv[5]); - aData = (unsigned char *)sqlite3_value_blob(argv[5]); - db = sqlite3_context_db_handle(context); - rc = sqlite3_blob_open(db, zSchema, zTable, zColumn, iRowid, 1, &pBlob); - if( rc ){ - sqlite3_result_error(context, "cannot open BLOB pointer", -1); - return; - } - rc = sqlite3_blob_write(pBlob, aData, nData, iOfst); - sqlite3_blob_close(pBlob); - if( rc ){ - sqlite3_result_error(context, "BLOB write failed", -1); - } -} - - -#ifdef _WIN32 -__declspec(dllexport) -#endif -int sqlite3_blobio_init( - sqlite3 *db, - char **pzErrMsg, - const sqlite3_api_routines *pApi -){ - int rc = SQLITE_OK; - SQLITE_EXTENSION_INIT2(pApi); - (void)pzErrMsg; /* Unused parameter */ - rc = sqlite3_create_function(db, "readblob", 6, SQLITE_UTF8, 0, - readblobFunc, 0, 0); - if( rc==SQLITE_OK ){ - rc = sqlite3_create_function(db, "writeblob", 6, SQLITE_UTF8, 0, - writeblobFunc, 0, 0); - } - return rc; -} diff --git a/manifest b/manifest index cb595590bd..86d7454ef6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\sallow\sridiculous\s"columns=N"\svalues\sin\sthe\s(unused)\scsv\svirtual\ntable\sin\sthe\sextensions\sfolder.\n[bugs:/info/2026-06-14T15:22:47Z|Bug\s2026-06-14T15:22:47Z] -D 2026-06-14T20:10:28.306 +C Remove\sthe\sunused,\suntested,\sexperiemental\s"blobio.c"\sextension,\sto\navoid\sconfusing\sAIs.\n[bugs:/info/2026-06-14T15:12:50Z|Bug\s2026-06-14T15:12:50Z] +D 2026-06-14T22:01:56.449 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -366,7 +366,6 @@ F ext/misc/appendvfs.c 9642c7a194a2a25dca7ad3e36af24a0a46d7702168c4ad7e59c9f9b0e F ext/misc/base64.c 1445761667c16356e827fc6418294c869468be934429aaa8315035e76dd58acf F ext/misc/base85.c c713c7c81b05558c488cbdd8c68d612d5a97f9f0b8adf1167148dd7c89ce3f96 F ext/misc/basexx.c 89ad6b76558efbceb627afd5e2ef1d84b2e96d9aaf9b7ecb20e3d00b51be6fcf -F ext/misc/blobio.c a867c4c4617f6ec223a307ebfe0eabb45e0992f74dd47722b96f3e631c0edb2a F ext/misc/btreeinfo.c 5fe97f798a9ee90e92b3031ed7969ec3f558661bb36b821c3ba045a17cfb951c F ext/misc/cksumvfs.c 9d7d0cf1a8893ac5d48922bfe9f3f217b4a61a6265f559263a02bb2001259913 F ext/misc/closure.c c983987a8d7846c3e52b1885ed3e20af7d4ca52a81a8f94ec6d1cd68f93acc86 @@ -2209,8 +2208,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P b19cef1862444ee694eeea2254aa9a8d74d2343da5a8257c22e3068f388aa2fd -R d59154cd54b10a97004df6bb2198abf7 +P ecae4a2ddf103fe575c6864d201e83a9bb084b511685397db41b3349c91b38e6 +R 71f2f2cdfd58b7b9bd4dddcf7958dc0a U drh -Z ac83713ac472a710a3b00f9e0bafc227 +Z 195d510236f803534616a27485b6d62b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 679cf9acef..07a0e88f2e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ecae4a2ddf103fe575c6864d201e83a9bb084b511685397db41b3349c91b38e6 +45918d5e97a0c29c6fa03d09ac8e131dcca3bf4268bf4f5c46c221b1f900651a