Changeset: fcaf796039cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fcaf796039cf
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
Branch: arrays
Log Message:
putting back the join of the bat with the tids. It is needed to fill the
default value in the missing ones
diffs (42 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
@@ -2740,6 +2740,9 @@ static int pushDimensionSelections(stmt
return changes;
}
+
+#if 0
+We need the joins, otherwise the BAT will not be filled with null values
/* when dealing with arrays we do not need to join with tid */
static void clearJoins(stmt **s) {
stmt *leftS = (*s)->op1;
@@ -2751,6 +2754,7 @@ static void clearJoins(stmt **s) {
return clearJoins(&(*s)->op3);
return;
}
+#endif
/*
static stmt* addCells(mvc *sql, stmt *s) {
@@ -2843,7 +2847,7 @@ rel2bin_select( mvc *sql, sql_rel *rel,
isArray(sel->op1->op1->op4.tval) && sel->op1->op2->type ==
st_bat) {
sel = stmt_mbr(sql->sa, sel, sel->op1->op1);
- clearJoins(&(sel->op1));
+ //clearJoins(&(sel->op1));
}
////if it is an array we need to project the cells
//sel = addCells(sql, sel);
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1276,7 +1276,7 @@ stmt* stmt_materialise(sql_allocator *sa
s = stmt_left_join(sa, s, selectStmt->op1);
s->nrcols = selectStmt->nrcols;
- return stmt_project(sa, s, op2->op2);
+ return stmt_project(sa, s, op2);
}
sql_subtype *
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
