Changeset: f209b57e0795 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f209b57e0795
Modified Files:
sql/server/rel_dump.c
sql/server/rel_exp.h
sql/server/rel_unnest.c
sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
sql/test/BugTracker-2018/Tests/negative-sequences.Bug-6665.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out
Branch: sq2default
Log Message:
approved output
diffs (truncated from 427 to 300 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -172,7 +172,7 @@ exp_print(mvc *sql, stream *fout, sql_ex
for(node *n = l->h; n; n = n->next)
exps_print(sql, fout, n->data, depth, refs,
alias, 1);
}
- if (e->flag)
+ if (e->flag && is_compare_func(f))
mnstr_printf(fout, " %s", e->flag==1?"ANY":"ALL");
} break;
case e_aggr: {
@@ -1084,6 +1084,17 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
skipWS(r, pos);
set_direction(exp, 1);
}
+ /* [ ANY|ALL ] */
+ if (strncmp(r+*pos, "ANY", strlen("ANY")) == 0) {
+ (*pos)+= (int) strlen("ANY");
+ skipWS(r, pos);
+ exp->flag = 1;
+ }
+ if (strncmp(r+*pos, "ALL", strlen("ALL")) == 0) {
+ (*pos)+= (int) strlen("ALL");
+ skipWS(r, pos);
+ exp->flag = 2;
+ }
/* [ NOT ] NULL */
if (strncmp(r+*pos, "NOT", strlen("NOT")) == 0) {
(*pos)+= (int) strlen("NOT");
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -16,6 +16,13 @@
#define new_exp_list(sa) sa_list(sa)
#define exp2list(sa,e) append(sa_list(sa),e)
+#define is_compare_func(sf) (!sf->func->s && \
+ (strcmp(sf->func->base.name, "<") == 0 || strcmp(sf->func->base.name,
"<=") == 0 || \
+ strcmp(sf->func->base.name, "=") == 0 || strcmp(sf->func->base.name,
"<>") == 0 || \
+ strcmp(sf->func->base.name, ">") == 0 || strcmp(sf->func->base.name,
">=") == 0) )
+
+#define is_notequal_func(sf) (!sf->func->s && strcmp(sf->func->base.name,
"<>") == 0)
+
extern comp_type compare_str2type(char *compare_op);
extern comp_type swap_compare( comp_type t );
extern comp_type range2lcompare( int r );
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -1882,13 +1882,6 @@ rewrite_anyequal(mvc *sql, sql_rel *rel,
return e;
}
-#define is_compare_func(sf) (!sf->func->s && \
- (strcmp(sf->func->base.name, "<") == 0 || strcmp(sf->func->base.name,
"<=") == 0 || \
- strcmp(sf->func->base.name, "=") == 0 || strcmp(sf->func->base.name,
"<>") == 0 || \
- strcmp(sf->func->base.name, ">") == 0 || strcmp(sf->func->base.name,
">=") == 0) )
-
-#define is_notequal_func(sf) (!sf->func->s && strcmp(sf->func->base.name,
"<>") == 0)
-
static const char *
compare_aggr_op( char *compare, int quantifier)
{
diff --git
a/sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
b/sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
---
a/sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
+++
b/sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
@@ -41,7 +41,7 @@ stdout of test 'correlated_groupby_in_se
# counter.timinglinkorder < test.timinglinkorder and
# counter.userstopcodebegin = test.userstopcodebegin
# group by dataownercode, lineplanningnumber, journeypatterncode) as
-% sys.test, sys.test, sys.test, sys.test, sys.test,
sys.test, .L13 # table_name
+% .test, .test, .test, .test, .test, .test, .%2 # table_name
% dataownercode, lineplanningnumber, journeypatterncode,
timinglinkorder, userstopcodebegin, istimingstop,
passagesequencenumber # name
% varchar, varchar, varchar, decimal, varchar,
boolean, bigint # type
% 0, 0, 0, 4, 0, 5, 1 # length
@@ -54,7 +54,7 @@ stdout of test 'correlated_groupby_in_se
# counter.timinglinkorder < test.timinglinkorder and
# counter.userstopcodebegin = test.userstopcodebegin) as
#passagesequencenumber
-% sys.test, sys.test, sys.test, sys.test, sys.test,
sys.test, .L13 # table_name
+% .test, .test, .test, .test, .test, .test, .%1 # table_name
% dataownercode, lineplanningnumber, journeypatterncode,
timinglinkorder, userstopcodebegin, istimingstop,
passagesequencenumber # name
% varchar, varchar, varchar, decimal, varchar,
boolean, bigint # type
% 0, 0, 0, 4, 0, 5, 1 # length
@@ -76,7 +76,7 @@ stdout of test 'correlated_groupby_in_se
# counter.timinglinkorder < test.timinglinkorder and
# counter.userstopcodebegin = test.userstopcodebegin
# group by dataownercode, lineplanningnumber, journeypatterncode) as
-% sys.test, sys.test, sys.test, sys.test, sys.test,
sys.test, .L13 # table_name
+% .test, .test, .test, .test, .test, .test, .%2 # table_name
% dataownercode, lineplanningnumber, journeypatterncode,
timinglinkorder, userstopcodebegin, istimingstop,
passagesequencenumber # name
% varchar, varchar, varchar, decimal, varchar,
boolean, bigint # type
% 3, 4, 1, 4, 8, 5, 1 # length
@@ -99,7 +99,7 @@ stdout of test 'correlated_groupby_in_se
# counter.timinglinkorder < test.timinglinkorder and
# counter.userstopcodebegin = test.userstopcodebegin) as
#passagesequencenumber
-% sys.test, sys.test, sys.test, sys.test, sys.test,
sys.test, .L13 # table_name
+% .test, .test, .test, .test, .test, .test, .%1 # table_name
% dataownercode, lineplanningnumber, journeypatterncode,
timinglinkorder, userstopcodebegin, istimingstop,
passagesequencenumber # name
% varchar, varchar, varchar, decimal, varchar,
boolean, bigint # type
% 3, 4, 1, 4, 8, 5, 1 # length
diff --git
a/sql/test/BugTracker-2018/Tests/negative-sequences.Bug-6665.stable.err
b/sql/test/BugTracker-2018/Tests/negative-sequences.Bug-6665.stable.err
--- a/sql/test/BugTracker-2018/Tests/negative-sequences.Bug-6665.stable.err
+++ b/sql/test/BugTracker-2018/Tests/negative-sequences.Bug-6665.stable.err
@@ -30,8 +30,8 @@ stderr of test 'negative-sequences.Bug-6
MAPI = (monetdb) /var/tmp/mtest-15463/.s.monetdb.37644
QUERY = select next value for "other_seq";
-ERROR = !Error in fetching next value for sequence sys.other_seq
-CODE = 42000
+ERROR = !Cannot generate next sequence value sys.other_seq
+CODE = HY050
# 16:24:28 >
# 16:24:28 > "Done."
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err
@@ -34,40 +34,40 @@ ERROR = !SELECT: no such aggregate 'sql_
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
QUERY = SELECT COALESCE ( - 86, + cor0.col1, cor0.col1, - cor0.col0 ) AS col2
FROM tab0 AS cor0 GROUP BY cor0.col2, cor0.col0;
-ERROR = !SELECT: cannot use non GROUP BY column 'cor0.col1' in query results
without an aggregate function
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
+ERROR = !SELECT: no such column 'cor0.col1'
+CODE = 42S22
+MAPI = (monetdb) /var/tmp/mtest-17982/.s.monetdb.32390
QUERY = SELECT ALL + 33 * - COALESCE ( - 86, tab1.col2 ) + + col1 FROM tab1
GROUP BY tab1.col1;
ERROR = !SELECT: no such aggregate 'sql_add'
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
QUERY = SELECT COALESCE ( - 86, tab1.col2 ) FROM tab1 GROUP BY tab1.col1;
-ERROR = !SELECT: cannot use non GROUP BY column 'tab1.col2' in query results
without an aggregate function
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
+ERROR = !SELECT: no such column 'tab1.col2'
+CODE = 42S22
+MAPI = (monetdb) /var/tmp/mtest-17982/.s.monetdb.32390
QUERY = SELECT ALL + COALESCE ( - cor0.col1, cor0.col1, 63, - cor0.col2 ) * -
cor0.col1 AS col1 FROM tab0 cor0 GROUP BY cor0.col0, col1;
ERROR = !SELECT: no such aggregate 'sql_mul'
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
QUERY = SELECT ALL + COALESCE ( - cor0.col1, cor0.col1, 63, cor0.col2 ) AS
col1 FROM tab0 cor0 GROUP BY cor0.col0, col1;
-ERROR = !SELECT: cannot use non GROUP BY column 'cor0.col2' in query results
without an aggregate function
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
+ERROR = !SELECT: no such column 'cor0.col2'
+CODE = 42S22
+MAPI = (monetdb) /var/tmp/mtest-17982/.s.monetdb.32390
QUERY = SELECT - 38 + - tab1.col1 - tab1.col1 / COALESCE ( + 20, - tab1.col0 )
FROM tab1 GROUP BY tab1.col1;
ERROR = !SELECT: no such aggregate 'sql_sub'
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
QUERY = SELECT COALESCE ( + 20, tab1.col0 ) FROM tab1 GROUP BY tab1.col1;
-ERROR = !SELECT: cannot use non GROUP BY column 'tab1.col0' in query results
without an aggregate function
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
+ERROR = !SELECT: no such column 'tab1.col0'
+CODE = 42S22
+MAPI = (monetdb) /var/tmp/mtest-17982/.s.monetdb.32390
QUERY = SELECT DISTINCT COALESCE ( - 82, - cor0.col0, - CAST ( NULL AS INTEGER
) ) / - 70 FROM tab0 AS cor0 GROUP BY cor0.col2;
ERROR = !SELECT: no such aggregate 'sql_div'
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108
QUERY = SELECT DISTINCT COALESCE ( - 82, cor0.col0, - CAST ( NULL AS INTEGER )
) FROM tab0 AS cor0 GROUP BY cor0.col2;
-ERROR = !SELECT: cannot use non GROUP BY column 'cor0.col0' in query results
without an aggregate function
-CODE = 42000
+ERROR = !SELECT: no such column 'cor0.col0'
+CODE = 42S22
# 15:10:14 >
# 15:10:14 > "Done."
diff --git
a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
---
a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
+++
b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
@@ -35,7 +35,7 @@ stdout of test 'duplicates-not-eliminate
function user.s4_0():void;
X_142:void := querylog.define("explain select sys.timestamp_to_str(case
when task0.\"sys_created_on\" >= \\'1999-10-31 09:00:00\\' and
task0.\"sys_created_on\" < \\'2000-04-02 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'2000-04-02 10:00:00\\' and
task0.\"sys_created_on\" < \\'2000-10-29 09:00:00\\' then
task0.\"sys_created_on\" + interval \\'-25200\\' second when
task0.\"sys_created_on\" >= \\'2000-10-29 09:00:00\\' and
task0.\"sys_created_on\" < \\'2001-04-01 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'2001-04-01 10:00:00\\' and
task0.\"sys_created_on\" < \\'2001-10-28 09:00:00\\' then
task0.\"sys_created_on\" + interval \\'-25200\\' second when
task0.\"sys_created_on\" >= \\'2001-10-28 09:00:00\\' and
task0.\"sys_created_on\" < \\'2002-04-07 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'
2002-04-07 10:00:00\\' and
barrier X_1765:bit := language.dataflow();
- X_1608:bat[:str] := bat.pack("sys.L1":str);
+ X_1608:bat[:str] := bat.pack("sys.%2":str);
X_1609:bat[:str] := bat.pack("yearref":str);
X_1610:bat[:str] := bat.pack("clob":str);
X_1611:bat[:int] := bat.pack(0:int);
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out
@@ -37,7 +37,7 @@ function user.s4_0():void;
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
X_18:lng := aggr.count(C_5:bat[:oid]);
- sql.resultSet(".L2":str, "L2":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet(".%1":str, "%1":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s4_0;
#inline actions= 0 time=1 usec
#remap actions= 0 time=1 usec
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out
@@ -37,7 +37,7 @@ function user.s4_0():void;
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
X_18:lng := aggr.count(C_5:bat[:oid]);
- sql.resultSet(".L5":str, "L5":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet(".%2":str, "%2":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s4_0;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
@@ -37,7 +37,7 @@ function user.s4_0():void;
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
X_18:lng := aggr.count(C_5:bat[:oid]);
- sql.resultSet(".L4":str, "L4":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet(".%3":str, "%3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s4_0;
#inline actions= 0 time=0 usec
#remap actions= 0 time=0 usec
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
@@ -37,7 +37,7 @@ function user.s4_0():void;
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
X_18:lng := aggr.count(C_5:bat[:oid]);
- sql.resultSet(".L7":str, "L7":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet(".%4":str, "%4":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s4_0;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
@@ -37,7 +37,7 @@ function user.s4_0():void;
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
X_18:lng := aggr.count(C_5:bat[:oid]);
- sql.resultSet(".L6":str, "L6":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet(".%5":str, "%5":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s4_0;
#inline actions= 0 time=1 usec
#remap actions= 0 time=1 usec
@@ -194,7 +194,7 @@ function user.s10_0():void;
X_23:bat[:oid] := sql.delta(X_18:bat[:oid], X_21:bat[:oid],
X_22:bat[:oid], X_20:bat[:oid]);
X_24:bat[:oid] := algebra.projection(C_5:bat[:oid], X_23:bat[:oid]);
C_32:bat[:oid] := sql.tid(X_4:int, "sys":str, "pk1":str);
- (X_34:bat[:oid], X_35:bat[:oid]) := algebra.join(X_24:bat[:oid],
C_32:bat[:oid], nil:BAT, nil:BAT, false:bit, nil:lng);
+ X_34:bat[:oid] := algebra.join(X_24:bat[:oid], C_32:bat[:oid], nil:BAT,
nil:BAT, false:bit, nil:lng);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "fk":str, "id":str, 0:int);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_8:bat[:int]);
X_42:bat[:int] := algebra.projection(X_34:bat[:oid], X_17:bat[:int]);
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
@@ -37,7 +37,7 @@ function user.s4_0():void;
X_4:int := sql.mvc();
C_5:bat[:oid] := sql.tid(X_4:int, "sys":str, "fk":str);
X_18:lng := aggr.count(C_5:bat[:oid]);
- sql.resultSet(".L11":str, "L11":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet(".%6":str, "%6":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s4_0;
#inline actions= 0 time=1 usec
#remap actions= 0 time=1 usec
@@ -127,7 +127,7 @@ function user.s8_0():void;
X_23:bat[:oid] := sql.delta(X_18:bat[:oid], X_21:bat[:oid],
X_22:bat[:oid], X_20:bat[:oid]);
X_24:bat[:oid] := algebra.projection(C_5:bat[:oid], X_23:bat[:oid]);
C_32:bat[:oid] := sql.tid(X_4:int, "sys":str, "pk1":str);
- (X_34:bat[:oid], X_35:bat[:oid]) := algebra.join(X_24:bat[:oid],
C_32:bat[:oid], nil:BAT, nil:BAT, false:bit, nil:lng);
+ X_34:bat[:oid] := algebra.join(X_24:bat[:oid], C_32:bat[:oid], nil:BAT,
nil:BAT, false:bit, nil:lng);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "fk":str, "id":str, 0:int);
X_17:bat[:int] := algebra.projection(C_5:bat[:oid], X_8:bat[:int]);
X_42:bat[:int] := algebra.projection(X_34:bat[:oid], X_17:bat[:int]);
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out
@@ -35,8 +35,8 @@ stdout of test 'foreign_key_outer_join_d
project (
| group by (
| | table(sys.fk) [ "fk"."id" NOT NULL HASHCOL ] COUNT
-| ) [ ] [ sys.count() NOT NULL as "L2"."L2" ]
-) [ "L2"."L2" NOT NULL ]
+| ) [ ] [ sys.count() NOT NULL as "%1"."%1" ]
+) [ "%1"."%1" NOT NULL ]
#plan select id from fk order by id;
% .plan # table_name
% rel # name
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
@@ -37,8 +37,8 @@ project (
| | project (
| | | table(sys.fk) [ "fk"."id" NOT NULL HASHCOL ] COUNT
| | ) [ "fk"."id" NOT NULL HASHCOL as "v0"."id" ]
-| ) [ ] [ sys.count() NOT NULL as "L5"."L5" ]
-) [ "L5"."L5" NOT NULL ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
