Changeset: e33f3c268802 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e33f3c268802
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/storage/bat/bat_logger.c
Branch: default
Log Message:
Two fixes: 1. I forgot to project the candidates before applying the update
(this fixes the failing upgrade chain tests I think) 2. Function sys.queue
upgrade had the wrong MAL module in the upgrade
diffs (32 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
@@ -2303,7 +2303,7 @@ sql_update_jun2020(Client c, mvc *sql, c
"\"progress\" int,\n"
"\"workers\" int,\n"
"\"memory\" int)\n"
- " external name sql.sysmon_queue;\n"
+ " external name sysmon.queue;\n"
"grant execute on function sys.queue to public;\n"
"create view sys.queue as select * from sys.queue();\n"
"grant select on sys.queue to public;\n"
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -953,8 +953,15 @@ bl_postversion(void *lg)
return GDK_FAIL;
}
+ BAT *cands_project = BATproject(cands3, func_mod);
+ if (cands_project == NULL) {
+ bat_destroy(func_mod);
+ bat_destroy(cands3);
+ return GDK_FAIL;
+ }
const char *right_module = "aggr"; /* set module to
'aggr' */
- BAT *update_bat = BATconstant(0, TYPE_str,
right_module, 4, TRANSIENT);
+ BAT *update_bat = BATconstant(cands_project->hseqbase,
TYPE_str, right_module, 4, TRANSIENT);
+ bat_destroy(cands_project);
if (update_bat == NULL) {
bat_destroy(func_mod);
bat_destroy(cands3);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
