MonetDB: default - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: 116e180ec936 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/116e180ec936
Branch: default
Log Message:

Merge with Jul2021 branch.


diffs (83 lines):

diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -1023,7 +1023,7 @@ canditer_search(const struct canditer *c
                if (p == ci->nvals - 1 && o >= ci->lastbit)
                        return next ? ci->ncand : BUN_NONE;
                if (next || ci->mask[p] & (1U << o))
-                       return count_mask_bits(ci, 0, p) + (o == 0 ? 0 : 
candmask_pop(ci->mask[p] << (32 - o))) + !(ci->mask[p] & (1U << o));
+                       return count_mask_bits(ci, 0, p * 32 + o) + 
!(ci->mask[p] & (1U << o));
                break;
        }
        return BUN_NONE;
diff --git a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py 
b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
--- a/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
+++ b/sql/jdbc/tests/Tests/JDBC_API_Tester.SQL.py
@@ -1,5 +1,4 @@
-import os
-import sys
+import os, sys
 from subprocess import run, PIPE, CalledProcessError
 
 HOST=os.getenv('HOST')
@@ -16,6 +15,8 @@ URL=f"jdbc:monetdb://{HOST}:{MAPIPORT}/{
 cmd = ['java', 'JDBC_API_Tester', URL]
 try:
     p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, encoding='utf-8')
+    sys.stderr.write(p.stdout)
+    sys.stderr.write(p.stderr)
 except CalledProcessError as e:
     raise SystemExit(e.stderr)
 
diff --git a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py 
b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
--- a/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
+++ b/sql/jdbc/tests/Tests/ValidateSystemCatalogTables.SQL.py
@@ -1,4 +1,4 @@
-import os
+import os, sys
 from subprocess import run, PIPE, CalledProcessError
 
 HOST=os.getenv('HOST')
@@ -17,5 +17,7 @@ if __name__ == '__main__':
     cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '-f', 
os.path.join(TSTSRCBASE, TSTDIR, 'Tests/ValidateSystemCatalogTables.sql')]
     try:
         p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, encoding='utf-8')
+        sys.stderr.write(p.stdout)
+        sys.stderr.write(p.stderr)
     except CalledProcessError as e:
         raise SystemExit(e.stderr)
diff --git a/sql/test/SQLancer/Tests/sqlancer14.test 
b/sql/test/SQLancer/Tests/sqlancer14.test
--- a/sql/test/SQLancer/Tests/sqlancer14.test
+++ b/sql/test/SQLancer/Tests/sqlancer14.test
@@ -702,12 +702,12 @@ SELECT t1.c5 FROM t1 WHERE (SELECT 0.0 G
 0.15286948
 
 query T rowsort
-SELECT (SELECT 1 FROM t1) <> ALL(SELECT 2 WHERE FALSE) FROM t1;
+SELECT (SELECT 1 FROM t1) <> ALL(SELECT 2 WHERE FALSE) FROM t1
 ----
 True
 
 query T rowsort
-SELECT (SELECT 1 GROUP BY 3) <> ALL(SELECT 2 WHERE FALSE) FROM t1;
+SELECT (SELECT 1 GROUP BY 3) <> ALL(SELECT 2 WHERE FALSE) FROM t1
 ----
 True
 
diff --git a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py 
b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
--- a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
+++ b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
@@ -1,4 +1,4 @@
-import os
+import os, sys
 from subprocess import run, PIPE, CalledProcessError
 
 HOST=os.getenv('HOST')
@@ -17,5 +17,7 @@ if __name__ == '__main__':
     cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '-f', 
os.path.join(TSTSRCBASE, TSTDIR, 'Tests/ValidateSystemCatalogTables.sql')]
     try:
         p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, encoding='utf-8')
+        sys.stderr.write(p.stdout)
+        sys.stderr.write(p.stderr)
     except CalledProcessError as e:
         raise SystemExit(e.stderr)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list