From 6724c317c7c4c06cca9605b17a59a611ba810940 Mon Sep 17 00:00:00 2001
From: Zardosht Kasheff <zardosht@tokutek.com>
Date: Wed, 17 Apr 2013 00:00:48 -0400
Subject: [PATCH] [t:5029], revert fix, solution does not work

git-svn-id: file:///svn/toku/tokudb@44346 c7de825b-a66e-492c-adef-691d508d4ae1
---
 src/loader.c | 44 +++++++++-----------------------------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/src/loader.c b/src/loader.c
index 37a006083aa..a251b126a98 100644
--- a/src/loader.c
+++ b/src/loader.c
@@ -197,15 +197,8 @@ int toku_loader_create_loader(DB_ENV *env,
     XCALLOC(loader);       // init to all zeroes (thus initializing the error_callback and poll_func)
     XCALLOC(loader->i);    // init to all zeroes (thus initializing all pointers to NULL)
 
-    DB_TXN* child_txn = NULL;
-    int using_txns = env->i->open_flags & DB_INIT_TXN;
-    if (using_txns) {
-        int r = env->txn_begin(env, txn, &child_txn, 0);
-        assert_zero(r);
-    }
-
     loader->i->env                = env;
-    loader->i->txn                = child_txn;
+    loader->i->txn                = txn;
     loader->i->N                  = N;
     loader->i->dbs                = dbs;
     loader->i->src_db             = src_db;
@@ -235,7 +228,7 @@ int toku_loader_create_loader(DB_ENV *env,
     // lock tables and check empty
     for(int i=0;i<N;i++) {
         if (!(loader_flags&DB_PRELOCKED_WRITE)) {
-            r = toku_db_pre_acquire_table_lock(dbs[i], child_txn);
+            r = toku_db_pre_acquire_table_lock(dbs[i], txn);
             if (r!=0) break;
         }
         r = !toku_ft_is_empty_fast(dbs[i]->i->ft_handle);
@@ -261,14 +254,14 @@ int toku_loader_create_loader(DB_ENV *env,
         loader->i->ekeys = NULL;
         loader->i->evals = NULL;
         LSN load_lsn;
-        r = locked_load_inames(env, child_txn, N, dbs, new_inames_in_env, &load_lsn, use_ft_loader);
+        r = locked_load_inames(env, txn, N, dbs, new_inames_in_env, &load_lsn, use_ft_loader);
         if ( r!=0 ) {
             toku_free(new_inames_in_env);
             toku_free(brts);
             rval = r;
             goto create_exit;
         }
-        TOKUTXN ttxn = child_txn ? db_txn_struct_i(child_txn)->tokutxn : NULL;
+        TOKUTXN ttxn = txn ? db_txn_struct_i(txn)->tokutxn : NULL;
         r = toku_ft_loader_open(&loader->i->ft_loader,
                                  loader->i->env->i->cachetable,
                                  loader->i->env->i->generate_row_for_put,
@@ -299,7 +292,7 @@ int toku_loader_create_loader(DB_ENV *env,
             for (int i=0; i<N; i++) {
                 loader->i->ekeys[i].flags = DB_DBT_REALLOC;
                 loader->i->evals[i].flags = DB_DBT_REALLOC;
-                toku_ft_suppress_recovery_logs(dbs[i]->i->ft_handle, db_txn_struct_i(child_txn)->tokutxn);
+                toku_ft_suppress_recovery_logs(dbs[i]->i->ft_handle, db_txn_struct_i(txn)->tokutxn);
             }
             loader->i->ft_loader = NULL;
             // close the ft_loader and skip to the redirection
@@ -318,9 +311,6 @@ int toku_loader_create_loader(DB_ENV *env,
     }
     else {
         (void) __sync_fetch_and_add(&STATUS_VALUE(LOADER_CREATE_FAIL), 1);
-        if (child_txn) {
-            child_txn->abort(child_txn);
-        }
         free_loader(loader);
     }
     return rval;
@@ -407,7 +397,6 @@ int toku_loader_close(DB_LOADER *loader)
 {
     (void) __sync_fetch_and_sub(&STATUS_VALUE(LOADER_CURRENT), 1);
     int r=0;
-    DB_TXN* txn = loader->i->txn;
     if ( loader->i->err_errno != 0 ) {
         if ( loader->i->error_callback != NULL ) {
             loader->i->error_callback(loader->i->dbs[loader->i->err_i], loader->i->err_i, loader->i->err_errno, &loader->i->err_key, &loader->i->err_val, loader->i->error_extra);
@@ -424,21 +413,11 @@ int toku_loader_close(DB_LOADER *loader)
             r = ft_loader_close_and_redirect(loader);
         }
     }
-    if (r==0) {
-        if (txn) {
-            int rr = txn->commit(txn, 0);
-            assert_zero(rr);
-        }
-        (void) __sync_fetch_and_add(&STATUS_VALUE(LOADER_CLOSE), 1);
-    }
-    else {
-        if (txn) {
-            int rr = txn->abort(txn);
-            assert_zero(rr);
-        }
-        (void) __sync_fetch_and_add(&STATUS_VALUE(LOADER_CLOSE_FAIL), 1);
-    }
     free_loader(loader);
+    if (r==0)
+        (void) __sync_fetch_and_add(&STATUS_VALUE(LOADER_CLOSE), 1);
+    else
+        (void) __sync_fetch_and_add(&STATUS_VALUE(LOADER_CLOSE_FAIL), 1);
     return r;
 }
 
@@ -447,7 +426,6 @@ int toku_loader_abort(DB_LOADER *loader)
     (void) __sync_fetch_and_sub(&STATUS_VALUE(LOADER_CURRENT), 1);
     (void) __sync_fetch_and_add(&STATUS_VALUE(LOADER_ABORT), 1);
     int r=0;
-    DB_TXN* txn = loader->i->txn;
     if ( loader->i->err_errno != 0 ) {
         if ( loader->i->error_callback != NULL ) {
             loader->i->error_callback(loader->i->dbs[loader->i->err_i], loader->i->err_i, loader->i->err_errno, &loader->i->err_key, &loader->i->err_val, loader->i->error_extra);
@@ -457,10 +435,6 @@ int toku_loader_abort(DB_LOADER *loader)
     if (!(loader->i->loader_flags & LOADER_USE_PUTS) ) {
         r = toku_ft_loader_abort(loader->i->ft_loader, TRUE);
     }
-    if (txn) {
-        int rr = txn->abort(txn);
-        assert_zero(rr);
-    }
     free_loader(loader);
     return r;
 }