Changeset: 4a0678a38a09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a0678a38a09
Modified Files:
sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
sql/server/rel_rel.c
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
merge with Dec2016
diffs (197 lines):
diff --git a/sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
b/sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
--- a/sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
@@ -35,7 +35,7 @@ Ready.
#EXCEPT
#SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual
#FROM bam.alignments_73;
-% bam.L32, bam.L32, bam.L32, bam.L32, bam.L32,
bam.L32, bam.L32, bam.L32, bam.L32, bam.L32,
bam.L32 # table_name
+% bam.L33, bam.L33, bam.L33, bam.L33, bam.L33,
bam.L33, bam.L33, bam.L33, bam.L33, bam.L33,
bam.L33 # table_name
% qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen,
seq, qual # name
% clob, smallint, clob, int, smallint, clob, clob,
int, int, clob, clob # type
% 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0 # length
@@ -54,7 +54,7 @@ Ready.
#EXCEPT
#SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual
#FROM bam.alignments_74;
-% .L217, .L217, .L217, .L217, .L217, .L217, .L217, .L217, .L217,
.L217, .L217 # table_name
+% .L224, .L224, .L224, .L224, .L224, .L224, .L224, .L224, .L224,
.L224, .L224 # table_name
% qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen,
seq, qual # name
% clob, smallint, clob, int, smallint, clob, clob,
int, int, clob, clob # type
% 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
0 # length
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -758,7 +758,7 @@ exps_has_nil(list *exps)
list *
rel_projections(mvc *sql, sql_rel *rel, const char *tname, int settname, int
intern )
{
- list *rexps, *exps;
+ list *lexps, *rexps, *exps;
int intern_only = (intern==2)?1:0;
if (!rel || (is_subquery(rel) /*&& is_project(rel->op)*/ && rel->op ==
op_project))
@@ -806,15 +806,18 @@ rel_projections(mvc *sql, sql_rel *rel,
}
return exps;
}
- exps = rel_projections(sql, rel->l, tname, settname, intern );
- if (exps) {
- node *en;
+ lexps = rel_projections(sql, rel->l, tname, settname, intern );
+ rexps = rel_projections(sql, rel->r, tname, settname, intern );
+ exps = sa_list(sql->sa);
+ if (lexps && rexps && exps) {
+ node *en, *ren;
int label = ++sql->label;
- for (en = exps->h; en; en = en->next) {
+ for (en = lexps->h, ren = rexps->h; en && ren; en =
en->next, ren = ren->next) {
sql_exp *e = en->data;
e->card = rel->card;
if (!settname) /* noname use alias */
exp_setrelname(sql->sa, e, label);
+ append(exps, e);
}
}
return exps;
diff --git
a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
---
a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
+++
b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
@@ -74,10 +74,10 @@ project (
| | | | table(sys.t2606b) [ t2606b.a ] COUNT
| | | ) [ t2606b.a ]
| | ) [ t2606b.a ] [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#select * from t2606a union select * from t2606b order by a;
-% .L10 # table_name
+% .L11 # table_name
% a # name
% int # type
% 2 # length
@@ -107,10 +107,10 @@ project (
| | | | table(sys.t2606b) [ t2606b.a ] COUNT
| | | ) [ t2606b.a ]
| | ) [ t2606b.a ] [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#( select * from t2606a union select * from t2606b ) order by a;
-% .L10 # table_name
+% .L11 # table_name
% a # name
% int # type
% 2 # length
@@ -140,10 +140,10 @@ project (
| | | | table(sys.t2606b) [ t2606b.a ] COUNT
| | | ) [ t2606b.a ]
| | ) [ t2606b.a ] [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#( select * from t2606a ) union ( select * from t2606b ) order by a;
-% .L10 # table_name
+% .L11 # table_name
% a # name
% int # type
% 2 # length
@@ -169,10 +169,10 @@ project (
| | project (
| | | table(sys.t2606b) [ t2606b.a ] COUNT
| | ) [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#select * from t2606a except select * from t2606b order by a;
-% sys.L10 # table_name
+% sys.L11 # table_name
% a # name
% int # type
% 2 # length
@@ -192,10 +192,10 @@ project (
| | project (
| | | table(sys.t2606b) [ t2606b.a ] COUNT
| | ) [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#( select * from t2606a except select * from t2606b ) order by a;
-% sys.L10 # table_name
+% sys.L11 # table_name
% a # name
% int # type
% 2 # length
@@ -215,10 +215,10 @@ project (
| | project (
| | | table(sys.t2606b) [ t2606b.a ] COUNT
| | ) [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#( select * from t2606a ) except ( select * from t2606b ) order by a;
-% sys.L10 # table_name
+% sys.L11 # table_name
% a # name
% int # type
% 2 # length
@@ -238,10 +238,10 @@ project (
| | project (
| | | table(sys.t2606b) [ t2606b.a ] COUNT
| | ) [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#select * from t2606a intersect select * from t2606b order by a;
-% sys.L10 # table_name
+% sys.L11 # table_name
% a # name
% int # type
% 2 # length
@@ -261,10 +261,10 @@ project (
| | project (
| | | table(sys.t2606b) [ t2606b.a ] COUNT
| | ) [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#( select * from t2606a intersect select * from t2606b ) order by a;
-% sys.L10 # table_name
+% sys.L11 # table_name
% a # name
% int # type
% 2 # length
@@ -284,10 +284,10 @@ project (
| | project (
| | | table(sys.t2606b) [ t2606b.a ] COUNT
| | ) [ t2606b.a ]
-| ) [ t2606a.a as L10.a ]
-) [ L10.a ] [ L10.a ASC ]
+| ) [ t2606a.a as L11.a ]
+) [ L11.a ] [ L11.a ASC ]
#( select * from t2606a ) intersect ( select * from t2606b ) order by a;
-% sys.L10 # table_name
+% sys.L11 # table_name
% a # name
% int # type
% 2 # length
diff --git a/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
--- a/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
+++ b/sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
@@ -36,7 +36,7 @@ Ready.
% type, digits, scale, schema, table, column # name
% varchar, int, int, str, str, str # type
% 6, 2, 1, 0, 3, 3 # length
-[ "bigint", 64, 0, "", "L16", "L15" ]
+[ "bigint", 64, 0, "", "L17", "L16" ]
#drop table foo;
# 12:27:17 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
