Changeset: 58e8ec601d99 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=58e8ec601d99
Added Files:
sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.sql
sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.err
sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.out
sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.sql
sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.stable.err
sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.stable.out
sql/test/BugTracker-2016/Tests/select-in-from.Bug-6119.sql
sql/test/BugTracker-2016/Tests/select-in-from.Bug-6119.stable.err
sql/test/BugTracker-2016/Tests/select-in-from.Bug-6119.stable.out
sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.sql
sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.err
sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.out
Modified Files:
configure.ag
gdk/gdk_calc_compare.h
monetdb5/extras/rapi/Tests/rapi02.stable.out
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
sql/test/BugTracker-2016/Tests/All
Branch: default
Log Message:
Merge.
diffs (truncated from 1002 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2478,7 +2478,7 @@ AS_CASE([$enable_int128],
why_have_hge='(128-bit integer support disabled)'])
AM_CONDITIONAL([HAVE_HGE], [test "x$have_hge" = xyes])
-AC_CHECK_TYPES([ptrdiff_t])
+AC_CHECK_TYPES([ptrdiff_t],,,[@%:@include <stddef.h>])
AC_CHECK_TYPES([intptr_t])
AC_CHECK_TYPES([uintptr_t])
@@ -2489,8 +2489,8 @@ AC_CHECK_SIZEOF([long])
AC_CHECK_SIZEOF([void *])
AC_CHECK_SIZEOF([size_t])
AC_CHECK_SIZEOF([ssize_t])
-AC_CHECK_SIZEOF([ptrdiff_t])
-AC_CHECK_SIZEOF([wchar_t])
+AC_CHECK_SIZEOF([ptrdiff_t],,[@%:@include <stddef.h>])
+AC_CHECK_SIZEOF([wchar_t],,[@%:@include <stddef.h>])
AC_CHECK_SIZEOF([long long])
AC_CHECK_SIZEOF([__int64])
AC_CHECK_SIZEOF([__int128])
diff --git a/gdk/gdk_calc_compare.h b/gdk/gdk_calc_compare.h
--- a/gdk/gdk_calc_compare.h
+++ b/gdk/gdk_calc_compare.h
@@ -599,10 +599,10 @@ BATcalcop(BAT *b1, BAT *b2, BAT *s)
return BATconstant(b1->hseqbase, TYPE_TPE, &res, cnt,
TRANSIENT);
}
- bn = BATcalcop_intern(b1->ttype == TYPE_void ? (void *) &b1->tseqbase :
(void *) Tloc(b1, 0), ATOMbasetype(b1->ttype), 1,
+ bn = BATcalcop_intern(b1->ttype == TYPE_void ? (void *) &b1->tseqbase :
(void *) Tloc(b1, 0), ATOMtype(b1->ttype) == TYPE_oid ? b1->ttype :
ATOMbasetype(b1->ttype), 1,
b1->tvheap ? b1->tvheap->base : NULL,
b1->twidth,
- b2->ttype == TYPE_void ? (void *) &b2->tseqbase :
(void *) Tloc(b2, 0), ATOMbasetype(b2->ttype), 1,
+ b2->ttype == TYPE_void ? (void *) &b2->tseqbase :
(void *) Tloc(b2, 0), ATOMtype(b2->ttype) == TYPE_oid ? b2->ttype :
ATOMbasetype(b2->ttype), 1,
b2->tvheap ? b2->tvheap->base : NULL,
b2->twidth,
cnt, start, end, cand, candend, b1->hseqbase,
diff --git a/monetdb5/modules/kernel/aggr.mal b/monetdb5/modules/kernel/aggr.mal
--- a/monetdb5/modules/kernel/aggr.mal
+++ b/monetdb5/modules/kernel/aggr.mal
@@ -886,7 +886,7 @@ address AGGRquantile3
comment "Grouped quantile aggregate";
function quantile(b:bat[:any_1],q:bat[:dbl]) :any_1;
- bn := subquantile(b, q, false);
+ bn := subquantile(b, q, true);
return algebra.fetch(bn, 0@0);
end aggr.quantile;
diff --git a/monetdb5/modules/kernel/aggr.mal.sh
b/monetdb5/modules/kernel/aggr.mal.sh
--- a/monetdb5/modules/kernel/aggr.mal.sh
+++ b/monetdb5/modules/kernel/aggr.mal.sh
@@ -242,7 +242,7 @@ address AGGRquantile3
comment "Grouped quantile aggregate";
function quantile(b:bat[:any_1],q:bat[:dbl]) :any_1;
- bn := subquantile(b, q, false);
+ bn := subquantile(b, q, true);
return algebra.fetch(bn, 0@0);
end aggr.quantile;
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -61,3 +61,11 @@ assert-on-push-project-up.Bug-6077
assert-on-project.Bug-6078
crash.Bug-6081
merge-table-edit.Bug-6084
+dce.Bug-6114
+dce2.Bug-6115
+semijoin.Bug-6116
+split_project.Bug-6117
+case-column-when-null-Bug-6124
+select-in-from.Bug-6119
+select-in-from.Bug-6121
+nested-subquery-in-select.Bug-6125
diff --git a/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.sql
b/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.sql
@@ -0,0 +1,14 @@
+CREATE TABLE table_two (this_column INTEGER);
+INSERT INTO table_two VALUES (1);
+INSERT INTO table_two VALUES (2);
+INSERT INTO table_two VALUES (null);
+SELECT * FROM table_two;
+
+SELECT this_column, (CASE WHEN this_column IS NULL THEN 0 ELSE 1 END) AS
new_column FROM table_two;
+-- correct output
+
+SELECT this_column, (CASE this_column WHEN NULL THEN 0 ELSE 1 END) AS
new_column FROM table_two;
+-- incorrect output for the NULL case
+
+DROP TABLE table_two;
+
diff --git
a/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.err
b/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'case-column-when-null-Bug-6124` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 15:30:36 >
+# 15:30:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39292" "--set"
"mapi_usock=/var/tmp/mtest-27488/.s.monetdb.39292" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 15:30:36 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/dinther/INSTALL/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 = 39292
+# cmdline opt mapi_usock = /var/tmp/mtest-27488/.s.monetdb.39292
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 15:30:37 >
+# 15:30:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27488" "--port=39292"
+# 15:30:37 >
+
+
+# 15:30:37 >
+# 15:30:37 > "Done."
+# 15:30:37 >
+
diff --git
a/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.out
b/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.out
@@ -0,0 +1,104 @@
+stdout of test 'case-column-when-null-Bug-6124` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 15:30:36 >
+# 15:30:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39292" "--set"
"mapi_usock=/var/tmp/mtest-27488/.s.monetdb.39292" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 15:30:36 >
+
+# MonetDB 5 server v11.23.14
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://toulouse.da.cwi.nl:39292/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27488/.s.monetdb.39292
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 15:30:37 >
+# 15:30:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27488" "--port=39292"
+# 15:30:37 >
+
+#CREATE TABLE table_two (this_column INTEGER);
+#INSERT INTO table_two VALUES (1);
+[ 1 ]
+#INSERT INTO table_two VALUES (2);
+[ 1 ]
+#INSERT INTO table_two VALUES (null);
+[ 1 ]
+#SELECT * FROM table_two;
+% sys.table_two # table_name
+% this_column # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 2 ]
+[ NULL ]
+#SELECT this_column, (CASE WHEN this_column IS NULL THEN 0 ELSE 1 END) AS
new_column FROM table_two;
+% sys.table_two, sys.L1 # table_name
+% this_column, new_column # name
+% int, tinyint # type
+% 1, 1 # length
+[ 1, 1 ]
+[ 2, 1 ]
+[ NULL, 0 ]
+#SELECT this_column, (CASE this_column WHEN NULL THEN 0 ELSE 1 END) AS
new_column FROM table_two;
+% sys.table_two, sys.L1 # table_name
+% this_column, new_column # name
+% int, tinyint # type
+% 1, 1 # length
+[ 1, 1 ]
+[ 2, 1 ]
+[ NULL, 0 ]
+#DROP TABLE table_two;
+
+# 15:30:37 >
+# 15:30:37 > "Done."
+# 15:30:37 >
+
diff --git
a/sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.sql
b/sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.sql
@@ -0,0 +1,37 @@
+START TRANSACTION;
+
+CREATE TABLE t0 (a1 INT, a2 INT, a3 INT);
+CREATE TABLE t1 (b1 INT, b2 INT);
+CREATE TABLE t2 (c1 INT, c2 INT);
+
+SELECT
+ a1,
+ (
+ SELECT COUNT(*) FROM t1
+ ) AS score
+FROM t0;
+
+SELECT
+ a1,
+ (
+ SELECT COUNT(*) FROM t1 WHERE a1 = b1 AND EXISTS ( SELECT 1 FROM t2 WHERE
c1 = a2 AND c2 IN (SELECT a1 FROM t0) )
+ ) AS score
+FROM t0;
+
+SELECT
+ a1,
+ (
+ SELECT COUNT(*) FROM t1 WHERE a1 = b1 AND EXISTS ( SELECT 1 FROM t2 WHERE
c1 = B2 AND c2 IN (SELECT a1 FROM t0) )
+ ) AS score
+FROM t0;
+
+SELECT
+ a1,
+ (
+ SELECT COUNT(*) FROM t1 WHERE a1 = b1 AND EXISTS ( SELECT 1 FROM t2 WHERE
c1 = B2 AND c2 IN (SELECT a1 FROM t0) )
+ ) AS score
+FROM t0
+WHERE a2 OR a3;
+
+ROLLBACK;
+
diff --git
a/sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.stable.err
b/sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'nested-subquery-in-select.Bug-6125` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 18:55:52 >
+# 18:55:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38335" "--set"
"mapi_usock=/var/tmp/mtest-32002/.s.monetdb.38335" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 18:55:52 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
