From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 10 Sep 2012 19:44:15 +0000 (+0200)
Subject: Tweak previous patch on batch insert
X-Git-Tag: Release-5.2.11~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cb69d5de4026c4d2aaa49059aeff1c76073eca81;p=bacula%2Fbacula

Tweak previous patch on batch insert
---

diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 31e04807e0..09fd90c386 100644
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -891,6 +891,11 @@ bool db_create_batch_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
    Dmsg1(dbglevel, "Fname=%s\n", ar->fname);
    Dmsg0(dbglevel, "put_file_into_catalog\n");
 
+   if (jcr->batch_started && jcr->db_batch->changes > 800000) {
+      db_write_batch_file_records(jcr);
+      jcr->db_batch->changes = 0;
+   }
+
    /* Open the dedicated connexion */
    if (!jcr->batch_started) {
       if (!db_open_batch_connexion(jcr, mdb)) {
@@ -904,17 +909,10 @@ bool db_create_batch_file_attributes_record(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
       }
       jcr->batch_started = true;
    }
-   B_DB *bdb = jcr->db_batch;
 
-   split_path_and_file(jcr, bdb, ar->fname);
-
-   if (bdb->changes > 800000) {
-      db_write_batch_file_records(jcr);
-      bdb->changes = 0;
-      sql_batch_start(jcr, bdb);
-   }
+   split_path_and_file(jcr, jcr->db_batch, ar->fname);
 
-   return sql_batch_insert(jcr, bdb, ar);
+   return sql_batch_insert(jcr, jcr->db_batch, ar);
 }
 
 /**