Changeset: 431d605ac9d5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=431d605ac9d5
Modified Files:
gdk/gdk_join.c
monetdb5/mal/mal_interpreter.c
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (131 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1740,9 +1740,6 @@ mergejoin(BAT **r1p, BAT **r2p, BAT *l,
lwidth = l->twidth;
rwidth = r->twidth;
- /* basic properties will be adjusted if necessary later on,
- * they were initially set by joininitresults() */
-
if (not_in && rci->ncand > 0 && !r->tnonil &&
((BATtvoid(l) && l->tseqbase == oid_nil) ||
(BATtvoid(r) && r->tseqbase == oid_nil) ||
@@ -3558,7 +3555,7 @@ leftjoin(BAT **r1p, BAT **r2p, BAT *l, B
lcnt = canditer_init(&lci, l, sl);
rcnt = canditer_init(&rci, r, sr);
- if (lcnt == 0 || (!only_misses && !nil_on_miss && rcnt == 0)) {
+ if (lcnt == 0 || rcnt == 0) {
TRC_DEBUG(ALGO, "%s(l=" ALGOBATFMT ","
"r=" ALGOBATFMT ",sl=" ALGOOPTBATFMT ","
"sr=" ALGOOPTBATFMT ",nil_matches=%d,"
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -640,6 +640,7 @@ str runMALsequence(Client cntxt, MalBlkP
if (pci->fcn == NULL) {
ret = createException(MAL,"mal.interpreter",
"address of pattern %s.%s missing", pci->modname, pci->fcnname);
} else {
+ TRC_DEBUG(ALGO, "calling %s.%s\n", pci->modname
? pci->modname : "<null>", pci->fcnname ? pci->fcnname : "<null>");
ret = (*pci->fcn)(cntxt, mb, stk, pci);
#ifndef NDEBUG
if (ret == MAL_SUCCEED) {
@@ -667,6 +668,7 @@ str runMALsequence(Client cntxt, MalBlkP
}
break;
case CMDcall:
+ TRC_DEBUG(ALGO, "calling %s.%s\n", pci->modname ?
pci->modname : "<null>", pci->fcnname ? pci->fcnname : "<null>");
ret = malCommandCall(stk, pci);
#ifndef NDEBUG
if (ret == MAL_SUCCEED) {
diff --git a/sql/test/BugTracker-2021/Tests/All
b/sql/test/BugTracker-2021/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/All
@@ -0,0 +1,1 @@
+update-from-count.Bug-7079
diff --git a/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.sql
b/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.sql
@@ -0,0 +1,5 @@
+START TRANSACTION;
+CREATE TABLE testme (a int, b varchar(32));
+insert into testme values (1, 'a'), (2, 'b'), (3, 'c');
+update testme set a = "y".a from testme "y", testme "z";
+ROLLBACK;
diff --git
a/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.stable.err
b/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.stable.err
@@ -0,0 +1,28 @@
+stderr of test 'update-from-count.Bug-7079` in directory
'sql/test/BugTracker-2021` itself:
+
+
+# 10:42:13 >
+# 10:42:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=36380" "--set"
"mapi_usock=/var/tmp/mtest-72939/.s.monetdb.36380" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021"
"--set" "embedded_c=true"
+# 10:42:13 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_listenaddr = all
+# cmdline opt mapi_port = 36380
+# cmdline opt mapi_usock = /var/tmp/mtest-72939/.s.monetdb.36380
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021
+# cmdline opt embedded_c = true
+
+# 10:42:14 >
+# 10:42:14 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-72939" "--port=36380"
+# 10:42:14 >
+
+
+# 10:42:14 >
+# 10:42:14 > "Done."
+# 10:42:14 >
+
diff --git
a/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.stable.out
b/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/update-from-count.Bug-7079.stable.out
@@ -0,0 +1,36 @@
+stdout of test 'update-from-count.Bug-7079` in directory
'sql/test/BugTracker-2021` itself:
+
+
+# 10:42:13 >
+# 10:42:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=36380" "--set"
"mapi_usock=/var/tmp/mtest-72939/.s.monetdb.36380" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021"
"--set" "embedded_c=true"
+# 10:42:13 >
+
+# MonetDB 5 server v11.39.14 (hg id: 6f2834d3a3a1)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2021', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.493 GiB available main-memory of which we use 12.627 GiB
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2021 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://localhost.localdomain:36380/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-72939/.s.monetdb.36380
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+# 10:42:14 >
+# 10:42:14 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-72939" "--port=36380"
+# 10:42:14 >
+
+#START TRANSACTION;
+#CREATE TABLE testme (a int, b varchar(32));
+#insert into testme values (1, 'a'), (2, 'b'), (3, 'c');
+[ 3 ]
+#update testme set a = "y".a from testme "y", testme "z";
+[ 3 ]
+#ROLLBACK;
+
+# 10:42:14 >
+# 10:42:14 > "Done."
+# 10:42:14 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
