Changeset: 121dc55b8c26 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=121dc55b8c26
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Mar2018
Log Message:
Commit each upgrade step.
diffs (truncated from 716 to 300 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -277,6 +277,7 @@ sql_update_hugeint(Client c, mvc *sql)
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
@@ -326,6 +327,7 @@ sql_update_geom(Client c, mvc *sql, int
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
@@ -543,6 +545,7 @@ sql_update_dec2016(Client c, mvc *sql)
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
@@ -591,6 +594,7 @@ sql_update_dec2016_sp2(Client c, mvc *sq
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set
schema \"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
@@ -624,6 +628,7 @@ sql_update_dec2016_sp3(Client c, mvc *sq
"delete from systemfunctions where function_id not in
(select id from functions);\n");
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
@@ -742,6 +747,7 @@ sql_update_jul2017(Client c, mvc *sql)
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
@@ -786,6 +792,7 @@ sql_update_jul2017_sp2(Client c)
"GRANT EXECUTE ON FUNCTION sys.environment() TO
PUBLIC;\n"
"GRANT SELECT ON sys.environment TO PUBLIC;\n"
);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
err = SQLstatementIntern(c, &buf, "update", 1, 0, NULL);
@@ -838,6 +845,7 @@ sql_update_jul2017_sp3(Client c, mvc *sq
"create trigger system_update_tables after update on
sys._tables for each statement call sys_update_tables();\n");
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
err = SQLstatementIntern(c, &buf, "update", 1, 0, NULL);
@@ -879,6 +887,7 @@ sql_update_mar2018_geom(Client c, mvc *s
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
@@ -1353,6 +1362,7 @@ sql_update_mar2018(Client c, mvc *sql)
"ALTER TABLE sys.function_types SET READ
ONLY;\n");
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
printf("Running database upgrade commands:\n%s\n", buf);
err = SQLstatementIntern(c, &buf, "update", 1, 0, NULL);
}
@@ -1387,6 +1397,7 @@ sql_update_mar2018_netcdf(Client c, mvc
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
@@ -1466,6 +1477,7 @@ sql_update_mar2018_samtools(Client c, mv
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+ pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
assert(pos < bufsize);
printf("Running database upgrade commands:\n%s\n", buf);
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -42,6 +42,7 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where name = 'geometry_columns' and
schema_id in (select id from schemas where name = 'sys');
delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
set schema "sys";
+commit;
Running database upgrade commands:
set schema "sys";
@@ -5696,6 +5697,7 @@ set schema "sys";
ALTER TABLE sys.keywords SET READ ONLY;
ALTER TABLE sys.function_types SET READ ONLY;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -5707,6 +5709,7 @@ grant select on sys.netcdf_attrs to publ
grant execute on procedure sys.netcdf_attach(varchar(256)) to public;
grant execute on procedure sys.netcdf_importvar(integer, varchar(256)) to
public;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -5738,6 +5741,7 @@ GRANT EXECUTE ON PROCEDURE bam.bam_drop_
GRANT EXECUTE ON PROCEDURE bam.sam_export(STRING) TO PUBLIC;
GRANT EXECUTE ON PROCEDURE bam.bam_export(STRING) TO PUBLIC;
set schema "sys";
+commit;
# 13:50:24 >
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
@@ -37,6 +37,7 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where name = 'geometry_columns' and
schema_id in (select id from schemas where name = 'sys');
delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
set schema "sys";
+commit;
Running database upgrade commands:
set schema "sys";
@@ -5691,6 +5692,7 @@ set schema "sys";
ALTER TABLE sys.keywords SET READ ONLY;
ALTER TABLE sys.function_types SET READ ONLY;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -5702,6 +5704,7 @@ grant select on sys.netcdf_attrs to publ
grant execute on procedure sys.netcdf_attach(varchar(256)) to public;
grant execute on procedure sys.netcdf_importvar(integer, varchar(256)) to
public;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -5733,6 +5736,7 @@ GRANT EXECUTE ON PROCEDURE bam.bam_drop_
GRANT EXECUTE ON PROCEDURE bam.sam_export(STRING) TO PUBLIC;
GRANT EXECUTE ON PROCEDURE bam.bam_export(STRING) TO PUBLIC;
set schema "sys";
+commit;
# 15:46:26 >
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -42,6 +42,7 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where name = 'geometry_columns' and
schema_id in (select id from schemas where name = 'sys');
delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
set schema "sys";
+commit;
Running database upgrade commands:
set schema "sys";
@@ -4983,6 +4984,7 @@ set schema "sys";
ALTER TABLE sys.keywords SET READ ONLY;
ALTER TABLE sys.function_types SET READ ONLY;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -4994,6 +4996,7 @@ grant select on sys.netcdf_attrs to publ
grant execute on procedure sys.netcdf_attach(varchar(256)) to public;
grant execute on procedure sys.netcdf_importvar(integer, varchar(256)) to
public;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -5025,6 +5028,7 @@ GRANT EXECUTE ON PROCEDURE bam.bam_drop_
GRANT EXECUTE ON PROCEDURE bam.sam_export(STRING) TO PUBLIC;
GRANT EXECUTE ON PROCEDURE bam.bam_export(STRING) TO PUBLIC;
set schema "sys";
+commit;
# 14:06:25 >
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -42,6 +42,7 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where name = 'geometry_columns' and
schema_id in (select id from schemas where name = 'sys');
delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
set schema "sys";
+commit;
Running database upgrade commands:
set schema "sys";
@@ -4983,6 +4984,7 @@ set schema "sys";
ALTER TABLE sys.keywords SET READ ONLY;
ALTER TABLE sys.function_types SET READ ONLY;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -4994,6 +4996,7 @@ grant select on sys.netcdf_attrs to publ
grant execute on procedure sys.netcdf_attach(varchar(256)) to public;
grant execute on procedure sys.netcdf_importvar(integer, varchar(256)) to
public;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -5025,6 +5028,7 @@ GRANT EXECUTE ON PROCEDURE bam.bam_drop_
GRANT EXECUTE ON PROCEDURE bam.sam_export(STRING) TO PUBLIC;
GRANT EXECUTE ON PROCEDURE bam.bam_export(STRING) TO PUBLIC;
set schema "sys";
+commit;
# 15:42:23 >
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5350,6 +5350,7 @@ grant execute on aggregate sys.quantile(
grant execute on aggregate sys.corr(hugeint, hugeint) to public;
grant execute on function json.filter(json, hugeint) to public;
set schema "sys";
+commit;
Running database upgrade commands:
set schema "sys";
@@ -5369,6 +5370,7 @@ GRANT SELECT ON sys.geometry_columns TO
update sys._tables set system = true where name = 'geometry_columns' and
schema_id in (select id from schemas where name = 'sys');
delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
set schema "sys";
+commit;
Running database upgrade commands:
set schema "sys";
@@ -5746,6 +5748,7 @@ set schema "sys";
ALTER TABLE sys.keywords SET READ ONLY;
ALTER TABLE sys.function_types SET READ ONLY;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -5757,6 +5760,7 @@ grant select on sys.netcdf_attrs to publ
grant execute on procedure sys.netcdf_attach(varchar(256)) to public;
grant execute on procedure sys.netcdf_importvar(integer, varchar(256)) to
public;
set schema "sys";
+commit;
Running database upgrade commands:
set schema sys;
@@ -5788,6 +5792,7 @@ GRANT EXECUTE ON PROCEDURE bam.bam_drop_
GRANT EXECUTE ON PROCEDURE bam.sam_export(STRING) TO PUBLIC;
GRANT EXECUTE ON PROCEDURE bam.bam_export(STRING) TO PUBLIC;
set schema "sys";
+commit;
# 16:53:35 >
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -5025,6 +5025,7 @@ GRANT EXECUTE ON PROCEDURE bam.bam_drop_
GRANT EXECUTE ON PROCEDURE bam.sam_export(STRING) TO PUBLIC;
GRANT EXECUTE ON PROCEDURE bam.bam_export(STRING) TO PUBLIC;
set schema "sys";
+commit;
# 14:06:25 >
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5350,6 +5350,7 @@ grant execute on aggregate sys.quantile(
grant execute on aggregate sys.corr(hugeint, hugeint) to public;
grant execute on function json.filter(json, hugeint) to public;
set schema "sys";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
