MonetDB: Nov2019 - Run dumps within a single transaction

[Pedro Ferreira]

Changeset: 68ac21699a84 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68ac21699a84
Modified Files:
        clients/mapiclient/dump.c
        clients/mapiclient/msqldump.c
        sql/test/Tests/comment-dump.stable.out
Branch: Nov2019
Log Message:

Run dumps within a single transaction


diffs (64 lines):

diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -2575,8 +2575,7 @@ dump_database(Mapi mid, stream *toConsol
                goto bailout;
 
        /* start a transaction for the dump */
-       if (!describe)
-               mnstr_printf(toConsole, "%s;\n", start_trx);
+       mnstr_printf(toConsole, "%s;\n", start_trx);
 
        if ((hdl = mapi_query(mid, start_trx)) == NULL || mapi_error(mid))
                goto bailout;
@@ -3095,8 +3094,7 @@ dump_database(Mapi mid, stream *toConsol
        mapi_close_handle(hdl);
 
        /* finally commit the whole transaction */
-       if (!describe)
-               mnstr_printf(toConsole, "COMMIT;\n");
+       mnstr_printf(toConsole, "COMMIT;\n");
        if (sname)
                free(sname);
        if (query)
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -226,11 +226,15 @@ main(int argc, char **argv)
                dump_version(mid, out, "-- server:");
                mnstr_printf(out, "-- %s\n", buf);
        }
-       if (functions)
+       if (functions) {
+               mnstr_printf(out, "START TRANSACTION;\n");
                c = dump_functions(mid, out, true, NULL, NULL, NULL);
-       else if (table)
+               mnstr_printf(out, "COMMIT;\n");
+       } else if (table) {
+               mnstr_printf(out, "START TRANSACTION;\n");
                c = dump_table(mid, NULL, table, out, describe, true, 
useinserts, false);
-       else
+               mnstr_printf(out, "COMMIT;\n");
+       } else
                c = dump_database(mid, out, describe, useinserts);
        mnstr_flush(out);
 
diff --git a/sql/test/Tests/comment-dump.stable.out 
b/sql/test/Tests/comment-dump.stable.out
--- a/sql/test/Tests/comment-dump.stable.out
+++ b/sql/test/Tests/comment-dump.stable.out
@@ -118,6 +118,7 @@ COMMIT;
 # 17:23:05 >  Mtimeout -timeout 60 msqldump -q --host=/var/tmp/mtest-32624 
--port=37130 --database=mTests_sql_test -f
 # 17:23:05 >  
 
+START TRANSACTION;
 SET SCHEMA "foo";
 create function f() returns int begin return 42; end;
 COMMENT ON FUNCTION "foo"."f"() IS '0 parms';
@@ -129,6 +130,7 @@ create function f(i int, j int, k int) r
 create function f(i int, j int, k int, l int) returns int begin return 45; end;
 create procedure g() begin delete from tab where false; end;
 COMMENT ON PROCEDURE "foo"."g"() IS 'proc';
+COMMIT;
 
 # 17:23:05 >  
 # 17:23:05 >  "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list