Changeset: d33d8b18a8bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d33d8b18a8bf
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.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.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-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.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.int128
Branch: default
Log Message:
Upgrade code for PLAN keyword removal.
diffs (truncated from 388 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
@@ -5145,11 +5145,15 @@ sql_update_default(Client c, mvc *sql, s
BBPreclaim(b);
}
res_table_destroy(output);
+ if (err)
+ return err;
if (sql_bind_func(sql, "sys", "optimizer_stats", NULL, NULL, F_UNION,
true, true)) {
const char query[] = "drop function sys.optimizer_stats
cascade;\n";
printf("Running database upgrade commands:\n%s\n", query);
err = SQLstatementIntern(c, query, "update", true, false, NULL);
+ if (err)
+ return err;
} else {
sql->session->status = 0; /* if the function was not found
clean the error */
sql->errstr[0] = '\0';
@@ -5163,11 +5167,32 @@ sql_update_default(Client c, mvc *sql, s
"drop procedure profiler.setheartbeat cascade;\n";
printf("Running database upgrade commands:\n%s\n", query);
err = SQLstatementIntern(c, query, "update", true, false, NULL);
+ if (err)
+ return err;
} else {
sql->session->status = 0; /* if the function was not found
clean the error */
sql->errstr[0] = '\0';
}
+ if ((err = SQLstatementIntern(c, "select keyword from sys.keywords
where keyword = 'PLAN';\n", "update", true, false, &output)))
+ return err;
+ if ((b = BBPquickdesc(output->cols[0].b)) && BATcount(b) > 0) {
+ const char query[] =
+ "ALTER TABLE sys.keywords SET READ WRITE;\n"
+ "DELETE FROM sys.keywords WHERE keyword = 'PLAN';\n";
+ printf("Running database upgrade commands:\n%s\n", query);
+ fflush(stdout);
+ err = SQLstatementIntern(c, query, "update", true, false, NULL);
+ if (err == MAL_SUCCEED) {
+ const char query2[] = "ALTER TABLE sys.keywords SET
READ ONLY;\n";
+ printf("Running database upgrade commands:\n%s\n",
query2);
+ fflush(stdout);
+ err = SQLstatementIntern(c, query2, "update", true,
false, NULL);
+ }
+ }
+ res_table_destroy(output);
+ output = NULL;
+
return err;
}
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -591,3 +591,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -591,3 +591,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -674,3 +674,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -591,3 +591,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -591,3 +591,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -674,3 +674,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
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
@@ -216,3 +216,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
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
@@ -216,3 +216,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
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
@@ -301,3 +301,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -216,3 +216,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -216,3 +216,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -301,3 +301,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -591,3 +591,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -591,3 +591,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -674,3 +674,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git
a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -591,3 +591,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
@@ -591,3 +591,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
+
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ ONLY;
+
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -674,3 +674,10 @@ drop procedure profiler.setlimit cascade
drop function profiler.getlimit cascade;
drop procedure profiler.setheartbeat cascade;
+Running database upgrade commands:
+ALTER TABLE sys.keywords SET READ WRITE;
+DELETE FROM sys.keywords WHERE keyword = 'PLAN';
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
