bump zstd_vfs and improve debug tracing

Author: mlin

CMakeLists.txt

@@ -18,7 +18,7 @@ endif()
 FetchContent_Declare(
     sqlite_zstd_vfs
     GIT_REPOSITORY  https://github.com/mlin/sqlite_zstd_vfs.git
-    GIT_TAG         5b67de8
+    GIT_TAG         dadf93e
 )
 FetchContent_MakeAvailable(sqlite_zstd_vfs)
 include_directories(${sqlite_zstd_vfs_SOURCE_DIR}/src)

src/genomicsqlite.cc

@@ -1132,16 +1132,41 @@ static int register_genomicsqlite_functions(sqlite3 *db, const char **pzErrMsg,
         rc =
             sqlite3_create_function_v2(db, fntab[i].fn, fntab[i].nArg, SQLITE_UTF8 | fntab[i].flags,
                                        nullptr, fntab[i].fp, nullptr, nullptr, nullptr);
-        if (rc != SQLITE_OK)
+        if (rc != SQLITE_OK) {
+            if (pzErrMsg) {
+                *pzErrMsg =
+                    sqlite3_mprintf("Genomics Extension failed to register %s", fntab[i].fn);
+            }
             return rc;
+        }
     }
     rc = RegisterSQLiteVirtualTable<GenomicRangeIndexLevelsTVF>(db, "genomic_range_index_levels");
-    if (rc != SQLITE_OK)
+    if (rc != SQLITE_OK) {
+        if (pzErrMsg) {
+            *pzErrMsg =
+                sqlite3_mprintf("Genomics Extension failed to register genomic_range_index_levels");
+        }
         return rc;
+    }
     rc = RegisterSQLiteVirtualTable<GenomicRangeRowidsTVF>(db, "genomic_range_rowids");
-    if (rc != SQLITE_OK)
+    if (rc != SQLITE_OK) {
+        if (pzErrMsg) {
+            *pzErrMsg =
+                sqlite3_mprintf("Genomics Extension failed to register genomic_range_rowids");
+        }
+        return rc;
+    }
+    // genomicsqliteJson1Register() may return SQLITE_BUSY if JSON1 (possibly another version
+    // thereof) is already loaded, and the extension is being loaded by SELECT load_extension().
+    // That is tolerable.
+    rc = genomicsqliteJson1Register(db);
+    if (rc != SQLITE_OK && rc != SQLITE_BUSY) {
+        if (pzErrMsg) {
+            *pzErrMsg = sqlite3_mprintf("Genomics Extension failed to register JSON1");
+        }
         return rc;
-    return genomicsqliteJson1Register(db);
+    }
+    return SQLITE_OK;
 }
 
 /*
@@ -1156,25 +1181,29 @@ extern "C" int sqlite3_genomicsqlite_init(sqlite3 *db, char **pzErrMsg,
     const string MIN_SQLITE_VERSION = "3.31.0";
     if (sqlite3_libversion_number() < MIN_SQLITE_VERSION_NUMBER) {
         if (pzErrMsg) {
-            string version_msg = "SQLite library version " + string(sqlite3_libversion()) +
-                                 " is older than " + MIN_SQLITE_VERSION +
-                                 " which is required by Genomics Extension " GIT_REVISION;
-            *pzErrMsg = (char *)sqlite3_malloc(version_msg.size() + 1);
-            if (*pzErrMsg) {
-                strcpy(*pzErrMsg, version_msg.c_str());
-            }
+            *pzErrMsg = sqlite3_mprintf(
+                "SQLite library version %s is older than %s required by Genomics Extension %s",
+                sqlite3_libversion(), MIN_SQLITE_VERSION.c_str(), GIT_REVISION);
         }
         return SQLITE_ERROR;
     }
 
     int rc = (new ZstdVFS())->Register("zstd");
-    if (rc != SQLITE_OK)
+    if (rc != SQLITE_OK) {
+        if (pzErrMsg) {
+            *pzErrMsg = sqlite3_mprintf("Genomics Extension failed initializing zstd_vfs");
+        }
         return rc;
-    rc = register_genomicsqlite_functions(db, nullptr, pApi);
+    }
+    rc = register_genomicsqlite_functions(db, (const char **)pzErrMsg, pApi);
     if (rc != SQLITE_OK)
         return rc;
     rc = sqlite3_auto_extension((void (*)(void))register_genomicsqlite_functions);
-    if (rc != SQLITE_OK)
+    if (rc != SQLITE_OK) {
+        if (pzErrMsg) {
+            *pzErrMsg = sqlite3_mprintf("Genomics Extension failed sqlite3_auto_extension");
+        }
         return rc;
+    }
     return SQLITE_OK_LOAD_PERMANENTLY;
 }

test/capi_smoke_test.c

@@ -53,8 +53,22 @@ int main(int argc, char **argv) {
     }
     printf("%s\n", version);
 
-    fprintf(stderr, "create_genomic_range_index_sql()\n");
-    char *sql = create_genomic_range_index_sql("test", "rid", "beg", "end", -1);
+    fprintf(stderr, "put_genomic_reference_assembly_sql() @%d\n", sqlite3_total_changes(pDb));
+    char *sql = put_genomic_reference_assembly_sql("GRCh38_no_alt_analysis_set", 0);
+    if (!sql) {
+        fprintf(stderr, "put_genomic_reference_assembly_sql -> null\n");
+        return 1;
+    }
+    rc = sqlite3_exec(pDb, sql, 0, 0, &zErrMsg);
+    if (rc != SQLITE_OK) {
+        fprintf(stderr,
+                "sqlite3_exec(\"put_genomic_reference_assembly_sql(GRCh38))\") -> %d // %s\n", rc,
+                zErrMsg ? zErrMsg : sqlite3_errstr(rc));
+        return 1;
+    }
+
+    fprintf(stderr, "create_genomic_range_index_sql() @%d\n", sqlite3_total_changes(pDb));
+    sql = create_genomic_range_index_sql("test", "rid", "beg", "end", -1);
     if (!sql) {
         fprintf(stderr, "create_genomic_range_index_sql -> null\n");
         return 1;