Back out [8bf26c956e]. It is not required following [8e7da8cf50].

FossilOrigin-Name: ea29180797aa4bb25180432e75a372277a6f6e2262906a9e765a3bddf8ca79d7

diff --git a/ext/fts5/fts5_storage.c b/ext/fts5/fts5_storage.c
index bff829ce64f2136d83cef87b6aeb5fc93ca63328..76820e85b37907d90f4662656e0cd5eca722984b 100644 (file)
--- a/ext/fts5/fts5_storage.c
+++ b/ext/fts5/fts5_storage.c
@@ -40,16 +40,16 @@
 **   This is necessary - using sqlite3_value_nochange() instead of just having
 **   SQLite pass the original value back via xUpdate() - so as not to discard
 **   any locale information associated with such values.
+**
 */
 struct Fts5Storage {
   Fts5Config *pConfig;
   Fts5Index *pIndex;
-  int db_enc;                     /* Database encoding */
   int bTotalsValid;               /* True if nTotalRow/aTotalSize[] are valid */
   i64 nTotalRow;                  /* Total number of rows in FTS table */
   i64 *aTotalSize;                /* Total sizes of each column */ 
   sqlite3_stmt *pSavedRow;
-  sqlite3_stmt *aStmt[13];
+  sqlite3_stmt *aStmt[12];
 };
 
 
@@ -72,7 +72,6 @@ struct Fts5Storage {
 #define FTS5_STMT_LOOKUP_DOCSIZE  9
 #define FTS5_STMT_REPLACE_CONFIG 10
 #define FTS5_STMT_SCAN           11
-#define FTS5_STMT_ENC_CONVERT    12
 
 /*
 ** Prepare the two insert statements - Fts5Storage.pInsertContent and
@@ -114,7 +113,6 @@ static int fts5StorageGetStmt(
 
       "REPLACE INTO %Q.'%q_config' VALUES(?,?)",        /* REPLACE_CONFIG */
       "SELECT %s FROM %s AS T",                         /* SCAN */
-      "SELECT substr(?, 1)",                            /* ENC_CONVERT */
     };
     Fts5Config *pC = p->pConfig;
     char *zSql = 0;
@@ -335,36 +333,6 @@ int sqlite3Fts5CreateTable(
   return rc;
 }
 
-/*
-** Set the value of Fts5Storage.db_enc to the db encoding. Return SQLITE_OK
-** if successful, or an SQLite error code otherwise.
-*/
-static int fts5StorageFindDbEnc(Fts5Storage *p){
-  const char *zSql = "PRAGMA encoding";
-  sqlite3_stmt *pStmt = 0;
-  int rc = SQLITE_OK;
-
-  rc = sqlite3_prepare(p->pConfig->db, zSql, -1, &pStmt, 0);
-  if( rc==SQLITE_OK ){
-    if( SQLITE_ROW==sqlite3_step(pStmt) ){
-      static const char *aEnc[] = {
-        "UTF-8", "UTF-16le", "UTF-16be"
-      };
-      const char *zEnc = (const char*)sqlite3_column_text(pStmt, 0);
-      int ii;
-      for(ii=0; ii<ArraySize(aEnc); ii++){
-        if( sqlite3_stricmp(aEnc[ii], zEnc)==0 ){
-          p->db_enc = ii+1;
-          break;
-        }
-      }
-    }
-    rc = sqlite3_finalize(pStmt);
-  }
-
-  return rc;
-}
-
 /*
 ** Open a new Fts5Index handle. If the bCreate argument is true, create
 ** and initialize the underlying tables 
@@ -393,9 +361,7 @@ int sqlite3Fts5StorageOpen(
   p->pConfig = pConfig;
   p->pIndex = pIndex;
 
-  rc = fts5StorageFindDbEnc(p);
-
-  if( rc==SQLITE_OK && bCreate ){
+  if( bCreate ){
     if( pConfig->eContent==FTS5_CONTENT_NORMAL 
      || pConfig->eContent==FTS5_CONTENT_UNINDEXED 
     ){
@@ -1065,59 +1031,6 @@ int sqlite3Fts5StorageContentInsert(
   return rc;
 }
 
-/*
-** Argument pVal is a blob value for which the internal encoding does not
-** match the database encoding. This happens when using sqlite3_bind_blob()
-** (which always sets encoding=utf8) with a utf-16 database. The problem
-** is that fts5 is about to call sqlite3_column_text() on the value to
-** obtain text for tokenization. And the conversion between text and blob
-** must take place assuming the blob is encoded in database encoding -
-** otherwise it won't match the text extracted from the same blob if it
-** is read from the db later on.
-**
-** This function attempts to create a new value containing a copy of
-** the blob in pVal, but with the encoding set to the database encoding.
-** If successful, it sets (*ppOut) to point to the new value and returns
-** SQLITE_OK. It is the responsibility of the caller to eventually free 
-** this value using sqlite3_value_free(). Or, if an error occurs, (*ppOut)
-** is set to NULL and an SQLite error code returned.
-*/
-static int fts5EncodingFix(
-  Fts5Storage *p, 
-  sqlite3_value *pVal, 
-  sqlite3_value **ppOut
-){
-  sqlite3_stmt *pStmt = 0;
-  int rc = fts5StorageGetStmt(
-      p, FTS5_STMT_ENC_CONVERT, &pStmt, p->pConfig->pzErrmsg
-  );
-  if( rc==SQLITE_OK ){
-    sqlite3_value *pDup = 0;
-    const char *pBlob = sqlite3_value_blob(pVal);
-    int nBlob = sqlite3_value_bytes(pVal);
-
-    sqlite3_bind_blob(pStmt, 1, pBlob, nBlob, SQLITE_STATIC);
-
-    if( SQLITE_ROW==sqlite3_step(pStmt) ){
-      sqlite3_value *pX = sqlite3_column_value(pStmt, 0);
-      pDup = sqlite3_value_dup(pX);
-      if( pDup==0 ){
-        rc = SQLITE_NOMEM;
-      }else{
-        *ppOut = pX;
-      }
-    }
-    rc = sqlite3_reset(pStmt);
-    if( rc!=SQLITE_OK ){
-      sqlite3_value_free(pDup);
-    }else{
-      *ppOut = pDup;
-    }
-  }
-
-  return rc;
-}
-
 /*
 ** Insert new entries into the FTS index and %_docsize table.
 */
@@ -1145,7 +1058,6 @@ int sqlite3Fts5StorageIndexInsert(
       const char *pText = 0;      /* Pointer to buffer containing text value */
       int nLoc = 0;               /* Size of pText in bytes */
       const char *pLoc = 0;       /* Pointer to buffer containing text value */
-      sqlite3_value *pFree = 0;
 
       sqlite3_value *pVal = apVal[ctx.iCol+2];
       if( p->pSavedRow && sqlite3_value_nochange(pVal) ){
@@ -1162,15 +1074,6 @@ int sqlite3Fts5StorageIndexInsert(
       if( pConfig->bLocale && sqlite3Fts5IsLocaleValue(pConfig, pVal) ){
         rc = sqlite3Fts5DecodeLocaleValue(pVal, &pText, &nText, &pLoc, &nLoc);
       }else{
-        if( sqlite3_value_type(pVal)==SQLITE_BLOB 
-         && sqlite3_value_encoding(pVal)!=p->db_enc
-        ){
-          rc = fts5EncodingFix(p, pVal, &pFree);
-          if( pFree ){
-            assert( rc==SQLITE_OK );
-            pVal = pFree;
-          }
-        }
         pText = (const char*)sqlite3_value_text(pVal);
         nText = sqlite3_value_bytes(pVal);
       }
@@ -1183,9 +1086,6 @@ int sqlite3Fts5StorageIndexInsert(
         );
         sqlite3Fts5ClearLocale(pConfig);
       }
-      if( pFree ){
-        sqlite3_value_free(pFree);
-      }
     }
     sqlite3Fts5BufferAppendVarint(&rc, &buf, ctx.szCol);
     p->aTotalSize[ctx.iCol] += (i64)ctx.szCol;

diff --git a/manifest b/manifest
index a9b23f05779e4dd2bcfddb58ea2337aa12a12d03..f6ec1075170eb601f6efb4f7f5bd7e1fe647ccc1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2025-10-10T14:31:46.035
+C Back\sout\s[8bf26c956e].\sIt\sis\snot\srequired\sfollowing\s[8e7da8cf50].
+D 2025-10-10T16:04:19.837
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -115,7 +115,7 @@ F ext/fts5/fts5_expr.c b8c32da1127bafaf10d6b4768b0dcb92285798524bed2d87a8686f99a
 F ext/fts5/fts5_hash.c a6266cedd801ab7964fa9e74ebcdda6d30ec6a96107fa24148ec6b7b5b80f6e0
 F ext/fts5/fts5_index.c 1e5009261966215b61bbe3b46d79916346efac775b57c1487a478f684c971111
 F ext/fts5/fts5_main.c 42025174a556257287071e90516d3ab8115daf1dd525a301883544469a260014
-F ext/fts5/fts5_storage.c 58dc1798105e5e94bab80a821bcf000f8b36fa27b5d94a01ca0cd33e364b68de
+F ext/fts5/fts5_storage.c 19bc7c4cbe1e6a2dd9849ef7d84b5ca1fcbf194cefc3e386b901e00e08bf05c2
 F ext/fts5/fts5_tcl.c 7fb5a3d3404099075aaa2457307cb459bbc257c0de3dbd52b1e80a5b503e0329
 F ext/fts5/fts5_test_mi.c 4308d5658cb1f5eee5998dcbaac7d5bdf7a2ef43c8192ca6e0c843f856ccee26
 F ext/fts5/fts5_test_tok.c 3cb0a9b508b30d17ef025ccddd26ae3dc8ddffbe76c057616e59a9aa85d36f3b
@@ -2169,8 +2169,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P fe9cf68b513d1e8cfcde90f1982a7f4123f54e3ebb004d961a99bdf6bec03a32
-R 65b5b05b740611e1c5fa9d03c6a586df
-U drh
-Z 4a0d1cb7f0b040e5a47482017cdef1be
+P 4966d7a1ce42af8b1c50fdd40e651e80d0eeb8cb62dd882950cab275f98aba88
+R b942099604595f11d845c663da1ef706
+U dan
+Z 13a143275403dfceaee76597c8ba1588
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 07f6f83962491497371221cde4c67c356e104388..f1f1f83ab9945a6fb96ca89d2d91c4846bf2e4e7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4966d7a1ce42af8b1c50fdd40e651e80d0eeb8cb62dd882950cab275f98aba88
+ea29180797aa4bb25180432e75a372277a6f6e2262906a9e765a3bddf8ca79d7