Merge pull request #3256 from cyrusimap/cyrusdb-lock

Cyrusdb lock
cyrusimap · Sep 16, 2024 · 54fc311 · 54fc311
2 parents 61acd6c + 6c5d84c
commit 54fc311
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 8 deletions.
diff --git a/lib/cyrusdb.c b/lib/cyrusdb.c
@@ -335,6 +335,17 @@ EXPORTED int cyrusdb_delete(struct db *db,
     return db->backend->delete_(db->engine, key, keylen, tid, force);
 }
 
+EXPORTED int cyrusdb_lock(struct db *db, struct txn **tid, int flags)
+{
+    if (!db->backend->lock)
+        return CYRUSDB_NOTIMPLEMENTED;
+#ifdef DEBUGDB
+    syslog(LOG_NOTICE, "DEBUGDB lock(%llx, %d)\n", (long long unsigned)db->engine, flags);
+#endif
+    return db->backend->lock(db->engine, tid, flags);
+
+}
+
 EXPORTED int cyrusdb_commit(struct db *db, struct txn *tid)
 {
     if (!db->backend->commit)

diff --git a/lib/cyrusdb.h b/lib/cyrusdb.h
@@ -211,6 +211,9 @@ struct cyrusdb_backend {
                    struct txn **tid,
                    int force); /* 1 = ignore not found errors */
 
+    /* start a transaction (shared if flags & CYRUSDB_SHARED) */
+    int (*lock)(struct dbengine *db, struct txn **tid, int flags);
+
     /* Commit the transaction.  When commit() returns, the tid will no longer
      * be valid, regardless of if the commit succeeded or failed */
     int (*commit)(struct dbengine *db, struct txn *tid);
@@ -289,6 +292,7 @@ extern int cyrusdb_store(struct db *db,
 extern int cyrusdb_delete(struct db *db,
                           const char *key, size_t keylen,
                           struct txn **tid, int force);
+extern int cyrusdb_lock(struct db *db, struct txn **tid, int flags);
 extern int cyrusdb_commit(struct db *db, struct txn *tid);
 extern int cyrusdb_abort(struct db *db, struct txn *tid);
 extern int cyrusdb_dump(struct db *db, int detail);

diff --git a/lib/cyrusdb_flat.c b/lib/cyrusdb_flat.c
@@ -863,6 +863,7 @@ EXPORTED struct cyrusdb_backend cyrusdb_flat =
     &store,
     &delete,
 
+    NULL, /* lock */
     &commit_txn,
     &abort_txn,
 

diff --git a/lib/cyrusdb_quotalegacy.c b/lib/cyrusdb_quotalegacy.c
@@ -923,6 +923,7 @@ HIDDEN struct cyrusdb_backend cyrusdb_quotalegacy =
     &store,
     &delete,
 
+    NULL, /* lock */
     &commit_txn,
     &abort_txn,
 

diff --git a/lib/cyrusdb_skiplist.c b/lib/cyrusdb_skiplist.c
@@ -848,6 +848,11 @@ static int compare_signed(const char *s1, int l1, const char *s2, int l2)
     return 0;
 }
 
+static int mylock(struct dbengine *db, struct txn **mytid, int flags __attribute__((unused)))
+{
+    return lock_or_refresh(db, mytid);
+}
+
 static int myopen(const char *fname, int flags, struct dbengine **ret, struct txn **mytid)
 {
     struct dbengine *db;
@@ -1001,7 +1006,10 @@ static int myopen(const char *fname, int flags, struct dbengine **ret, struct tx
     list_ent->refcount = 1;
     open_db = list_ent;
 
-    return mytid ? lock_or_refresh(db, mytid) : 0;
+    if (mytid)
+        return mylock(db, mytid, /*flags*/0);
+
+    return 0;
 }
 
 static int myclose(struct dbengine *db)
@@ -2486,6 +2494,7 @@ EXPORTED struct cyrusdb_backend cyrusdb_skiplist =
     &store,
     &mydelete,
 
+    &mylock,
     &mycommit,
     &myabort,
 

diff --git a/lib/cyrusdb_sql.c b/lib/cyrusdb_sql.c
@@ -941,6 +941,7 @@ HIDDEN struct cyrusdb_backend cyrusdb_sql =
     &store,
     &delete,
 
+    NULL, /* lock */
     &commit_txn,
     &abort_txn,
 

diff --git a/lib/cyrusdb_twoskip.c b/lib/cyrusdb_twoskip.c
@@ -1341,6 +1341,11 @@ static void dispose_db(struct dbengine *db)
 
 /************************************************************/
 
+static int mylock(struct dbengine *db, struct txn **mytid, int flags)
+{
+    return newtxn(db, flags & CYRUSDB_SHARED, mytid);
+}
+
 static int opendb(const char *fname, int flags, struct dbengine **ret, struct txn **mytid)
 {
     struct dbengine *db;
@@ -1451,7 +1456,7 @@ static int opendb(const char *fname, int flags, struct dbengine **ret, struct tx
     unlock(db);
 
     if (mytid) {
-        r = newtxn(db, flags & CYRUSDB_SHARED, mytid);
+        r = mylock(db, mytid, flags);
         if (r) goto done;
     }
 
@@ -2616,6 +2621,7 @@ HIDDEN struct cyrusdb_backend cyrusdb_twoskip =
     &store,
     &delete,
 
+    &mylock,
     &mycommit,
     &myabort,
 

diff --git a/lib/cyrusdb_zeroskip.c b/lib/cyrusdb_zeroskip.c
@@ -148,6 +148,19 @@ HIDDEN int cyrusdb_zeroskip_unlink(const char *fname __attribute__((unused)),
     return CYRUSDB_OK;
 }
 
+HIDDEN int cyrusdb_zeroskip_lock(struct dbengine *dbe, struct txn **mytid,
+                                 int flags __attribute__((unused)))
+{
+    struct txn *tid = xmalloc(sizeof(struct txn));
+    int r = zsdb_transaction_begin(dbe->db, &tid->t);
+    if (r != ZS_OK) {
+        free(tid);
+        return CYRUSDB_INTERNAL;
+    }
+    *mytid = tid;
+    return 0;
+}
+
 static int cyrusdb_zeroskip_open(const char *fname,
                                  int flags,
                                  struct dbengine **ret,
@@ -185,12 +198,8 @@ static int cyrusdb_zeroskip_open(const char *fname,
     *ret = dbe;
 
     if (mytid) {
-        *mytid = xmalloc(sizeof(struct txn));
-        r = zsdb_transaction_begin(dbe->db, &(*mytid)->t);
-        if (r != ZS_OK) {
-            r = CYRUSDB_INTERNAL;
-            goto close_db;
-        }
+        r = cyrusdb_zeroskip_lock(dbe, mytid, flags);
+        if (r) goto close_db;
     }
 
     r = CYRUSDB_OK;
@@ -593,6 +602,7 @@ HIDDEN struct cyrusdb_backend cyrusdb_zeroskip =
     &cyrusdb_zeroskip_store,
     &cyrusdb_zeroskip_delete,
 
+    &cyrusdb_zeroskip_lock,
     &cyrusdb_zeroskip_commit,
     &cyrusdb_zeroskip_abort,