Have the session module detect some corrupt changesets earlier.

FossilOrigin-Name: 0de91ff0d798cff21289d893cc441b89fc37b051d5cdf611d92d3ae2bc41cdf2

ext/misc/analyze.c

@@ -1,827 +0,0 @@
-/*
-** 2026-04-13
-**
-** 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.
-**
-******************************************************************************
-**
-** Partial reimplement of the sqlite3_analyzer utility program as
-** loadable SQL function.
-*/
-#include "sqlite3ext.h"
-SQLITE_EXTENSION_INIT1
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <math.h>
-
-/*
-** State information for the analysis
-*/
-typedef struct Analysis Analysis;
-struct Analysis {
-  sqlite3 *db;               /* Database connection */
-  sqlite3_context *context;  /* SQL function context */
-  sqlite3_str *pOut;         /* Write output here */
-  char *zSU;                 /* Name of the temp.space_used table */
-  const char *zSchema;       /* Schema to be analyzed */
-};
-
-/*
-** Free all resources that the Analysis object references and
-** reset the Analysis object.
-**
-** Call this routine multiple times on the same Analysis object
-** is a harmless no-op, as long as the memory for the object itself
-** has not been freed.
-*/
-static void analysisReset(Analysis *p){
-  if( p->zSU ){
-    char *zSql = sqlite3_mprintf("DROP TABLE temp.%s;", p->zSU);
-    if( zSql ){
-      sqlite3_exec(p->db, zSql, 0, 0, 0);
-      sqlite3_free(zSql);
-    }
-  }
-  sqlite3_str_free(p->pOut);
-  sqlite3_free(p->zSU);
-  memset(p, 0, sizeof(*p));
-}
-
-/*
-** Report an error using formatted text.  If zFormat==NULL then report
-** an OOM error.
-*/
-static void analysisError(Analysis *p, const char *zFormat, ...){
-  char *zErr;
-  if( zFormat ){
-    va_list ap;
-    va_start(ap, zFormat);
-    zErr = sqlite3_vmprintf(zFormat, ap);
-    va_end(ap);
-  }else{
-    zErr = 0;
-  }
-  if( zErr==0 ){
-    sqlite3_result_error_nomem(p->context);
-  }else{
-    sqlite3_result_error(p->context, zErr, -1);
-    sqlite3_free(zErr);
-  }
-  analysisReset(p);
-}
-
-/*
-** Prepare and return an SQL statement.
-*/
-static sqlite3_stmt *analysisVPrep(Analysis *p, const char *zFmt, va_list ap){
-  char *zSql;
-  int rc;
-  sqlite3_stmt *pStmt = 0;
-  zSql = sqlite3_vmprintf(zFmt, ap);
-  if( zSql==0 ){ analysisError(p,0); return 0; }
-  rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
-  if( rc ){
-    analysisError(p, "SQL parse error: %s\nOriginal SQL: %s",
-                                 sqlite3_errmsg(p->db), zSql);
-    sqlite3_finalize(pStmt);
-    analysisReset(p);
-    pStmt = 0;
-  }
-  sqlite3_free(zSql);
-  return pStmt;
-}
-static sqlite3_stmt *analysisPrepare(Analysis *p, const char *zFormat, ...){
-  va_list ap;
-  sqlite3_stmt *pStmt = 0;
-  va_start(ap, zFormat);
-  pStmt = analysisVPrep(p,zFormat,ap);
-  va_end(ap);
-  return pStmt;
-}
-
-/*
-** If rc is something other than SQLITE_DONE or SQLITE_OK, then report
-** an error and return true.
-**
-** If rc is SQLITE_DONE or SQLITE_OK, then return false.
-**
-** The prepared statement is closed in either case.
-*/
-static int analysisStmtFinish(Analysis *p, int rc, sqlite3_stmt *pStmt){
-  if( rc==SQLITE_DONE ){
-    rc = SQLITE_OK;
-  }
-  if( rc!=SQLITE_OK || (rc = sqlite3_reset(pStmt))!=SQLITE_OK ){
-    analysisError(p, "SQL run-time error: %s\nOriginal SQL: %s",
-                  sqlite3_errmsg(p->db), sqlite3_sql(pStmt));
-    analysisReset(p);
-  }
-  sqlite3_finalize(pStmt);
-  return rc;
-}
-
-/*
-** Run SQL.  Return the number of errors. 
-*/
-static int analysisSql(Analysis *p, const char *zFormat, ...){
-  va_list ap;
-  int rc;
-  sqlite3_stmt *pStmt = 0;
-  va_start(ap, zFormat);
-  pStmt = analysisVPrep(p,zFormat,ap);
-  va_end(ap);
-  if( pStmt==0 ) return 1;
-  while( (rc = sqlite3_step(pStmt))==SQLITE_ROW ){}
-  if( rc==SQLITE_DONE ){
-    rc = SQLITE_OK;
-  }else{
-    analysisError(p, "SQL run-time error: %s\nOriginal SQL: %s",
-                  sqlite3_errmsg(p->db), sqlite3_sql(pStmt));
-    analysisReset(p);
-  }
-  sqlite3_finalize(pStmt);
-  return rc;
-}
-
-/*
-** Run an SQL query that returns an integer.  Write that integer
-** into *piRes.  Return the number of errors. 
-*/
-static int analysisSqlInt(
-  Analysis *p,
-  sqlite3_int64 *piRes,
-  const char *zFormat, ...
-){
-  va_list ap;
-  int rc;
-  sqlite3_stmt *pStmt = 0;
-  va_start(ap, zFormat);
-  pStmt = analysisVPrep(p,zFormat,ap);
-  va_end(ap);
-  if( pStmt==0 ) return 1;
-  rc = sqlite3_step(pStmt);
-  if( rc==SQLITE_ROW ){
-    *piRes = sqlite3_column_int64(pStmt, 0);
-    rc = SQLITE_OK;
-  }else if( rc==SQLITE_DONE ){
-    rc = SQLITE_OK;
-  }else{
-    if( p->db ){
-      /* p->db is NULL if there was some prior error */
-      analysisError(p, "SQL run-time error: %s\nOriginal SQL: %s",
-                    sqlite3_errmsg(p->db), sqlite3_sql(pStmt));
-    }
-    analysisReset(p);
-  }
-  sqlite3_finalize(pStmt);
-  return rc;
-}
-
-/*
-** Add to the output a title line that contains the text determined
-** by the format string.  If the output is initially empty, begin
-** the title line with "/" so that it forms the beginning of a C-style
-** comment.  Otherwise begin with a new-line.  Always finish with a
-** newline.
-*/
-static void analysisTitle(Analysis *p, const char *zFormat, ...){
-  char *zFirst;
-  char *zTitle;
-  size_t nTitle;
-  va_list ap;
-  va_start(ap, zFormat);
-  zTitle = sqlite3_vmprintf(zFormat, ap);
-  va_end(ap);
-  if( zTitle==0 ){
-    analysisError(p, 0);
-    return;
-  }
-  zFirst = sqlite3_str_length(p->pOut)==0 ? "/" : "\n*";
-  nTitle = strlen(zTitle);
-  if( nTitle>=75 ){
-    sqlite3_str_appendf(p->pOut, "%s** %z\n\n", zFirst, zTitle);
-  }else{
-    int nExtra = 74 - (int)nTitle;
-    sqlite3_str_appendf(p->pOut, "%s** %z %.*c\n\n", zFirst, zTitle,
-                        nExtra, '*');
-  }
-}
-
-/*
-** Add an output line that begins with the zDesc text extended out to
-** 50 columns with "." characters, and followed by whatever text is
-** described by zFormat.
-*/
-static void analysisLine(
-  Analysis *p,             /* Analysis context */
-  const char *zDesc,       /* Description */
-  const char *zFormat,     /* Argument to the description */
-  ...
-){
-  char *zTxt;
-  size_t nDesc;
-  va_list ap;
-  va_start(ap, zFormat);
-  zTxt = sqlite3_vmprintf(zFormat, ap);
-  va_end(ap);
-  if( zTxt==0 ){
-    analysisError(p, 0);
-    return;
-  }
-  nDesc = strlen(zDesc);
-  if( nDesc>=50 ){
-    sqlite3_str_appendf(p->pOut, "%s %z", zDesc, zTxt);
-  }else{
-    int nExtra = 50 - (int)nDesc;
-    sqlite3_str_appendf(p->pOut, "%s%.*c %z", zDesc, nExtra, '.', zTxt);
-  }
-}
-
-/*
-** Write a percentage into the output.  The number written should show
-** two or three significant digits, with the decimal point being the fourth
-** character.  
-*/
-static void analysisPercent(Analysis *p, double r){
-  char zNum[100];
-  char *zDP;
-  int nLeadingDigit;
-  int sz;
-  sqlite3_snprintf(sizeof(zNum)-5, zNum, r>=10.0 ? "%.3g" :"%.2g", r);
-  sz = (int)strlen(zNum);
-  zDP = strchr(zNum, '.');
-  if( zDP==0 ){
-    memcpy(zNum+sz,".0",3);
-    nLeadingDigit = sz;
-    sz += 2;
-  }else{
-    nLeadingDigit = (int)(zDP - zNum);
-  }
-  if( nLeadingDigit<3 ){
-    sqlite3_str_appendchar(p->pOut, 3-nLeadingDigit, ' ');
-  }
-  sqlite3_str_append(p->pOut, zNum, sz);
-  sqlite3_str_append(p->pOut, "%\n", 2);
-}
-
-/*
-** Create a subreport on a subset of tables and/or indexes.
-**
-** The title if the subreport is given by zTitle.  zWhere is
-** a boolean expression that can go in the WHERE clause to select
-** the relevant rows of the s.zSU table.
-*/
-static int analysisSubreport(
-  Analysis *p,                  /* Analysis context */
-  char *zTitle,                 /* Title for this subreport */
-  char *zWhere,                 /* WHERE clause for this subreport */
-  sqlite3_int64 pgsz,           /* Database page size */
-  sqlite3_int64 nPage           /* Number of pages in entire database */
-){
-  sqlite3_stmt *pStmt;          /* Statement to query p->zSU */
-  sqlite3_int64 nentry;         /* Number of btree entires */
-  sqlite3_int64 payload;        /* Payload in bytes */
-  sqlite3_int64 ovfl_payload;   /* overflow payload in bytes */
-  sqlite3_int64 mx_payload;     /* largest individual payload */
-  sqlite3_int64 ovfl_cnt;       /* Number entries using overflow */
-  sqlite3_int64 leaf_pages;     /* Leaf pages */
-  sqlite3_int64 int_pages;      /* internal pages */
-  sqlite3_int64 ovfl_pages;     /* overflow pages */
-  sqlite3_int64 leaf_unused;    /* unused bytes on leaf pages */
-  sqlite3_int64 int_unused;     /* unused bytes on internal pages */
-  sqlite3_int64 ovfl_unused;    /* unused bytes on overflow pages */
-  sqlite3_int64 int_cell;       /* B-tree entries on internal pages */
-  sqlite3_int64 depth;          /* btree depth */
-  sqlite3_int64 cnt;            /* Number of s.zSU entries that match */
-  sqlite3_int64 storage;        /* Total bytes */
-  sqlite3_int64 total_pages;    /* Total page count */
-  sqlite3_int64 total_unused;   /* Total unused bytes */
-  sqlite3_int64 total_meta;     /* Total metadata */
-  int rc;
-
-  if( zTitle==0 || zWhere==0 ){
-    analysisError(p, 0);
-    return SQLITE_NOMEM;
-  }
-  pStmt = analysisPrepare(p,
-    "SELECT\n"
-    "  sum(if(is_without_rowid OR is_index,nentry,leaf_entries)),\n" /* 0 */
-    "  sum(payload),\n"            /* 1 */
-    "  sum(ovfl_payload),\n"       /* 2 */
-    "  max(mx_payload),\n"         /* 3 */
-    "  sum(ovfl_cnt),\n"           /* 4 */
-    "  sum(leaf_pages),\n"         /* 5 */
-    "  sum(int_pages),\n"          /* 6 */
-    "  sum(ovfl_pages),\n"         /* 7 */
-    "  sum(leaf_unused),\n"        /* 8 */
-    "  sum(int_unused),\n"         /* 9 */
-    "  sum(ovfl_unused),\n"        /* 10 */
-    "  max(depth),\n"              /* 11 */
-    "  count(*),\n"                /* 12 */
-    "  sum(int_entries)\n"         /* 13 */
-    " FROM temp.%s WHERE %s",
-    p->zSU, zWhere);
-  if( pStmt==0 ) return 1;
-  rc = sqlite3_step(pStmt);
-  if( rc==SQLITE_ROW ){
-    analysisTitle(p, zTitle);
-
-    nentry = sqlite3_column_int64(pStmt, 0);
-    payload = sqlite3_column_int64(pStmt, 1);
-    ovfl_payload = sqlite3_column_int64(pStmt, 2);
-    mx_payload = sqlite3_column_int64(pStmt, 3);
-    ovfl_cnt = sqlite3_column_int64(pStmt, 4);
-    leaf_pages = sqlite3_column_int64(pStmt, 5);
-    int_pages = sqlite3_column_int64(pStmt, 6);
-    ovfl_pages = sqlite3_column_int64(pStmt, 7);
-    leaf_unused = sqlite3_column_int64(pStmt, 8);
-    int_unused = sqlite3_column_int64(pStmt, 9);
-    ovfl_unused = sqlite3_column_int64(pStmt, 10);
-    depth = sqlite3_column_int64(pStmt, 11);
-    cnt = sqlite3_column_int64(pStmt, 12);
-    int_cell = sqlite3_column_int64(pStmt, 13);
-    rc = SQLITE_DONE;
-
-    total_pages = leaf_pages + int_pages + ovfl_pages;
-    analysisLine(p, "Percentage of total database", "%.3g%%\n",
-                 (total_pages*100.0)/(double)nPage);
-    analysisLine(p, "Number of entries", "%lld\n", nentry);
-    storage = total_pages*pgsz;
-    analysisLine(p, "Bytes of storage consumed", "%lld\n", storage);
-    analysisLine(p, "Bytes of payload", "%-11lld ", payload);
-    analysisPercent(p, payload*100.0/(double)storage);
-    if( ovfl_cnt>0 ){
-      analysisLine(p, "Bytes of payload in overflow","%-11lld ",ovfl_payload);
-      analysisPercent(p, ovfl_payload*100.0/(double)payload);
-    }
-    total_unused = leaf_unused + int_unused + ovfl_unused;
-    total_meta = storage - payload - total_unused;
-    analysisLine(p, "Bytes of metadata","%-11lld ", total_meta);
-    analysisPercent(p, total_meta*100.0/(double)storage);
-    if( cnt==1 ){
-      analysisLine(p, "B-tree depth", "%lld\n", depth);
-      if( int_cell>1 ){
-        analysisLine(p, "Average fanout", "%.1f\n",
-                     (double)(int_cell+int_pages)/(double)int_pages);
-      }
-    }
-    if( nentry>0 ){
-      analysisLine(p, "Average payload per entry", "%.1f\n",
-                   (double)payload/(double)nentry);
-      analysisLine(p, "Average unused bytes per entry", "%.1f\n",
-                   (double)total_unused/(double)nentry);
-      analysisLine(p, "Average metadata per entry", "%.1f\n",
-                   (double)total_meta/(double)nentry);
-    }
-    analysisLine(p, "Maximum single-entry payload", "%lld\n", mx_payload);
-    if( nentry>0 ){
-      analysisLine(p, "Entries that use overflow", "%-11lld ", ovfl_cnt);
-      analysisPercent(p, ovfl_cnt*100.0/(double)nentry);
-    }
-    if( int_pages>0 ){
-      analysisLine(p, "Index pages used", "%lld\n", int_pages);
-    }
-    analysisLine(p, "Primary pages used", "%lld\n", leaf_pages);
-    if( ovfl_cnt ){
-      analysisLine(p, "Overflow pages used", "%lld\n", ovfl_pages);
-    }
-    analysisLine(p, "Total pages used", "%lld\n", total_pages);
-    if( int_pages>0 ){
-      analysisLine(p, "Unused bytes on index pages", "%lld\n", int_unused);
-    }
-    analysisLine(p, "Unused bytes on primary pages", "%lld\n", leaf_unused);
-    if( ovfl_cnt ){
-      analysisLine(p, "Unused bytes on overflow pages", "%lld\n", ovfl_unused);
-    }
-    analysisLine(p, "Unused bytes on all pages", "%-11lld ", total_unused);
-    analysisPercent(p, total_unused*100.0/(double)storage);
-  }
-  return analysisStmtFinish(p, rc, pStmt);
-}
-
-/*
-** SQL Function:   analyze(SCHEMA)
-**
-** Analyze the database schema named in the argument.  Return text
-** containing the analysis.
-*/
-static void analyzeFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  int rc;
-  sqlite3_stmt *pStmt;
-  int n;
-  sqlite3_int64 i64;
-  sqlite3_int64 pgsz;
-  sqlite3_int64 nPage;
-  sqlite3_int64 nPageInUse;
-  sqlite3_int64 nFreeList;
-  sqlite3_int64 nIndex;
-  sqlite3_int64 nWORowid;
-  Analysis s;
-  sqlite3_uint64 r[2];
-
-  memset(&s, 0, sizeof(s));
-  s.db = sqlite3_context_db_handle(context);
-  s.context = context;
-  s.pOut = sqlite3_str_new(0);
-  if( s.pOut==0 ){ analysisError(&s, 0); return; }
-  s.zSchema = (const char*)sqlite3_value_text(argv[0]);
-  if( s.zSchema==0 ){
-    s.zSchema = "main";
-  }else if( sqlite3_strlike("temp",s.zSchema,0)==0 ){
-    /* Attempt to analyze "temp" returns NULL */
-    analysisReset(&s);
-    return;
-  }
-  i64 = 0;
-  rc = analysisSqlInt(&s,&i64,"SELECT 1 FROM pragma_database_list"
-                             " WHERE name=%Q COLLATE nocase",s.zSchema);
-  if( rc || i64==0 ){
-    /* Return NULL the named schema does not exist */
-    analysisReset(&s);
-    return;
-  }
-  sqlite3_randomness(sizeof(r), &r);
-  s.zSU = sqlite3_mprintf("analysis%016llx%016llx", r[0], r[1]);
-  if( s.zSU==0 ){ analysisError(&s, 0); return; }
-
-  /* The s.zSU table contains the data used for the analysis.
-  ** The table name contains 128-bits of randomness to avoid
-  ** collisions with preexisting tables in temp.
-  */
-  rc = analysisSql(&s,
-    "CREATE TABLE temp.%s(\n"
-    "   name text,                -- A table or index\n"
-    "   tblname text,             -- Table that owns name\n"
-    "   is_index boolean,         -- TRUE if it is an index\n"
-    "   is_without_rowid boolean, -- TRUE if WITHOUT ROWID table\n"
-    "   nentry int,               -- Number of entries in the BTree\n"
-    "   leaf_entries int,         -- Number of leaf entries\n"
-    "   depth int,                -- Depth of the b-tree\n"
-    "   payload int,              -- Total data stored in this table/index\n"
-    "   ovfl_payload int,         -- Total data stored on overflow pages\n"
-    "   ovfl_cnt int,             -- Number of entries that use overflow\n"
-    "   mx_payload int,           -- Maximum payload size\n"
-    "   int_pages int,            -- Interior pages used\n"
-    "   leaf_pages int,           -- Leaf pages used\n"
-    "   ovfl_pages int,           -- Overflow pages used\n"
-    "   int_unused int,           -- Unused bytes on interior pages\n"
-    "   leaf_unused int,          -- Unused bytes on primary pages\n"
-    "   ovfl_unused int,          -- Unused bytes on overflow pages\n"
-    "   int_entries int           -- Btree cells on internal pages\n"
-    ");",
-    s.zSU
-  );
-  if( rc ) return;
-
-  /* Populate the s.zSU table
-  */
-  rc = analysisSql(&s,
-    "WITH\n"
-    "  allidx(idxname) AS (\n"
-    "    SELECT name FROM \"%w\".sqlite_schema WHERE type='index'\n"
-    "  ),\n"
-    "  allobj(allname,tblname,isidx,isworowid) AS (\n"
-    "    SELECT 'sqlite_schema',\n"
-    "           'sqlite_schema',\n"
-    "           0,\n"
-    "           0\n"
-    "    UNION ALL\n"
-    "    SELECT name,\n"
-    "           tbl_name,\n"
-    "           type='index',\n"
-    "           EXISTS(SELECT 1\n"
-    "                    FROM pragma_index_list(sqlite_schema.name,%Q)\n"
-    "                   WHERE pragma_index_list.origin='pk'\n"
-    "                     AND pragma_index_list.name NOT IN allidx)\n"
-    "      FROM \"%w\".sqlite_schema\n"
-    "  )\n"
-    "INSERT INTO temp.%s\n"
-    "  SELECT\n"
-    "    allname,\n"
-    "    tblname,\n"
-    "    isidx,\n"
-    "    isworowid,\n"
-    "    sum(ncell),\n"
-    "    sum((pagetype='leaf')*ncell),\n"
-    "    max((length(if(path GLOB '*+*','',path))+3)/4),\n"
-    "    sum(payload),\n"
-    "    sum((pagetype='overflow')*payload),\n"
-    "    sum(path GLOB '*+000000'),\n"
-    "    max(mx_payload),\n"
-    "    sum(pagetype='internal'),\n"
-    "    sum(pagetype='leaf'),\n"
-    "    sum(pagetype='overflow'),\n"
-    "    sum((pagetype='internal')*unused),\n"
-    "    sum((pagetype='leaf')*unused),\n"
-    "    sum((pagetype='overflow')*unused),\n"
-    "    sum(if(pagetype='internal',ncell))\n"
-    "  FROM allobj CROSS JOIN dbstat(%Q) \n"
-    "  WHERE dbstat.name=allobj.allname\n"
-    "  GROUP BY allname;\n",
-    s.zSchema,   /* %w.sqlite_schema -- in allidx */
-    s.zSchema,   /* pragma_index_list(...,%Q) */
-    s.zSchema,   /* %w.sqlite_schema */
-    s.zSU,       /* INTO temp.%s */
-    s.zSchema    /* JOIN dbstat(%Q) */
-  );
-  if( rc ) return;
-
-  /* Begin generating the report */
-  analysisTitle(&s, "Database storage utilization report");
-  pgsz = 0;
-  rc = analysisSqlInt(&s, &pgsz, "PRAGMA \"%w\".page_size", s.zSchema);
-  if( rc ) return;
-  analysisLine(&s, "Page size in bytes","%lld\n",pgsz);
-
-  nPage = 0;
-  rc = analysisSqlInt(&s, &nPage, "PRAGMA \"%w\".page_count", s.zSchema);
-  if( rc ) return;
-  analysisLine(&s, "Pages in the database", "%lld\n", nPage);
-  if( nPage<=0 ) nPage = 1;
-
-  nPageInUse = 0;
-  rc = analysisSqlInt(&s, &nPageInUse, 
-       "SELECT sum(leaf_pages+int_pages+ovfl_pages) FROM temp.%s", s.zSU);
-  if( rc ) return;
-  analysisLine(&s, "Pages that store data", "%-11lld ", nPageInUse);
-  analysisPercent(&s, (nPageInUse*100.0)/(double)nPage);
-
-  nFreeList = 0;
-  rc = analysisSqlInt(&s, &nFreeList, "PRAGMA \"%w\".freelist_count",s.zSchema);
-  if( rc ) return;
-  analysisLine(&s, "Pages on the freelist", "%-11lld ", nFreeList);
-  analysisPercent(&s, (nFreeList*100.0)/(double)nPage);
-
-  i64 = 0;
-  rc = analysisSqlInt(&s, &i64, "PRAGMA \"%w\".auto_vacuum", s.zSchema);
-  if( rc ) return;
-  if( i64==0 || nPage<=1 ){
-    i64 = 0;
-  }else{
-    double rPtrsPerPage = pgsz/5;
-    double rAvPage = (nPage-1.0)/(rPtrsPerPage+1.0);
-    i64 = (sqlite3_int64)ceil(rAvPage);
-  }
-  analysisLine(&s, "Pages of auto-vacuum overhead", "%-11lld ", i64);
-  analysisPercent(&s, (i64*100.0)/(double)nPage);
-
-  i64 = 0;
-  rc = analysisSqlInt(&s, &i64, 
-       "SELECT count(*)+1 FROM \"%w\".sqlite_schema WHERE type='table'",
-       s.zSchema);
-  if( rc ) return;
-  analysisLine(&s, "Number of tables", "%lld\n", i64);
-  nWORowid = 0;
-  rc = analysisSqlInt(&s, &nWORowid,
-       "SELECT count(*) FROM \"%w\".pragma_table_list WHERE wr",
-       s.zSchema);
-  if( rc ) return;
-  if( nWORowid>0 ){
-    analysisLine(&s, "Number of WITHOUT ROWID tables", "%lld\n", nWORowid);
-    analysisLine(&s, "Number of rowid tables", "%lld\n", i64 - nWORowid);
-  }
-  nIndex = 0;
-  rc = analysisSqlInt(&s, &nIndex, 
-       "SELECT count(*) FROM \"%w\".sqlite_schema WHERE type='index'",
-       s.zSchema);
-  if( rc ) return;
-  analysisLine(&s, "Number of indexes", "%lld\n", nIndex);
-  i64 = 0;
-  rc = analysisSqlInt(&s, &i64, 
-       "SELECT count(*) FROM \"%w\".sqlite_schema"
-       " WHERE name GLOB 'sqlite_autoindex_*' AND type='index'",
-       s.zSchema);
-  if( rc ) return;
-  analysisLine(&s, "Number of defined indexes", "%lld\n", nIndex - i64);
-  analysisLine(&s, "Number of implied indexes", "%lld\n", i64);
-  analysisLine(&s, "Size of the database in bytes", "%lld\n", pgsz*nPage);
-  i64 = 0;
-  rc = analysisSqlInt(&s, &i64, 
-       "SELECT sum(payload) FROM temp.%s"
-       " WHERE NOT is_index AND name NOT LIKE 'sqlite_schema'",
-       s.zSU);
-  if( rc ) return;
-  analysisLine(&s, "Bytes of payload", "%-11lld ", i64);
-  analysisPercent(&s, i64*100.0/(double)(pgsz*nPage));
-
-  analysisTitle(&s, "Page counts for all tables with their indexes");
-  pStmt = analysisPrepare(&s,
-    "SELECT upper(tblname),\n"
-    "       sum(int_pages+leaf_pages+ovfl_pages)\n"
-    "  FROM temp.%s\n"
-    " GROUP BY 1\n"
-    " ORDER BY 2 DESC, 1;",
-    s.zSU);
-  if( pStmt==0 ) return;
-  while( (rc = sqlite3_step(pStmt))==SQLITE_ROW ){
-    sqlite3_int64 n = sqlite3_column_int64(pStmt,1);
-    analysisLine(&s, (const char*)sqlite3_column_text(pStmt,0), "%-11lld ", n);
-    analysisPercent(&s, (n*100.0)/(double)nPage);
-  }
-  if( analysisStmtFinish(&s, rc, pStmt) ) return;
-
-  analysisTitle(&s, "Page counts for all tables and indexes separately");
-  pStmt = analysisPrepare(&s,
-    "SELECT upper(name),\n"
-    "       sum(int_pages+leaf_pages+ovfl_pages)\n"
-    "  FROM temp.%s\n"
-    " GROUP BY 1\n"
-    " ORDER BY 2 DESC, 1;",
-    s.zSU);
-  if( pStmt==0 ) return;
-  while( (rc = sqlite3_step(pStmt))==SQLITE_ROW ){
-    sqlite3_int64 n = sqlite3_column_int64(pStmt,1);
-    analysisLine(&s, (const char*)sqlite3_column_text(pStmt,0), "%-11lld ", n);
-    analysisPercent(&s, (n*100.0)/(double)nPage);
-  }
-  if( analysisStmtFinish(&s, rc, pStmt) ) return;
-
-  rc = analysisSubreport(&s, "All tables and indexes", "1", pgsz, nPage);
-  if( rc ) return;
-  rc = analysisSubreport(&s, "All tables", "NOT is_index", pgsz, nPage);
-  if( rc ) return;
-  if( nWORowid>0 ){
-    rc = analysisSubreport(&s, "All WITHOUT ROWID tables", "is_without_rowid",
-                           pgsz, nPage);
-    if( rc ) return;
-    rc = analysisSubreport(&s, "All rowid tables",
-                           "NOT is_without_rowid AND NOT is_index",
-                           pgsz, nPage);
-    if( rc ) return;
-  }
-  rc = analysisSubreport(&s, "All indexes", "is_index", pgsz, nPage);
-  if( rc ) return;
-
-  pStmt = analysisPrepare(&s,
-    "SELECT upper(tblname), tblname, sum(is_index) FROM temp.%s"
-    " GROUP BY 1 ORDER BY 1",
-    s.zSU);
-  if( pStmt==0 ) return;
-  while( (rc = sqlite3_step(pStmt))==SQLITE_ROW ){
-    const char *zUpper = (const char*)sqlite3_column_text(pStmt, 0);
-    const char *zName = (const char*)sqlite3_column_text(pStmt, 1);
-    int nSubIndex = sqlite3_column_int(pStmt, 2);
-    if( nSubIndex==0 ){
-      char *zTitle = sqlite3_mprintf("Table %s", zUpper);
-      char *zWhere = sqlite3_mprintf("name=%Q", zName);
-      rc = analysisSubreport(&s, zTitle, zWhere, pgsz, nPage);
-      sqlite3_free(zTitle);
-      sqlite3_free(zWhere);
-      if( rc ) break;
-    }else{
-      sqlite3_stmt *pS2;
-      char *zTitle = sqlite3_mprintf("Table %s and all its indexes", zUpper);
-      char *zWhere = sqlite3_mprintf("tblname=%Q", zName);
-      rc = analysisSubreport(&s, zTitle, zWhere, pgsz, nPage);
-      sqlite3_free(zTitle);
-      sqlite3_free(zWhere);
-      if( rc ) break;
-      zTitle = sqlite3_mprintf("Table %s w/o any indexes", zUpper);
-      zWhere = sqlite3_mprintf("name=%Q", zName);
-      rc = analysisSubreport(&s, zTitle, zWhere, pgsz, nPage);
-      sqlite3_free(zTitle);
-      sqlite3_free(zWhere);
-      if( rc ) break;
-      if( nSubIndex>1 ){
-        zTitle = sqlite3_mprintf("All indexes of table %s", zUpper);
-        zWhere = sqlite3_mprintf("tblname=%Q AND is_index", zName);
-        rc = analysisSubreport(&s, zTitle, zWhere, pgsz, nPage);
-        sqlite3_free(zTitle);
-        sqlite3_free(zWhere);
-        if( rc ) break;
-      }
-      pS2 = analysisPrepare(&s,
-              "SELECT name, upper(name) FROM temp.%s"
-              " WHERE is_index AND tblname=%Q",
-              s.zSU, zName);
-      if( pS2==0 ){
-        rc = SQLITE_NOMEM;
-        break;
-      }
-      while( (rc = sqlite3_step(pS2))==SQLITE_ROW ){
-        const char *zU = (const char*)sqlite3_column_text(pS2, 1);
-        const char *zN = (const char*)sqlite3_column_text(pS2, 0);
-        zTitle = sqlite3_mprintf("Index %s", zU);
-        zWhere = sqlite3_mprintf("name=%Q", zN);
-        rc = analysisSubreport(&s, zTitle, zWhere, pgsz, nPage);
-        sqlite3_free(zTitle);
-        sqlite3_free(zWhere);
-        if( rc ) break;
-      }
-      rc = analysisStmtFinish(&s, rc, pS2);
-      if( rc ) break;
-    }
-  }
-  if( analysisStmtFinish(&s, rc, pStmt) ) return;
-
-  /* Append SQL statements that will recreate the raw data used for
-  ** the analysis.
-  */
-  analysisTitle(&s, "Raw data used to generate this report");
-  sqlite3_str_appendf(s.pOut,
-    "The following SQL will create a table named \"space_used\" which\n"
-    "contains most of the information used to generate the report above.\n"
-    "*/\n"
-  );
-  sqlite3_str_appendf(s.pOut,
-    "BEGIN;\n"
-    "CREATE TABLE space_used(\n"
-    "   name text,                -- A table or index\n"                /* 0 */
-    "   tblname text,             -- Table that owns name\n"            /* 1 */
-    "   is_index boolean,         -- TRUE if it is an index\n"          /* 2 */
-    "   is_without_rowid boolean, -- TRUE if WITHOUT ROWID table\n"     /* 3 */
-    "   nentry int,               -- Number of entries in the BTree\n"  /* 4 */
-    "   leaf_entries int,         -- Number of leaf entries\n"          /* 5 */
-    "   depth int,                -- Depth of the b-tree\n"             /* 6 */
-    "   payload int,              -- Total data in this table/index\n"  /* 7 */
-    "   ovfl_payload int,         -- Total data on overflow pages\n"    /* 8 */
-    "   ovfl_cnt int,             -- Entries that use overflow\n"       /* 9 */
-    "   mx_payload int,           -- Maximum payload size\n"            /* 10 */
-    "   int_pages int,            -- Interior pages used\n"             /* 11 */
-    "   leaf_pages int,           -- Leaf pages used\n"                 /* 12 */
-    "   ovfl_pages int,           -- Overflow pages used\n"             /* 13 */
-    "   int_unused int,           -- Unused bytes on interior pages\n"  /* 14 */
-    "   leaf_unused int,          -- Unused bytes on primary pages\n"   /* 15 */
-    "   ovfl_unused int,          -- Unused bytes on overflow pages\n"  /* 16 */
-    "   int_entries int           -- B-tree entries on internal pages\n"/* 17 */
-    ");\n"
-    "INSERT INTO space_used VALUES\n"
-  );
-  pStmt = analysisPrepare(&s,
-     "SELECT quote(name), quote(tblname),\n"                        /* 0..1 */
-     "       is_index, is_without_rowid, nentry, leaf_entries,\n"   /* 2..5 */
-     "       depth, payload, ovfl_payload, ovfl_cnt, mx_payload,\n" /* 6..10 */
-     "       int_pages, leaf_pages, ovfl_pages, int_unused,\n"      /* 11..14 */
-     "       leaf_unused, ovfl_unused, int_entries\n"               /* 15..17 */
-     "  FROM temp.%s;",
-     s.zSU);
-  if( pStmt==0 ) return;
-  n = 0;
-  while( (rc = sqlite3_step(pStmt))==SQLITE_ROW ){
-    if( n++ ) sqlite3_str_appendf(s.pOut,",\n");
-    sqlite3_str_appendf(s.pOut,
-      " (%s,%s,%lld,%lld,%lld,%lld,%lld,%lld,%lld,"
-      "%lld,%lld,%lld,%lld,%lld,%lld,%lld,%lld,%lld)",
-      sqlite3_column_text(pStmt, 0),
-      sqlite3_column_text(pStmt, 1),
-      sqlite3_column_int64(pStmt, 2),
-      sqlite3_column_int64(pStmt, 3),
-      sqlite3_column_int64(pStmt, 4),
-      sqlite3_column_int64(pStmt, 5),
-      sqlite3_column_int64(pStmt, 6),
-      sqlite3_column_int64(pStmt, 7),
-      sqlite3_column_int64(pStmt, 8),
-      sqlite3_column_int64(pStmt, 9),
-      sqlite3_column_int64(pStmt, 10),
-      sqlite3_column_int64(pStmt, 11),
-      sqlite3_column_int64(pStmt, 12),
-      sqlite3_column_int64(pStmt, 13),
-      sqlite3_column_int64(pStmt, 14),
-      sqlite3_column_int64(pStmt, 15),
-      sqlite3_column_int64(pStmt, 16),
-      sqlite3_column_int64(pStmt, 17));
-  }
-  if( rc!=SQLITE_DONE ){
-    analysisError(&s, "SQL run-time error: %s\nSQL: %s",
-                  sqlite3_errmsg(s.db), sqlite3_sql(pStmt));
-    sqlite3_finalize(pStmt);
-    return;
-  }
-  sqlite3_str_appendf(s.pOut,";\nCOMMIT;");
-  sqlite3_finalize(pStmt);
-
-  if( sqlite3_str_length(s.pOut) ){
-    sqlite3_result_text(context, sqlite3_str_finish(s.pOut), -1,
-                        sqlite3_free);
-    s.pOut = 0;
-  }
-  analysisReset(&s);
-}
-
-
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int sqlite3_analyze_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, "analyze", 1,
-                   SQLITE_UTF8|SQLITE_INNOCUOUS,
-                   0, analyzeFunc, 0, 0);
-  return rc;
-}

ext/session/sessionC.test

@@ -259,6 +259,18 @@ foreach {tn type C2hex C3hex} {
   } {1 SQLITE_CORRUPT}
 }
 
+#-------------------------------------------------------------------------
+#
+reset_db
+
+set CSD 5402010074000900010000000000000001030441414141
+set CSI 5402010074001200010000000000000001063258585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858585858
+
+do_test 7.0 {
+  sqlite3changegroup grp
+  grp add [db one {SELECT unhex($CSD)}]
+  list [catch { grp add [db one {SELECT unhex($CSI)}] } msg] $msg
+} {1 SQLITE_CORRUPT}
+grp delete
 
 finish_test
-

ext/session/sqlite3session.c

@@ -638,10 +638,11 @@ static int sessionSerialLen(const u8 *a){
   int n;
   assert( a!=0 );
   e = *a;
-  if( e==0 || e==0xFF ) return 1;
-  if( e==SQLITE_NULL ) return 1;
   if( e==SQLITE_INTEGER || e==SQLITE_FLOAT ) return 9;
-  return sessionVarintGet(&a[1], &n) + 1 + n;
+  if( e==SQLITE_TEXT || e==SQLITE_BLOB ){
+    return sessionVarintGet(&a[1], &n) + 1 + n;
+  }
+  return 1;
 }
 
 /*
@@ -3702,9 +3703,11 @@ static int sessionChangesetBufferRecord(
         rc = sessionInputBuffer(pIn, nByte);
       }else if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
         nByte += 8;
+      }else if( eType!=0 && eType!=SQLITE_NULL ){
+        rc = SQLITE_CORRUPT_BKPT;
       }
     }
-    if( (pIn->iNext+nByte)>pIn->nData ){
+    if( rc==SQLITE_OK && (pIn->iNext+nByte)>pIn->nData ){
       rc = SQLITE_CORRUPT_BKPT;
     }
   }

manifest

@@ -1,5 +1,5 @@
-C Add\sa\smissing\sopen_db()\scall\sin\sthe\snew\s".dbstat"\scommand\sof\sthe\sCLI.
-D 2026-04-15T11:58:54.973
+C Have\sthe\ssession\smodule\sdetect\ssome\scorrupt\schangesets\searlier.
+D 2026-04-14T20:17:41.604
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -358,7 +358,6 @@ F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b6
 F ext/jni/src/tests/900-001-fts.test bf0ce17a8d082773450e91f2388f5bbb2dfa316d0b676c313c637a91198090f0
 F ext/misc/README.md 6243cdc4d7eb791c41ef0716f3980b8b5f6aa8c61ff76a3958cbf0031c6ebfa7
 F ext/misc/amatch.c 8d237cc014b3736922c26a76a451050d244aa4980c47c531f368f817b1e77b49
-F ext/misc/analyze.c c329e7fdd23caebbe5362b25a416a7fda7e1524ddba03be12f1d2e4a903caa02
 F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
 F ext/misc/appendvfs.c 9642c7a194a2a25dca7ad3e36af24a0a46d7702168c4ad7e59c9f9b0e16a3824
 F ext/misc/base64.c 1445761667c16356e827fc6418294c869468be934429aaa8315035e76dd58acf
@@ -541,7 +540,7 @@ F ext/session/session8.test 326f3273abf9d5d2d7d559eee8f5994c4ea74a5d935562454605
 F ext/session/session9.test 0c4a8fbe7a5031f50855f020f3408e1f07fd7859f1daa1629eadcec3422072d6
 F ext/session/sessionA.test 1feeab0b8e03527f08f2f1defb442da25480138f
 F ext/session/sessionB.test c4fb7f8a688787111606e123a555f18ee04f65bb9f2a4bb2aa71d55ce4e6d02c
-F ext/session/sessionC.test 2bd42225efdf5f5b1a20f75b672665bcd4f67e2a6d7ddf7420fe7bf523ba41f8
+F ext/session/sessionC.test de98b5e173fd86c79af0d0541534398d2ea75dc0d5d74a00103eb26151b76959
 F ext/session/sessionD.test 470ff917dc849e2eb78142ade63aaabd729d773833cff0ff01bca0eda68a21ce
 F ext/session/sessionE.test b2010949c9d7415306f64e3c2072ddabc4b8250c98478d3c0c4d064bce83111d
 F ext/session/sessionF.test d37ed800881e742c208df443537bf29aa49fd56eac520d0f0c6df3e6320f3401
@@ -572,7 +571,7 @@ F ext/session/sessionrowid.test 85187c2f1b38861a5844868126f69f9ec62223a03449a98a
 F ext/session/sessionsize.test 8fcf4685993c3dbaa46a24183940ab9f5aa9ed0d23e5fb63bfffbdb56134b795
 F ext/session/sessionstat1.test 5e718d5888c0c49bbb33a7a4f816366db85f59f6a4f97544a806421b85dc2dec
 F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
-F ext/session/sqlite3session.c d5c91d5b07d2b8e860f2782ae23f7b44ce929280e00645418ee84a0fd14525b2
+F ext/session/sqlite3session.c 871d8a4574bfc682ca0816efb55c85c5fea048e0becf9367a4b271d6a4474b2f
 F ext/session/sqlite3session.h 063e7bf7be2fff874456f452a224b5b3013b25682d108933b0351c93a1279b9c
 F ext/session/test_session.c 2a02a68b522e2f3d4a64b2a4733af54b0f3e500769aeccd5bcbdd440103db069
 F ext/wasm/GNUmakefile 68c750f173106d9d63f12c1edf1256c6f4bad9894b155da5db64322f4912de4b
@@ -736,7 +735,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576
-F src/shell.c.in 4279e364fd909db808ab8fc46ed06f25e96aaa28726bf6342a9b74bde58bc813
+F src/shell.c.in ed8e5819501faf4c390bb3db13931d3d75b8bff3deb31c952bbba14f4dbe4b16
 F src/sqlite.h.in 39d2e09114d2bdb7afd998f4a469c8f8cd065f8093835a7d0422f260fc78fb4f
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e
@@ -2199,8 +2198,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P fdba76df2b3a5b4d56ba79f80fd8b16d5faebca1fb07a266262be2ea635e6f94
-R 11ac4a0e6010f18fd1adc28138c24819
-U drh
-Z 0f53747329f642cf306c269a12fd15f3
+P 49b3bac482c831f503c7f90c35959e7ea731950e991baba86b2ab95987d2539b
+R 35d9142b282e68f29f0bd8f4e7936fb8
+U dan
+Z 51eb5cc01bfe87f83b8508470bd3b2ff
 # Remove this line to create a well-formed Fossil manifest.

manifest.tags

@@ -1,2 +1,2 @@
-branch analyze-sql-func
-tag analyze-sql-func
+branch corrupt-changeset_fix
+tag corrupt-changeset_fix

manifest.uuid

@@ -1 +1 @@
-a138e44a243466f8679e9652421f8c893a4a1bc0addc86736588d9aee51cf090
+0de91ff0d798cff21289d893cc441b89fc37b051d5cdf611d92d3ae2bc41cdf2

src/shell.c.in

@@ -299,7 +299,6 @@ INCLUDE ../ext/intck/sqlite3intck.h
 INCLUDE ../ext/intck/sqlite3intck.c
 INCLUDE ../ext/misc/stmtrand.c
 INCLUDE ../ext/misc/vfstrace.c
-INCLUDE ../ext/misc/analyze.c
 
 #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
 #define SQLITE_SHELL_HAVE_RECOVER 1
@@ -3956,7 +3955,6 @@ static const char *(azHelp[]) = {
 #if SQLITE_SHELL_HAVE_RECOVER
   ".dbinfo ?DB?             Show status information about the database",
 #endif
-  ".dbstat ?SCHEMA?         Report database space and size stats",
   ".dbtotxt                 Hex dump of the database file",
   ".dump ?OBJECTS?          Render database content as SQL",
   "   Options:",
@@ -4780,7 +4778,6 @@ static void open_db(ShellState *p, int openFlags){
     sqlite3_regexp_init(p->db, 0, 0);
     sqlite3_ieee_init(p->db, 0, 0);
     sqlite3_series_init(p->db, 0, 0);
-    sqlite3_analyze_init(p->db, 0, 0);
 #ifndef SQLITE_SHELL_FIDDLE
     sqlite3_fileio_init(p->db, 0, 0);
     sqlite3_completion_init(p->db, 0, 0);
@@ -9574,44 +9571,13 @@ static int do_meta_command(const char *zLine, ShellState *p){
   if( c=='d' && n>=3 && cli_strncmp(azArg[0], "dbinfo", n)==0 ){
     rc = shell_dbinfo_command(p, nArg, azArg);
   }else
+
+  if( c=='r' && cli_strncmp(azArg[0], "recover", n)==0 ){
+    open_db(p, 0);
+    rc = recoverDatabaseCmd(p, nArg, azArg);
+  }else
 #endif /* SQLITE_SHELL_HAVE_RECOVER */
 
-  if( c=='d' && n==6 && cli_strncmp(azArg[0], "dbstat", n)==0 ){
-    const char *zSchema = 0;
-    int ii;
-    char *zSql;
-    open_db(p, 0);
-    for(ii=1; ii<nArg; ii++){
-      const char *z = azArg[ii];
-      if( z[0]=='-' ){
-        dotCmdError(p, ii, "unknown option", 0);
-        rc = 1;
-        goto meta_command_exit;
-      }
-      if( zSchema ){
-        dotCmdError(p, ii, "unknown argument", 0);
-        rc = 1;
-        goto meta_command_exit;
-      }
-      zSchema = z;
-    }
-    zSql = sqlite3_mprintf("SELECT analyze(%Q)", zSchema);
-    shell_check_oom(zSql);
-    modePush(p);
-    modeChange(p, MODE_BATCH);
-    p->mode.spec.nLineLimit = 0;
-    p->mode.spec.nCharLimit = 0;
-    p->mode.spec.nTitleLimit = 0;
-    shell_exec(p, zSql, 0);
-    modePop(p);
-    sqlite3_free(zSql);
-  }else
-
-  if( c=='d' && n>=3 && cli_strncmp(azArg[0], "dbtotxt", n)==0 ){
-    open_db(p, 0);
-    rc = shell_dbtotxt_command(p, nArg, azArg);
-  }else
-
   if( c=='d' && cli_strncmp(azArg[0], "dump", n)==0 ){
     char *zLike = 0;
     char *zSql;
@@ -9742,6 +9708,11 @@ static int do_meta_command(const char *zLine, ShellState *p){
     }
   }else
 
+  if( c=='d' && n>=3 && cli_strncmp(azArg[0], "dbtotxt", n)==0 ){
+    open_db(p, 0);
+    rc = shell_dbtotxt_command(p, nArg, azArg);
+  }else
+
   if( c=='e' && cli_strncmp(azArg[0], "eqp", n)==0 ){
     if( nArg==2 ){
       if( p->mode.autoEQPtrace ){
@@ -10794,13 +10765,6 @@ static int do_meta_command(const char *zLine, ShellState *p){
   }else
 #endif /* !defined(SQLITE_SHELL_FIDDLE) */
 
-#if SQLITE_SHELL_HAVE_RECOVER
-  if( c=='r' && cli_strncmp(azArg[0], "recover", n)==0 ){
-    open_db(p, 0);
-    rc = recoverDatabaseCmd(p, nArg, azArg);
-  }else
-#endif /* SQLITE_SHELL_HAVE_RECOVER */
-
 #ifndef SQLITE_SHELL_FIDDLE
   if( c=='r' && n>=3 && cli_strncmp(azArg[0], "restore", n)==0 ){
     const char *zSrcFile;