Changeset: 44ba56fc4197 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44ba56fc4197
Branch: default
Log Message:
Merged with Oct2020
diffs (125 lines):
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -262,7 +262,7 @@ runtimeProfileInit(Client cntxt, MalBlkP
QRYqueue[qhead].mb = mb;
QRYqueue[qhead].tag = qtag++;
QRYqueue[qhead].stk = stk; // for status
pause 'p'/running '0'/ quiting 'q'
- QRYqueue[qhead].finished =
+ QRYqueue[qhead].finished = 0;
QRYqueue[qhead].start = time(0);
q = isaSQLquery(mb);
QRYqueue[qhead].query = q? GDKstrdup(q):0;
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -82,10 +82,14 @@ SYSMONstatistics(Client cntxt, MalBlkPtr
goto bailout;
}
- tsn = timestamp_fromtime(USRstats[i].finished);
- if (is_timestamp_nil(tsn)) {
- msg = createException(MAL, "SYSMONstatistics",
SQLSTATE(22003) "failed to convert finish time");
- goto bailout;
+ if (USRstats[i].finished == 0) {
+ tsn = timestamp_nil;
+ } else {
+ tsn = timestamp_fromtime(USRstats[i].finished);
+ if (is_timestamp_nil(tsn)) {
+ msg = createException(MAL,
"SYSMONstatistics", SQLSTATE(22003) "failed to convert finish time");
+ goto bailout;
+ }
}
if (BUNappend(finished, &tsn, false) != GDK_SUCCEED){
msg = createException(MAL, "SYSMONstatistics",
"Failed to append 'finished'");
@@ -218,10 +222,14 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb,
if (BUNappend(started, &tsn, false) != GDK_SUCCEED)
goto bailout;
- tsn = timestamp_fromtime(QRYqueue[i].finished);
- if (is_timestamp_nil(tsn)) {
- msg = createException(MAL, "SYSMONqueue",
SQLSTATE(22003) "cannot convert time");
- goto bailout;
+ if (QRYqueue[i].finished == 0) {
+ tsn = timestamp_nil;
+ } else {
+ tsn = timestamp_fromtime(QRYqueue[i].finished);
+ if (is_timestamp_nil(tsn)) {
+ msg = createException(MAL,
"SYSMONqueue", SQLSTATE(22003) "cannot convert time");
+ goto bailout;
+ }
}
if (BUNappend(finished, &tsn, false) != GDK_SUCCEED)
goto bailout;
diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.stable.out
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.stable.out
--- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.stable.out
+++ b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.stable.out
@@ -14,7 +14,7 @@ stdout of test 'ValidateSystemCatalogTab
Checking 45 tables/keys in schema sys for Primary Key uniqueness
violations.
Checking 45 columns in schema sys for Primary Key Not Null violations.
Checking 30 tables/keys in schema sys for Unique Constraint violations.
-Checking 96 foreign keys in schema sys for Foreign Key referential
integrity violations.
+Checking 95 foreign keys in schema sys for Foreign Key referential
integrity violations.
Checking 169 columns in schema sys for Not Null violations.
Checking 153 columns in schema sys for Max Character Length violations.
Checking 6 tables/keys in schema tmp for Primary Key uniqueness
violations.
diff --git
a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.stable.out.Windows
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.stable.out.Windows
--- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.stable.out.Windows
+++ b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.stable.out.Windows
@@ -14,7 +14,7 @@ stdout of test 'ValidateSystemCatalogTab
Checking 45 tables/keys in schema sys for Primary Key uniqueness
violations.
Checking 45 columns in schema sys for Primary Key Not Null violations.
Checking 30 tables/keys in schema sys for Unique Constraint violations.
-Checking 96 foreign keys in schema sys for Foreign Key referential
integrity violations.
+Checking 95 foreign keys in schema sys for Foreign Key referential
integrity violations.
Checking 169 columns in schema sys for Not Null violations.
Checking 145 columns in schema sys for Max Character Length violations.
Checking 6 tables/keys in schema tmp for Primary Key uniqueness
violations.
diff --git
a/sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err
b/sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err
---
a/sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err
+++
b/sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err
@@ -5,7 +5,7 @@ stderr of test 'global_table_propagation
# 19:18:33 > "/usr/bin/python3" "global_table_propagation.Bug-6846.py"
"global_table_propagation.Bug-6846"
# 19:18:33 >
-SELECT: no such table 'close_d'
+42S02!SELECT: no such table 'close_d'
# 19:18:34 >
# 19:18:34 > "Done."
diff --git a/sql/test/merge-partitions/Tests/mergepart29.stable.err
b/sql/test/merge-partitions/Tests/mergepart29.stable.err
--- a/sql/test/merge-partitions/Tests/mergepart29.stable.err
+++ b/sql/test/merge-partitions/Tests/mergepart29.stable.err
@@ -5,7 +5,7 @@ stderr of test 'mergepart29` in director
# 10:47:53 > "/usr/bin/python2" "mergepart29.py" "mergepart29"
# 10:47:53 >
-ALTER TABLE: there are values in the column col1 outside the partition range
+M0M29!ALTER TABLE: there are values in the column col1 outside the partition
range
42000!INSERT: cannot insert remote table 'tb2' from this server at the moment
# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/monetdb5/dbfarm/demo
# builtin opt monet_prompt = >
diff --git a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.stable.out
b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.stable.out
--- a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.stable.out
+++ b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.stable.out
@@ -14,7 +14,7 @@ stdout of test 'ValidateSystemCatalogTab
Checking 45 tables/keys in schema sys for Primary Key uniqueness
violations.
Checking 45 columns in schema sys for Primary Key Not Null violations.
Checking 30 tables/keys in schema sys for Unique Constraint violations.
-Checking 96 foreign keys in schema sys for Foreign Key referential
integrity violations.
+Checking 95 foreign keys in schema sys for Foreign Key referential
integrity violations.
Checking 169 columns in schema sys for Not Null violations.
Checking 153 columns in schema sys for Max Character Length violations.
Checking 6 tables/keys in schema tmp for Primary Key uniqueness
violations.
diff --git
a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.stable.out.Windows
b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.stable.out.Windows
--- a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.stable.out.Windows
+++ b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.stable.out.Windows
@@ -14,7 +14,7 @@ stdout of test 'ValidateSystemCatalogTab
Checking 45 tables/keys in schema sys for Primary Key uniqueness
violations.
Checking 45 columns in schema sys for Primary Key Not Null violations.
Checking 30 tables/keys in schema sys for Unique Constraint violations.
-Checking 96 foreign keys in schema sys for Foreign Key referential
integrity violations.
+Checking 95 foreign keys in schema sys for Foreign Key referential
integrity violations.
Checking 169 columns in schema sys for Not Null violations.
Checking 145 columns in schema sys for Max Character Length violations.
Checking 6 tables/keys in schema tmp for Primary Key uniqueness
violations.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
