Changeset: 51de3e1e1571 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=51de3e1e1571
Modified Files:
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.out
Branch: subquery
Log Message:
approved output
diffs (98 lines):
diff --git
a/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
b/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
---
a/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
+++
b/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
@@ -171,7 +171,7 @@ top N (
| | | | | table(sys.table12) [ "table12"."t12cola1" ] COUNT
| | | | ) [ "table12"."t12cola1" = "table1"."t1cola1" ]
| | | ) [ (((((((((((((((clob[char["table1"."t1cold1"]] as "table1"."t1cold1")
FILTER ilike (clob "%a%", clob "")) or ((clob[char["table1"."t1cola1"]] as
"table1"."t1cola1") FILTER ilike (clob "%a%", clob ""))) or
((clob[char["table1"."t1colb1"]] as "table1"."t1colb1") FILTER ilike (clob
"%a%", clob ""))) or ((clob[char["table1"."t1cola11"]] as "table1"."t1cola11")
FILTER ilike (clob "%business%", clob ""))) or ("table1"."t1colc91" >=
timestamp(7)[char(19) "2016-03-21 05:00:00"])) or ("table1"."t1cola101" =
tinyint "1")) or ((clob[char["table1"."t1cola12"]] as "table1"."t1cola12")
FILTER ilike (clob "%Vijay%", clob ""))) or ((clob[char["table2"."t2cola1"]] as
"table2"."t2cola1") ! FILTER ilike (clob "%gmail%", clob ""),
(clob[char["table2"."t2cola1"]] as "table2"."t2cola1") ! FILTER ilike (clob
"%yahoo%", clob ""))) or ((clob[char["table2"."t2cola1"]] as
"table2"."t2cola1") FILTER ilike (clob "%efequitygroup.com%", clob ""))) or
("table4"."t4cola1" = clob "Customer")) or (sys.isnull
("table4"."t4cola2") = boolean "false")) or ("table2"."t2cola81" >= date
"2009-08-31")) or ((("table5"."t5cola1" = clob "BAT") or
((clob[char["table5"."t5cola2"]] as "table5"."t5cola2") FILTER ilike (clob
"%AUSTRALIA%", clob ""))) or ((clob[char["table5"."t5cola2"]] as
"table5"."t5cola2") FILTER ilike (clob "%Monet%", clob ""), "table5"."t5cola3"
= clob "Facebook", "table5"."t5cola5" = clob "new", "table5"."t5cola81" > date
"2015-07-30"))) or ((("table10"."t10cola1" != clob "Completed",
"table9"."t9cola1" = clob "Tasks", "table9"."t9cola91" >= timestamp(7)[char(19)
"2012-01-01 04:32:27"], "table10"."t10cola91" <= timestamp(7)[char(19)
"2013-01-01 04:32:27"]) or ("table9"."t9cola1" = clob "Events",
"table11"."t11cola91" >= timestamp(7)[char(19) "2012-01-01 04:32:27"],
"table11"."t11cola91" <= timestamp(7)[char(19) "2013-01-01 04:32:27"])) or
("table9"."t9cola1" = clob "Calls", "table10"."t10cola91" >=
timestamp(7)[char(19) "2012-01-01 04:32:27"], "table10"."t10cola91" <=
timestamp(7)
[char(19) "2013-01-01 04:32:27"])), (((((((((("table1"."t1cold111" = bigint
"15842000014793046") or ("table1"."t1cold111" = bigint "15842000017701488")) or
("table1"."t1cold111" = bigint "15842000000024019")) or ("table1"."t1cold111" =
bigint "15842000000074007")) or ("table1"."t1cold111" = bigint
"15842000009358096")) or ("table1"."t1cold111" = bigint "15842000010487625"))
or ("table1"."t1cold111" = bigint "15842000006731919")) or
("table1"."t1cold111" = bigint "15842000002590112")) or ("table1"."t1cold111" =
bigint "15842000000019001")) or ("table1"."t1cold111" = bigint
"15842000014923682")) or ("table1"."t1cold111" = bigint "15842000027547249"))
or (("table12"."t12cola1" = clob[bigint "15842000280111951"]) or
("table12"."t12cola1" = clob[bigint "15842000280163015"])) ]
-| | ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola1",
"table1"."t1cola82", "table1"."t1cola91", "table2"."t2cola10",
"table2"."t2cola82", "a1"."t3cola1" ]
+| | ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola82",
"table2"."t2cola10", "table1"."t1cola1", "table1"."t1cola91", "a1"."t3cola1",
"table2"."t2cola82" ]
| ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola82",
"table2"."t2cola10", "table1"."t1cola1", "table1"."t1cola91", "a1"."t3cola1" ]
[ "table2"."t2cola82" ]
) [ bigint "10", bigint "0" ]
#ROLLBACK;
diff --git
a/sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.stable.err
b/sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.stable.err
---
a/sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.stable.err
+++
b/sql/test/BugTracker-2017/Tests/aggr_udf_with_more_than_2params.Bug-6385.stable.err
@@ -31,11 +31,11 @@ stderr of test 'aggr_udf_with_more_than_
MAPI = (monetdb) /var/tmp/mtest-31488/.s.monetdb.35710
QUERY = SELECT groupnr, aggr2(value) FROM grouped_ints GROUP BY groupnr;
-ERROR = !SELECT: no such unary operator 'aggr2(int)'
+ERROR = !SELECT: no such aggregate 'aggr2'
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-7242/.s.monetdb.39126
QUERY = SELECT groupnr, aggr2(value, value, value) FROM grouped_ints GROUP BY
groupnr;
-ERROR = !SELECT: no such operator 'aggr2'
+ERROR = !SELECT: no such aggregate 'aggr2'
CODE = 42000
# 16:36:13 >
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.err
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.err
--- a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.err
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.err
@@ -27,30 +27,6 @@ stderr of test 'sqlsmith.Bug-6477` in di
# 14:26:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23479" "--port=39335"
# 14:26:12 >
-MAPI = (monetdb) /var/tmp/mtest-23479/.s.monetdb.39335
-QUERY = select
- cast(coalesce(ref_0.stop,
- ref_0.stop) as timestamp) as c0,
- ref_0.id as c1,
- cast(coalesce(ref_0.cpu,
- ref_0.io) as int) as c2,
- ref_0.run as c3,
- ref_0.stop as c4,
- ref_0.cpu as c5,
- case when cast(nullif(ref_0.tuples,
- ref_0.tuples) as bigint) is not NULL then ref_0.io else
ref_0.io end
- as c6
- from
- sys.querylog_calls as ref_0
- where cast(coalesce(ref_0.tuples,
- case when EXISTS (
- select
- ref_1.id as c0
- from
- sys.args as ref_1
- left join tmp.objects as ref_2
-ERROR = !Cardinality violation, scalar value expected
-CODE = 21000
# 14:26:12 >
# 14:26:12 > "Done."
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.out
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.out
--- a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.out
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.out
@@ -24,6 +24,31 @@ Ready.
# 14:26:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23479" "--port=39335"
# 14:26:12 >
+#select
+# cast(coalesce(ref_0.stop,
+# ref_0.stop) as timestamp) as c0,
+# ref_0.id as c1,
+# cast(coalesce(ref_0.cpu,
+# ref_0.io) as int) as c2,
+# ref_0.run as c3,
+# ref_0.stop as c4,
+# ref_0.cpu as c5,
+# case when cast(nullif(ref_0.tuples,
+# ref_0.tuples) as bigint) is not NULL then ref_0.io else ref_0.io end
+# as c6
+#from
+# sys.querylog_calls as ref_0
+#where cast(coalesce(ref_0.tuples,
+# case when EXISTS (
+# select
+# ref_1.id as c0
+# from
+# sys.args as ref_1
+# left join tmp.objects as ref_2
+% .L14, .L16, .L21, .L23, .L25, .L27, .L32 # table_name
+% c0, c1, c2, c3, c4, c5, c6 # name
+% timestamp, oid, int, bigint, timestamp, int, int # type
+% 26, 3, 1, 1, 26, 1, 1 # length
# 14:26:12 >
# 14:26:12 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
