Use curtran

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

Only use curtran if possible

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

Author: morgando

Diff for: db/sql.h

@@ -1515,6 +1515,11 @@ void add_fingerprint_to_rawstats(struct rawnodestats *stats,
  */
 int clnt_check_bdb_lock_desired(struct sqlclntstate *clnt);
 
+// use when an abort-only transaction is needed.
+// caller should call `puttran` when finished.
+tran_type *gettran_prefer_curtran();
+int puttran(tran_type * const tran);
+
 /**
  * Bdb transaction objects with curtran lockid
  */

Diff for: db/sqlanalyze.c

@@ -784,11 +784,9 @@ int analyze_regular_table(table_descriptor_t *td, struct sqlclntstate *clnt, cha
         goto err;
     }
 
-    int bdberr = 0;
-    trans = bdb_tran_begin(table->handle, NULL, &bdberr);
+    trans = gettran_prefer_curtran();
     if (!trans) {
-        logmsg(LOGMSG_ERROR, "%s: bdb_tran_begin:%s bdberr:%d\n", __func__,
-               table->tablename, bdberr);
+        logmsg(LOGMSG_ERROR, "%s: Could not get tran\n", __func__);
         rc = 1;
         goto err;
     }
@@ -819,11 +817,11 @@ int analyze_regular_table(table_descriptor_t *td, struct sqlclntstate *clnt, cha
             goto err;
         }
     }
-    
-    rc = bdb_tran_commit(table->handle, trans, &bdberr);
+
+    rc = puttran(trans);
     trans = NULL;
     if (rc) {
-        logmsg(LOGMSG_ERROR, "%s: bdb_tran_commit failed rc(%d) bdberr(%d)\n", __func__, rc, bdberr);
+        logmsg(LOGMSG_ERROR, "%s: puttran failed rc(%d)\n", __func__, rc);
         goto err;
     }
 
@@ -851,7 +849,7 @@ int analyze_regular_table(table_descriptor_t *td, struct sqlclntstate *clnt, cha
         unlock_schema_lk();
     }
     if (trans) {
-        bdb_tran_abort(table->handle, trans, &bdberr);
+        puttran(trans);
     }
     if (sampled_table) {
         cleanup_sampled_indicies(clnt);

Diff for: db/sqlglue.c

@@ -11790,6 +11790,34 @@ void curtran_puttran(tran_type *tran)
     bdb_tran_abort(thedb->bdb_env, tran, &bdberr);
 }
 
+tran_type *gettran_prefer_curtran() {
+    tran_type * trans = curtran_gettran();
+    if (trans) { return trans; }
+
+    int bdberr = 0;
+    trans = bdb_tran_begin(thedb->bdb_env, NULL, &bdberr);
+    if (!trans) {
+        logmsg(LOGMSG_ERROR, "%s: bdb_tran_begin failed bdberr(%d)\n", __func__, bdberr);
+    }
+    return trans;
+}
+
+int puttran(tran_type * const tran)
+{
+    if (tran->is_curtran) {
+        curtran_puttran(tran);
+        return 0;
+    }
+
+    int bdberr;
+    int rc = bdb_tran_abort(thedb->bdb_env, tran, &bdberr);
+    if (rc) {
+        logmsg(LOGMSG_ERROR, "%s: bdb_tran_abort failed rc(%d) bdberr(%d)\n", __func__, rc, bdberr);
+        return 1;
+    }
+    return 0;
+}
+
 void clone_temp_table(sqlite3_stmt *stmt, struct temptable *tbl)
 {
     int rc;