Changeset: 43702f2ed555 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=43702f2ed555
Modified Files:
sql/backends/monet5/rel_bin.c
Branch: arrays
Log Message:
materialise oids, fixed bug
diffs (17 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -2798,10 +2798,9 @@ rel2bin_select( mvc *sql, sql_rel *rel,
if (col->nrcols == 0) /* constant */
col = stmt_const(sql->sa, sel, col);
else {
- if(((stmt*)col->op1)->type == st_tid &&
((stmt*)col->op2)->type == st_bat) {
- sql_table *tbl =
((stmt*)col->op1)->op4.tval;
- if(col->type == st_join && isArray(tbl))
- col = stmt_materialise(sql->sa,
sel,col);
+ if(col->type == st_join &&
((stmt*)col->op1)->type == st_tid &&
+
isArray(((stmt*)col->op1)->op4.tval) && ((stmt*)col->op2)->type == st_bat) {
+ col = stmt_materialise(sql->sa,
sel,col);
} else
col = stmt_project(sql->sa, sel, col);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
