Merge pull request #5 from sqlitecloud/os-fix-table-creation-race-condition

fixed race condition when creating table and indexes

Author: c-arriagada

object-storage-interface/initializeObjectsTable.ts

@@ -1,7 +1,9 @@
 import { Database } from "@sqlitecloud/drivers";
 
 // CREATE OBJECTS TABLE
-export const initializeObjectsTable = (db: Database) => {
+export const initializeObjectsTable = (
+  db: Database
+): Promise<{ error: Error | null; message: string }> => {
   const createTableStatement = `
     CREATE TABLE IF NOT EXISTS objects (
       id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 
@@ -16,13 +18,30 @@ export const initializeObjectsTable = (db: Database) => {
     CREATE INDEX IF NOT EXISTS idx_objects_bucket_key ON objects (bucket, key);
     CREATE INDEX IF NOT EXISTS idx_objects_key ON objects (key);
   `;
-  try {
-    db.run(createTableStatement);
-    console.log("Successfully created table or table already exists");
-    db.run(createIndexStatement);
-    console.log("Successfully created index or index already");
-    return { error: null, message: "Successfully created table and index" };
-  } catch (error) {
-    return { error, message: "Error creating table and index" };
-  }
+
+  return new Promise((resolve, reject) => {
+    db.run(createTableStatement, [], (tableError) => {
+      if (tableError) {
+        console.log("Error creating table", tableError);
+        return reject({ error: tableError, message: "Error creating table" });
+      } else {
+        console.log("Successfully created table or table already exists");
+        db.run(createIndexStatement, [], (indexError) => {
+          if (indexError) {
+            console.log("Error creating index", indexError);
+            return reject({
+              error: indexError,
+              message: "Error creating index",
+            });
+          } else {
+            console.log("Successfully created index or index already");
+            return resolve({
+              error: null,
+              message: "Successfully created table and index",
+            });
+          }
+        });
+      }
+    });
+  });
 };

object-storage-interface/main.ts

@@ -208,13 +208,17 @@ class ObjectClient {
 
   constructor(connStr: string) {
     this.db = new Database(connStr);
-    this.init();
   }
 
-  init() {
-    const { error, message } = initializeObjectsTable(this.db);
-    if (error) {
-      throw new Error(message);
+  async init() {
+    try {
+      const { error, message } = await initializeObjectsTable(this.db);
+      if (error) {
+        throw new Error(message);
+      }
+      console.log(message);
+    } catch (err) {
+      console.error(err);
     }
   }
 
@@ -247,6 +251,7 @@ const main = async () => {
     key: "FaceTime_User_Guide.pdf",
   });
 
+  await objectStorage.init()
   const putResponse = await objectStorage.send(putObject);
   console.log(putResponse);
   const getResponse = await objectStorage.send(getObject);

object-storage-interface/package.json

@@ -4,8 +4,7 @@
   "description": "",
   "main": "objWrapper.js",
   "scripts": {
-    "start": "ts-node main.ts",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "ts-node main.ts"
   },
   "keywords": [],
   "author": "",