Changeset: 0ee0594c2735 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ee0594c2735
Added Files:
sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.sql
sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.err
sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.out
Modified Files:
gdk/gdk_search.c
sql/test/BugTracker-2015/Tests/All
Branch: Jul2015
Log Message:
fixed bug in mergejoin
diffs (130 lines):
diff --git a/gdk/gdk_search.c b/gdk/gdk_search.c
--- a/gdk/gdk_search.c
+++ b/gdk/gdk_search.c
@@ -505,7 +505,7 @@ BAThash(BAT *b, BUN masksize)
}
break;
}
- if ((BBP_status(b->batCacheid) & BBPEXISTING) &&
+ if (0 && (BBP_status(b->batCacheid) & BBPEXISTING) &&
b->batInserted == b->batCount &&
HEAPsave(hp, nme, ext) == GDK_SUCCEED &&
(fd = GDKfdlocate(hp->farmid, nme, "rb+", ext)) >= 0) {
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -37,3 +37,4 @@ true_or_predicate.Bug-3733
crash.Bug-3736
div_zero.Bug-3742
cast_to_num.Bug-3744
+mergejoin_NULL.Bug-3747
diff --git a/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.sql
b/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.sql
@@ -0,0 +1,7 @@
+create table foo (a string, b int);
+create table bar (a string, b int);
+insert into foo values ('hi',0),('there',null),('monet',1);
+insert into bar values ('sup',0),('dude',1);
+select foo.a,foo.b,bar.b,bar.a from foo join bar on foo.b=bar.b;
+drop table foo;
+drop table bar;
diff --git a/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.err
b/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'mergejoin_NULL.Bug-3747` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 20:38:15 >
+# 20:38:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35242" "--set"
"mapi_usock=/var/tmp/mtest-23020/.s.monetdb.35242" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 20:38:15 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35242
+# cmdline opt mapi_usock = /var/tmp/mtest-23020/.s.monetdb.35242
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 20:38:15 >
+# 20:38:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23020" "--port=35242"
+# 20:38:15 >
+
+
+# 20:38:15 >
+# 20:38:15 > "Done."
+# 20:38:15 >
+
diff --git a/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.out
b/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/mergejoin_NULL.Bug-3747.stable.out
@@ -0,0 +1,51 @@
+stdout of test 'mergejoin_NULL.Bug-3747` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 20:38:15 >
+# 20:38:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35242" "--set"
"mapi_usock=/var/tmp/mtest-23020/.s.monetdb.35242" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 20:38:15 >
+
+# MonetDB 5 server v11.21.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:35242/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23020/.s.monetdb.35242
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.30'
+# Finished reading the write-ahead log 'sql_logs/sql/log.30'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 20:38:15 >
+# 20:38:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23020" "--port=35242"
+# 20:38:15 >
+
+#create table foo (a string, b int);
+#create table bar (a string, b int);
+#insert into foo values ('hi',0),('there',null),('monet',1);
+[ 3 ]
+#insert into bar values ('sup',0),('dude',1);
+[ 2 ]
+#select foo.a,foo.b,bar.b,bar.a from foo join bar on foo.b=bar.b;
+% sys.foo, sys.foo, sys.bar, sys.bar # table_name
+% a, b, b, a # name
+% clob, int, int, clob # type
+% 5, 1, 1, 4 # length
+[ "hi", 0, 0, "sup" ]
+[ "monet", 1, 1, "dude" ]
+#drop table foo;
+#drop table bar;
+
+# 20:38:15 >
+# 20:38:15 > "Done."
+# 20:38:15 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
