Changeset: 0b8bcdf65189 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b8bcdf65189 Modified Files: sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out Branch: default Log Message:
Approved output diffs (158 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 @@ -94,13 +94,13 @@ top N ( | | project ( | | | select ( | | | | left outer join ( -| | | | | left outer join ( +| | | | | project ( | | | | | | left outer join ( -| | | | | | | left outer join ( +| | | | | | | project ( | | | | | | | | left outer join ( -| | | | | | | | | left outer join ( +| | | | | | | | | project ( | | | | | | | | | | left outer join ( -| | | | | | | | | | | left outer join ( +| | | | | | | | | | | project ( | | | | | | | | | | | | left outer join ( | | | | | | | | | | | | | left outer join ( | | | | | | | | | | | | | | left outer join ( @@ -118,55 +118,63 @@ top N ( | | | | | | | | | | | | | | | | | | | | | | | | | | left outer join ( | | | | | | | | | | | | | | | | | | | | | | | | | | | left outer join ( | | | | | | | | | | | | | | | | | | | | | | | | | | | | left outer join ( -| | | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table1) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola1", "table1"."t1cola11", "table1"."t1cola12", "table1"."t1cola82", "table1"."t1cola91", "table1"."t1cola101", "table1"."t1cola111", "table1"."t1cola112", "table1"."t1cola114", "table1"."t1colb1", "table1"."t1colb111", "table1"."t1colb112", "table1"."t1colb113", "table1"."t1colb114", "table1"."t1colc91", "table1"."t1cold1", "table1"."t1cold111", "table1"."t1cold112", "table1"."t1cold113" ] COUNT , -| | | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table4) [ "table4"."t4cola1", "table4"."t4cola2", "table4"."t4cola111", "table4"."t4colb111", "table4"."t4colb112", "table4"."t4colb114", "table4"."t4colb115" ] COUNT -| | | | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1cola111" = "table4"."t4cola111" ], -| | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table2) [ "table2"."t2cola1", "table2"."t2cola10", "table2"."t2cola81", "table2"."t2cola82", "table2"."t2cola112", "table2"."t2cola113", "table2"."t2colc111", "table2"."t2colc112", "table2"."t2colc113", "table2"."t2colc114", "table2"."t2colc115" ] COUNT -| | | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1cola112" = "table2"."t2cola112" ], -| | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table5) [ "table5"."t5cola1", "table5"."t5cola2", "table5"."t5cola3", "table5"."t5cola5", "table5"."t5cola81", "table5"."t5cola113", "table5"."t5colb113" ] COUNT -| | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table5"."t5cola113" = "table2"."t2cola113" ], -| | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table6) [ "table6"."t6pkcol" NOT NULL HASHCOL as "lookup1"."t6pkcol" ] COUNT -| | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1cola114" = "lookup1"."t6pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table2) [ "table2"."t2colb111" as "lookup2"."t2colb111" ] COUNT -| | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1colb111" = "lookup2"."t2colb111" ], -| | | | | | | | | | | | | | | | | | | | | | | | table(sys.table5) [ "table5"."t5colb112" as "lookup3"."t5colb112" ] COUNT -| | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1colb112" = "lookup3"."t5colb112" ], -| | | | | | | | | | | | | | | | | | | | | | | table(sys.table7) [ "table7"."t7colb113" as "lookup4"."t7colb113" ] COUNT -| | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1colb113" = "lookup4"."t7colb113" ], -| | | | | | | | | | | | | | | | | | | | | | table(sys.table8) [ "table8"."t8colb114" as "lookup5"."t8colb114" ] COUNT -| | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1colb114" = "lookup5"."t8colb114" ], -| | | | | | | | | | | | | | | | | | | | | table(sys.table6) [ "table6"."t6pkcol" NOT NULL HASHCOL as "lookup11"."t6pkcol" ] COUNT -| | | | | | | | | | | | | | | | | | | | ) [ "table4"."t4colb111" = "lookup11"."t6pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | | | | | | | | | table(sys.table2) [ "table2"."t2colb112" as "lookup21"."t2colb112" ] COUNT -| | | | | | | | | | | | | | | | | | | ) [ "table4"."t4colb112" = "lookup21"."t2colb112" ], -| | | | | | | | | | | | | | | | | | | table(sys.table5) [ "table5"."t5pkcol" NOT NULL HASHCOL as "lookup31"."t5pkcol" ] COUNT -| | | | | | | | | | | | | | | | | | ) [ "table5"."t5colb113" = "lookup31"."t5pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | | | | | | | table(sys.table7) [ "table7"."t7pkcol" NOT NULL HASHCOL as "lookup41"."t7pkcol" ] COUNT -| | | | | | | | | | | | | | | | | ) [ "table4"."t4colb114" = "lookup41"."t7pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | | | | | | table(sys.table8) [ "table8"."t8pkcol" NOT NULL HASHCOL as "lookup51"."t8pkcol" ] COUNT -| | | | | | | | | | | | | | | | ) [ "table4"."t4colb115" = "lookup51"."t8pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | | | | | table(sys.table6) [ "table6"."t6pkcol" NOT NULL HASHCOL as "clookup1"."t6pkcol" ] COUNT -| | | | | | | | | | | | | | | ) [ "table2"."t2colc111" = "clookup1"."t6pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | | | | table(sys.table2) [ "table2"."t2pkcol" NOT NULL HASHCOL as "clookup2"."t2pkcol" ] COUNT -| | | | | | | | | | | | | | ) [ "table2"."t2colc112" = "clookup2"."t2pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | | | table(sys.table5) [ "table5"."t5pkcol" NOT NULL HASHCOL as "clookup3"."t5pkcol" ] COUNT -| | | | | | | | | | | | | ) [ "table2"."t2colc113" = "clookup3"."t5pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | | table(sys.table7) [ "table7"."t7pkcol" NOT NULL HASHCOL as "clookup4"."t7pkcol" ] COUNT -| | | | | | | | | | | | ) [ "table2"."t2colc114" = "clookup4"."t7pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | | table(sys.table8) [ "table8"."t8pkcol" NOT NULL HASHCOL as "clookup5"."t8pkcol" ] COUNT -| | | | | | | | | | | ) [ "table2"."t2colc115" = "clookup5"."t8pkcol" NOT NULL HASHCOL ], -| | | | | | | | | | | table(sys.table9) [ "table9"."t9pkcol" NOT NULL HASHCOL , "table9"."t9cola1", "table9"."t9cola91", "table9"."t9cola111" ] COUNT -| | | | | | | | | | ) [ "table1"."t1pkcol" NOT NULL HASHCOL = "table9"."t9cola111" ], -| | | | | | | | | | table(sys.table10) [ "table10"."t10pkcol" NOT NULL HASHCOL , "table10"."t10cola1", "table10"."t10cola91" ] COUNT -| | | | | | | | | ) [ "table9"."t9pkcol" NOT NULL HASHCOL = "table10"."t10pkcol" NOT NULL HASHCOL ], -| | | | | | | | | table(sys.table11) [ "table11"."t11pkcol" NOT NULL HASHCOL , "table11"."t11cola91" ] COUNT -| | | | | | | | ) [ "table9"."t9pkcol" NOT NULL HASHCOL = "table11"."t11pkcol" NOT NULL HASHCOL ], -| | | | | | | | table(sys.table3) [ "table3"."t3pkcol" NOT NULL HASHCOL as "a1"."t3pkcol", "table3"."t3cola1" as "a1"."t3cola1" ] COUNT -| | | | | | | ) [ "a1"."t3pkcol" NOT NULL HASHCOL = "table1"."t1cold111" ], -| | | | | | | table(sys.table3) [ "table3"."t3pkcol" NOT NULL HASHCOL as "a2"."t3pkcol" ] COUNT -| | | | | | ) [ "a2"."t3pkcol" NOT NULL HASHCOL = "table1"."t1cold112" ], -| | | | | | table(sys.table3) [ "table3"."t3pkcol" NOT NULL HASHCOL as "a3"."t3pkcol" ] COUNT -| | | | | ) [ "a3"."t3pkcol" NOT NULL HASHCOL = "table1"."t1cold113" ], +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | left outer join ( +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | left outer join ( +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | left outer join ( +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | left outer join ( +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table1) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola1", "table1"."t1cola11", "table1"."t1cola12", "table1"."t1cola82", "table1"."t1cola91", "table1"."t1cola101", "table1"."t1cola111", "table1"."t1cola112", "table1"."t1cola114", "table1"."t1colb1", "table1"."t1colb111", "table1"."t1colb112", "table1"."t1colb113", "table1"."t1colb114", "table1"."t1colc91", "table1"."t1cold1", "table1"."t1cold111", "table1"."t1cold112", "table1"."t1cold113" ] COUNT , +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table4) [ "table4"."t4cola1", "table4"."t4cola2", "table4"."t4cola111", "table4"."t4colb111", "table4"."t4colb112", "table4"."t4colb114", "table4"."t4colb115" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1cola111" = "table4"."t4cola111" ], +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table2) [ "table2"."t2cola1", "table2"."t2cola10", "table2"."t2cola81", "table2"."t2cola82", "table2"."t2cola112", "table2"."t2cola113", "table2"."t2colc111", "table2"."t2colc112", "table2"."t2colc113", "table2"."t2colc114", "table2"."t2colc115" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1cola112" = "table2"."t2cola112" ], +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table5) [ "table5"."t5cola1", "table5"."t5cola2", "table5"."t5cola3", "table5"."t5cola5", "table5"."t5cola81", "table5"."t5cola113", "table5"."t5colb113" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table5"."t5cola113" = "table2"."t2cola113" ], +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table6) [ "table6"."t6pkcol" NOT NULL HASHCOL as "lookup1"."t6pkcol" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1cola114" = "lookup1"."t6pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table2) [ "table2"."t2colb111" as "lookup2"."t2colb111" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1colb111" = "lookup2"."t2colb111" ], +| | | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table5) [ "table5"."t5colb112" as "lookup3"."t5colb112" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1colb112" = "lookup3"."t5colb112" ], +| | | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table7) [ "table7"."t7colb113" as "lookup4"."t7colb113" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1colb113" = "lookup4"."t7colb113" ], +| | | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table8) [ "table8"."t8colb114" as "lookup5"."t8colb114" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | | ) [ "table1"."t1colb114" = "lookup5"."t8colb114" ], +| | | | | | | | | | | | | | | | | | | | | | | | | table(sys.table6) [ "table6"."t6pkcol" NOT NULL HASHCOL as "lookup11"."t6pkcol" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | | ) [ "table4"."t4colb111" = "lookup11"."t6pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | | | | | | | | | table(sys.table2) [ "table2"."t2colb112" as "lookup21"."t2colb112" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | | ) [ "table4"."t4colb112" = "lookup21"."t2colb112" ], +| | | | | | | | | | | | | | | | | | | | | | | table(sys.table5) [ "table5"."t5pkcol" NOT NULL HASHCOL as "lookup31"."t5pkcol" ] COUNT +| | | | | | | | | | | | | | | | | | | | | | ) [ "table5"."t5colb113" = "lookup31"."t5pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | | | | | | | table(sys.table7) [ "table7"."t7pkcol" NOT NULL HASHCOL as "lookup41"."t7pkcol" ] COUNT +| | | | | | | | | | | | | | | | | | | | | ) [ "table4"."t4colb114" = "lookup41"."t7pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | | | | | | table(sys.table8) [ "table8"."t8pkcol" NOT NULL HASHCOL as "lookup51"."t8pkcol" ] COUNT +| | | | | | | | | | | | | | | | | | | | ) [ "table4"."t4colb115" = "lookup51"."t8pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | | | | | table(sys.table6) [ "table6"."t6pkcol" NOT NULL HASHCOL as "clookup1"."t6pkcol" ] COUNT +| | | | | | | | | | | | | | | | | | | ) [ "table2"."t2colc111" = "clookup1"."t6pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | | | | table(sys.table2) [ "table2"."t2pkcol" NOT NULL HASHCOL as "clookup2"."t2pkcol" ] COUNT +| | | | | | | | | | | | | | | | | | ) [ "table2"."t2colc112" = "clookup2"."t2pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | | | table(sys.table5) [ "table5"."t5pkcol" NOT NULL HASHCOL as "clookup3"."t5pkcol" ] COUNT +| | | | | | | | | | | | | | | | | ) [ "table2"."t2colc113" = "clookup3"."t5pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | | table(sys.table7) [ "table7"."t7pkcol" NOT NULL HASHCOL as "clookup4"."t7pkcol" ] COUNT +| | | | | | | | | | | | | | | | ) [ "table2"."t2colc114" = "clookup4"."t7pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | | table(sys.table8) [ "table8"."t8pkcol" NOT NULL HASHCOL as "clookup5"."t8pkcol" ] COUNT +| | | | | | | | | | | | | | | ) [ "table2"."t2colc115" = "clookup5"."t8pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | | | table(sys.table9) [ "table9"."t9pkcol" NOT NULL HASHCOL , "table9"."t9cola1", "table9"."t9cola91", "table9"."t9cola111" ] COUNT +| | | | | | | | | | | | | | ) [ "table1"."t1pkcol" NOT NULL HASHCOL = "table9"."t9cola111" ], +| | | | | | | | | | | | | | table(sys.table10) [ "table10"."t10pkcol" NOT NULL HASHCOL , "table10"."t10cola1", "table10"."t10cola91" ] COUNT +| | | | | | | | | | | | | ) [ "table9"."t9pkcol" NOT NULL HASHCOL = "table10"."t10pkcol" NOT NULL HASHCOL ], +| | | | | | | | | | | | | table(sys.table11) [ "table11"."t11pkcol" NOT NULL HASHCOL , "table11"."t11cola91" ] COUNT +| | | | | | | | | | | | ) [ "table9"."t9pkcol" NOT NULL HASHCOL = "table11"."t11pkcol" NOT NULL HASHCOL ] +| | | | | | | | | | | ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola1", "table1"."t1cola11", "table1"."t1cola12", "table1"."t1cola82", "table1"."t1cola91", "table1"."t1cola101", "table1"."t1cola114", "table1"."t1colb1", "table1"."t1colb111", "table1"."t1colb112", "table1"."t1colb113", "table1"."t1colb114", "table1"."t1colc91", "table1"."t1cold1", "table1"."t1cold111", "table1"."t1cold112", "table1"."t1cold113", "table4"."t4cola1", "table4"."t4cola2", "table4"."t4colb111", "table4"."t4colb112", "table4"."t4colb114", "table4"."t4colb115", "table2"."t2cola1", "table2"."t2cola10", "table2"."t2cola81", "table2"."t2cola82", "table2"."t2cola113", "table2"."t2colc111", "table2"."t2colc112", "table2"."t2colc113", "table2"."t2colc114", "table2"."t2colc115", "table5"."t5cola1", "table5"."t5cola2", "table5"."t5cola3", "table5"."t5cola5", "table5"."t5cola81", "table5"."t5cola113", "table5"."t5colb113", "lookup1"."t6pkcol" NOT NULL HASHCOL , "lookup2"."t2colb111", "lookup3"."t5colb112 ", "lookup4"."t7colb113", "lookup5"."t8colb114", "lookup11"."t6pkcol" NOT NULL HASHCOL , "lookup21"."t2colb112", "lookup31"."t5pkcol" NOT NULL HASHCOL , "lookup41"."t7pkcol" NOT NULL HASHCOL , "lookup51"."t8pkcol" NOT NULL HASHCOL , "clookup1"."t6pkcol" NOT NULL HASHCOL , "clookup2"."t2pkcol" NOT NULL HASHCOL , "clookup3"."t5pkcol" NOT NULL HASHCOL , "clookup4"."t7pkcol" NOT NULL HASHCOL , "clookup5"."t8pkcol" NOT NULL HASHCOL , "table9"."t9pkcol" NOT NULL HASHCOL , "table9"."t9cola1", "table9"."t9cola91", "table9"."t9cola111", "table10"."t10pkcol" NOT NULL HASHCOL , "table10"."t10cola1", "table10"."t10cola91", "table11"."t11pkcol" NOT NULL HASHCOL , "table11"."t11cola91" ], +| | | | | | | | | | | table(sys.table3) [ "table3"."t3pkcol" NOT NULL HASHCOL as "a1"."t3pkcol", "table3"."t3cola1" as "a1"."t3cola1" ] COUNT +| | | | | | | | | | ) [ "a1"."t3pkcol" NOT NULL HASHCOL = "table1"."t1cold111" ] +| | | | | | | | | ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola1", "table1"."t1cola11", "table1"."t1cola12", "table1"."t1cola82", "table1"."t1cola91", "table1"."t1cola101", "table1"."t1cola114", "table1"."t1colb1", "table1"."t1colb111", "table1"."t1colb112", "table1"."t1colb113", "table1"."t1colb114", "table1"."t1colc91", "table1"."t1cold1", "table1"."t1cold111", "table1"."t1cold112", "table1"."t1cold113", "table4"."t4cola1", "table4"."t4cola2", "table4"."t4colb111", "table4"."t4colb112", "table4"."t4colb114", "table4"."t4colb115", "table2"."t2cola1", "table2"."t2cola10", "table2"."t2cola81", "table2"."t2cola82", "table2"."t2colc111", "table2"."t2colc112", "table2"."t2colc113", "table2"."t2colc114", "table2"."t2colc115", "table5"."t5cola1", "table5"."t5cola2", "table5"."t5cola3", "table5"."t5cola5", "table5"."t5cola81", "table5"."t5colb113", "lookup1"."t6pkcol" NOT NULL HASHCOL , "lookup2"."t2colb111", "lookup3"."t5colb112", "lookup4"."t7colb113", "lookup5"."t8colb114", "lookup11"."t6pkcol" NOT NULL HASHCOL , "lookup21"."t2colb112", "lookup31"."t5pkcol" NOT NULL HASHCOL , "lookup41"."t7pkcol" NOT NULL HASHCOL , "lookup51"."t8pkcol" NOT NULL HASHCOL , "clookup1"."t6pkcol" NOT NULL HASHCOL , "clookup2"."t2pkcol" NOT NULL HASHCOL , "clookup3"."t5pkcol" NOT NULL HASHCOL , "clookup4"."t7pkcol" NOT NULL HASHCOL , "clookup5"."t8pkcol" NOT NULL HASHCOL , "table9"."t9pkcol" NOT NULL HASHCOL , "table9"."t9cola1", "table9"."t9cola91", "table9"."t9cola111", "table10"."t10pkcol" NOT NULL HASHCOL , "table10"."t10cola1", "table10"."t10cola91", "table11"."t11pkcol" NOT NULL HASHCOL , "table11"."t11cola91", "a1"."t3pkcol" NOT NULL HASHCOL , "a1"."t3cola1" ], +| | | | | | | | | table(sys.table3) [ "table3"."t3pkcol" NOT NULL HASHCOL as "a2"."t3pkcol" ] COUNT +| | | | | | | | ) [ "a2"."t3pkcol" NOT NULL HASHCOL = "table1"."t1cold112" ] +| | | | | | | ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola1", "table1"."t1cola11", "table1"."t1cola12", "table1"."t1cola82", "table1"."t1cola91", "table1"."t1cola101", "table1"."t1colb1", "table1"."t1colb111", "table1"."t1colb112", "table1"."t1colb113", "table1"."t1colb114", "table1"."t1colc91", "table1"."t1cold1", "table1"."t1cold111", "table1"."t1cold112", "table1"."t1cold113", "table4"."t4cola1", "table4"."t4cola2", "table4"."t4colb111", "table4"."t4colb112", "table4"."t4colb114", "table4"."t4colb115", "table2"."t2cola1", "table2"."t2cola10", "table2"."t2cola81", "table2"."t2cola82", "table2"."t2colc111", "table2"."t2colc112", "table2"."t2colc113", "table2"."t2colc114", "table2"."t2colc115", "table5"."t5cola1", "table5"."t5cola2", "table5"."t5cola3", "table5"."t5cola5", "table5"."t5cola81", "table5"."t5colb113", "lookup2"."t2colb111", "lookup3"."t5colb112", "lookup4"."t7colb113", "lookup5"."t8colb114", "lookup11"."t6pkcol" NOT NULL HASHCOL , "lookup21"."t2colb112", "lookup31"."t5pkcol" NOT NULL HASHCOL , "lookup41"."t7pkcol" NOT NULL HASHCOL , "lookup51"."t8pkcol" NOT NULL HASHCOL , "clookup1"."t6pkcol" NOT NULL HASHCOL , "clookup2"."t2pkcol" NOT NULL HASHCOL , "clookup3"."t5pkcol" NOT NULL HASHCOL , "clookup4"."t7pkcol" NOT NULL HASHCOL , "clookup5"."t8pkcol" NOT NULL HASHCOL , "table9"."t9pkcol" NOT NULL HASHCOL , "table9"."t9cola1", "table9"."t9cola91", "table9"."t9cola111", "table10"."t10pkcol" NOT NULL HASHCOL , "table10"."t10cola1", "table10"."t10cola91", "table11"."t11pkcol" NOT NULL HASHCOL , "table11"."t11cola91", "a1"."t3pkcol" NOT NULL HASHCOL , "a1"."t3cola1", "a2"."t3pkcol" NOT NULL HASHCOL ], +| | | | | | | table(sys.table3) [ "table3"."t3pkcol" NOT NULL HASHCOL as "a3"."t3pkcol" ] COUNT +| | | | | | ) [ "a3"."t3pkcol" NOT NULL HASHCOL = "table1"."t1cold113" ] +| | | | | ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola1", "table1"."t1cola11", "table1"."t1cola12", "table1"."t1cola82", "table1"."t1cola91", "table1"."t1cola101", "table1"."t1colb1", "table1"."t1colb112", "table1"."t1colb113", "table1"."t1colb114", "table1"."t1colc91", "table1"."t1cold1", "table1"."t1cold111", "table1"."t1cold112", "table1"."t1cold113", "table4"."t4cola1", "table4"."t4cola2", "table4"."t4colb111", "table4"."t4colb112", "table4"."t4colb114", "table4"."t4colb115", "table2"."t2cola1", "table2"."t2cola10", "table2"."t2cola81", "table2"."t2cola82", "table2"."t2colc111", "table2"."t2colc112", "table2"."t2colc113", "table2"."t2colc114", "table2"."t2colc115", "table5"."t5cola1", "table5"."t5cola2", "table5"."t5cola3", "table5"."t5cola5", "table5"."t5cola81", "table5"."t5colb113", "lookup3"."t5colb112", "lookup4"."t7colb113", "lookup5"."t8colb114", "lookup11"."t6pkcol" NOT NULL HASHCOL , "lookup21"."t2colb112", "lookup31"."t5pkcol" NOT NULL HASHCOL , "lookup41 "."t7pkcol" NOT NULL HASHCOL , "lookup51"."t8pkcol" NOT NULL HASHCOL , "clookup1"."t6pkcol" NOT NULL HASHCOL , "clookup2"."t2pkcol" NOT NULL HASHCOL , "clookup3"."t5pkcol" NOT NULL HASHCOL , "clookup4"."t7pkcol" NOT NULL HASHCOL , "clookup5"."t8pkcol" NOT NULL HASHCOL , "table9"."t9pkcol" NOT NULL HASHCOL , "table9"."t9cola1", "table9"."t9cola91", "table9"."t9cola111", "table10"."t10pkcol" NOT NULL HASHCOL , "table10"."t10cola1", "table10"."t10cola91", "table11"."t11pkcol" NOT NULL HASHCOL , "table11"."t11cola91", "a1"."t3pkcol" NOT NULL HASHCOL , "a1"."t3cola1", "a2"."t3pkcol" NOT NULL HASHCOL , "a3"."t3pkcol" NOT NULL HASHCOL ], | | | | | 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") NOT NULL = 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", 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", timestamp(7)[char(19) "2012-01-01 04:32:27"] <= "table10"."t10cola91" <= timestamp(7)[char(19) "2013-01-01 04:32:27"])), s ys.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.or(sys.=("table1"."t1cold111", bigint "15842000014793046"), sys.=("table1"."t1cold111", bigint "15842000017701488")), sys.=("table1"."t1cold111", bigint "15842000000024019")), sys.=("table1"."t1cold111", bigint "15842000000074007")), sys.=("table1"."t1cold111", bigint "15842000009358096")), sys.=("table1"."t1cold111", bigint "15842000010487625")), sys.=("table1"."t1cold111", bigint "15842000006731919")), sys.=("table1"."t1cold111", bigint "15842000002590112")), sys.=("table1"."t1cold111", bigint "15842000000019001")), sys.=("table1"."t1cold111", bigint "15842000014923682")), sys.=("table1"."t1cold111", bigint "15842000027547249")) = boolean "true") or (sys.or(sys.=("table12"."t12cola1", clob[bigint "15842000280111951"]), sys.=("table12"."t12cola1", clob[bigint "15842000280163015"])) = boolean "true") ] diff --git a/sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out b/sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out --- a/sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out +++ b/sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out @@ -73,7 +73,7 @@ stdout of test 'not_plus.Bug-6294` in di [ -41 ] #CREATE TABLE tab0(pk INTEGER PRIMARY KEY, col0 INTEGER, col1 FLOAT, col2 TEXT, col3 INTEGER, col4 FLOAT, col5 TEXT); #SELECT + 86 / - + 59 + + - col1 + - - 40 FROM tab0 WHERE NOT + col2 IS NOT NULL; -% . # table_name +% sys. # table_name % %2 # name % double # type % 24 # length diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out b/sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out @@ -27,7 +27,7 @@ stdout of test 'sqlitelogictest-mal-calc #INSERT INTO tab0 VALUES(97,1,99), (15,81,47), (87,21,10); [ 3 ] #SELECT CAST ( - col0 - - - col0 * + CAST ( NULL AS INTEGER ) AS BIGINT ) FROM tab0; -% . # table_name +% sys. # table_name % %1 # name % bigint # type % 1 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list