Del dead fn: run_verify_dbstore_function

Signed-off-by: mdouglas47 <[email protected]>

Author: morgando

db/sql.h

@@ -1082,7 +1082,6 @@ struct sqlclntstate {
     LISTC_T(struct participant) participants;
 
     unsigned disabled_logdel : 1; /* 1 if this clnt disabled logdel using set stmt and has not tried to re-enable it */
-    unsigned verify_dbstore : 1;
     unsigned multiline : 1;
     int tail_offset;
 

db/sqlglue.c

@@ -12866,26 +12866,6 @@ static int run_verify_indexes_query(char *sql, struct schema *sc, Mem *min,
     return rc;
 }
 
-static int run_verify_dbstore_function(char *sql)
-{
-    struct schema_mem sm = {0};
-
-    struct sqlclntstate clnt;
-    start_internal_sql_clnt(&clnt);
-    clnt.dbtran.mode = TRANLEVEL_SOSQL;
-    clnt.sql = sql;
-    clnt.admin = gbl_force_writesql;
-    clnt.schema_mems = &sm;
-    clnt.verify_dbstore = 1;
-
-    int rc = dispatch_sql_query(&clnt);
-    rc = rc ? rc : clnt.had_errors;
-
-    end_internal_sql_clnt(&clnt);
-
-    return rc;
-}
-
 unsigned long long verify_indexes(struct dbtable *db, uint8_t *rec,
                                   blob_buffer_t *blobs, size_t maxblobs,
                                   int is_alter)

db/sqlinterfaces.c

@@ -3364,22 +3364,17 @@ static int get_prepared_stmt_int(struct sqlthdstate *thd,
 int get_prepared_stmt(struct sqlthdstate *thd, struct sqlclntstate *clnt,
                       struct sql_state *rec, struct errstat *err, int flags)
 {
-    /* sc-thread holds schema-lk in verify_dbstore */
-    if (!clnt->verify_dbstore) {
-        curtran_assert_nolocks();
-        if (clnt->dbtran.mode == TRANLEVEL_MODSNAP && !clnt->modsnap_in_progress && populate_modsnap_state(clnt)) {
-            return SQLITE_INTERNAL;
-        }
-        if (gbl_sleep_5s_after_caching_table_versions) {
-            sleep(5);
-        }
-        rdlock_schema_lk();
+    curtran_assert_nolocks();
+    if (clnt->dbtran.mode == TRANLEVEL_MODSNAP && !clnt->modsnap_in_progress && populate_modsnap_state(clnt)) {
+        return SQLITE_INTERNAL;
     }
+    if (gbl_sleep_5s_after_caching_table_versions) {
+        sleep(5);
+    }
+    rdlock_schema_lk();
     int rc = get_prepared_stmt_int(thd, clnt, rec, err,
                                    flags | PREPARE_RECREATE);
-    if (!clnt->verify_dbstore) {
-        unlock_schema_lk();
-    }
+    unlock_schema_lk();
     if (gbl_stable_rootpages_test) {
         static int skip = 0;
         if (!skip) {
@@ -4356,7 +4351,7 @@ static int prepare_engine(struct sqlthdstate *thd, struct sqlclntstate *clnt,
 
     if (!thd->sqldb || (rc == SQLITE_SCHEMA_REMOTE)) {
         /* need to refresh things; we need to grab views lock */
-        if (!got_views_lock && !clnt->verify_dbstore) {
+        if (!got_views_lock) {
             unlock_schema_lk();
 
             if (!clnt->dbtran.cursor_tran) {