Changeset: dc4617ed96cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc4617ed96cf
Added Files:
sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.sql
sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.stable.err
sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
gdk/gdk_imprints.c
monetdb5/modules/mal/mat.mal
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_round_impl.h
sql/test/BugTracker-2015/Tests/All
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select5.test.sql
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (truncated from 543 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -38651,7 +38651,7 @@ comment Create an iterator over a MAT
pattern mat.new(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATpack;
-comment Define a Merge Association Table (MAT). Faal back to the pack
operationwhen this is called
+comment Define a Merge Association Table (MAT). Fall back to the pack
operationwhen this is called
pattern mat.project(map:bat[:oid,:bte],b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATproject;
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -49506,7 +49506,7 @@ comment Create an iterator over a MAT
pattern mat.new(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATpack;
-comment Define a Merge Association Table (MAT). Faal back to the pack
operationwhen this is called
+comment Define a Merge Association Table (MAT). Fall back to the pack
operationwhen this is called
pattern mat.project(map:bat[:oid,:bte],b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATproject;
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -557,8 +557,8 @@ do {
\
* a view and there are imprints on b's parent.
*
* Note that the b->T->imprints pointer can be NULL, meaning there are
- * no imprints; (Heap *) 1, meaning there are no imprints loaded, but
- * they may exist on disk; or a valid pointer to loaded imprints.
+ * no imprints; (Imprints *) 1, meaning there are no imprints loaded,
+ * but they may exist on disk; or a valid pointer to loaded imprints.
* These values are maintained here, in the IMPSdestroy and IMPSfree
* functions, and in BBPdiskscan during initialization. */
int
diff --git a/monetdb5/modules/mal/mat.mal b/monetdb5/modules/mal/mat.mal
--- a/monetdb5/modules/mal/mat.mal
+++ b/monetdb5/modules/mal/mat.mal
@@ -8,7 +8,7 @@ module mat;
pattern new(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATpack
-comment "Define a Merge Association Table (MAT). Faal back to the pack
operation
+comment "Define a Merge Association Table (MAT). Fall back to the pack
operation
when this is called ";
pattern pack(:any_2...):bat[:oid,:any_2]
diff --git a/sql/backends/monet5/sql_fround_impl.h
b/sql/backends/monet5/sql_fround_impl.h
--- a/sql/backends/monet5/sql_fround_impl.h
+++ b/sql/backends/monet5/sql_fround_impl.h
@@ -99,7 +99,7 @@ bat_dec_round_wrap(bat *_res, const bat
/* set result BAT properties */
BATsetcount(res, cnt);
- /* result head is aligned with agument head */
+ /* result head is aligned with argument head */
ALIGNsetH(res, v);
/* hard to predict correct tail properties in general */
res->T->nonil = nonil;
@@ -215,7 +215,7 @@ bat_round_wrap(bat *_res, const bat *_v,
/* set result BAT properties */
BATsetcount(res, cnt);
- /* result head is aligned with agument head */
+ /* result head is aligned with argument head */
ALIGNsetH(res, v);
/* hard to predict correct tail properties in general */
res->T->nonil = nonil;
diff --git a/sql/backends/monet5/sql_round_impl.h
b/sql/backends/monet5/sql_round_impl.h
--- a/sql/backends/monet5/sql_round_impl.h
+++ b/sql/backends/monet5/sql_round_impl.h
@@ -112,7 +112,7 @@ bat_dec_round_wrap(bat *_res, const bat
/* set result BAT properties */
BATsetcount(res, cnt);
- /* result head is aligned with agument head */
+ /* result head is aligned with argument head */
ALIGNsetH(res, v);
/* hard to predict correct tail properties in general */
res->T->nonil = nonil;
@@ -245,7 +245,7 @@ bat_round_wrap(bat *_res, const bat *_v,
/* set result BAT properties */
BATsetcount(res, cnt);
- /* result head is aligned with agument head */
+ /* result head is aligned with argument head */
ALIGNsetH(res, v);
/* hard to predict correct tail properties in general */
res->T->nonil = nonil;
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
@@ -99,3 +99,4 @@ NOT_x_LIKE-triggers-too_many_nested_oper
foreignkey_over_schemas.Bug-3855
mserver-crashes-under-specific-combination-of-JOIN-and-WHERE-conditions.Bug-3872
schema-trigger.Bug-3710
+many_union_all.Bug-3879
diff --git a/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.sql
b/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.sql
@@ -0,0 +1,129 @@
+START TRANSACTION;
+
+CREATE TABLE foo (a INT);
+
+SELECT 1
+FROM (SELECT a FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo
+ UNION ALL
+ SELECT 0 FROM foo) AS t;
+
+INSERT INTO foo VALUES (3), (6), (7);
+
+SELECT DISTINCT a
+FROM (
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo) t;
+
+SELECT DISTINCT a
+FROM (
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT a FROM foo UNION ALL
+SELECT 0 FROM foo) t;
+
+DROP TABLE foo;
+
+ROLLBACK;
diff --git a/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.stable.err
b/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'many_union_all.Bug-3897` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 16:32:11 >
+# 16:32:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34980" "--set"
"mapi_usock=/var/tmp/mtest-12121/.s.monetdb.34980" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/dinther_scratch1/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:32:11 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/dinther_scratch1/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 = 34980
+# cmdline opt mapi_usock = /var/tmp/mtest-12121/.s.monetdb.34980
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch2/dinther_scratch1/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 16:32:11 >
+# 16:32:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12121" "--port=34980"
+# 16:32:11 >
+
+
+# 16:32:11 >
+# 16:32:11 > "Done."
+# 16:32:11 >
+
diff --git a/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.stable.out
b/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/many_union_all.Bug-3879.stable.out
@@ -0,0 +1,159 @@
+stdout of test 'many_union_all.Bug-3897` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 16:32:11 >
+# 16:32:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34980" "--set"
"mapi_usock=/var/tmp/mtest-12121/.s.monetdb.34980" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/dinther_scratch1/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:32:11 >
+
+# MonetDB 5 server v11.21.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', 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-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://bristol.da.cwi.nl:34980/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-12121/.s.monetdb.34980
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
