Changeset: 05a618a2cb39 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/05a618a2cb39
Modified Files:
sql/server/rel_distribute.c
sql/server/rel_select.c
sql/server/rel_statistics.c
sql/server/rel_unnest.c
Branch: balanced_union
Log Message:
Fixes compilation issues
diffs (50 lines):
diff --git a/sql/server/rel_distribute.c b/sql/server/rel_distribute.c
--- a/sql/server/rel_distribute.c
+++ b/sql/server/rel_distribute.c
@@ -315,7 +315,7 @@ rel_rewrite_remote_(visitor *v, sql_rel
}
break;
case op_munion:
- assert(0);
+ /*assert(0);*/
break;
case op_project:
case op_select:
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -6222,8 +6222,8 @@ rel_setquery(sql_query *query, symbol *q
t1 = rel_distinct(t1);
if (t2 && distinct)
t2 = rel_distinct(t2);
- res = rel_setquery_(query, t1, t2, corresponding, op_union );
- /*res = rel_setquery_n_ary_(query, t1, t2, corresponding,
op_munion);*/
+ /*res = rel_setquery_(query, t1, t2, corresponding, op_union
);*/
+ res = rel_setquery_n_ary_(query, t1, t2, corresponding,
op_munion);
} else if ( q->token == SQL_EXCEPT)
res = rel_setquery_(query, t1, t2, corresponding, op_except );
else if ( q->token == SQL_INTERSECT)
diff --git a/sql/server/rel_statistics.c b/sql/server/rel_statistics.c
--- a/sql/server/rel_statistics.c
+++ b/sql/server/rel_statistics.c
@@ -790,7 +790,7 @@ rel_get_statistics_(visitor *v, sql_rel
break;
}
case op_munion:
- assert(0);
+ // TODO: munion statistis
break;
case op_join:
case op_left:
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
@@ -420,7 +420,7 @@ rel_freevar(mvc *sql, sql_rel *rel)
exps = exps_freevar(sql, rel->exps);
for (node *n = ((list*)rel->l)->h; n; n = n->next) {
lexps = rel_freevar(sql, n->data);
- exps = merge_freevar(exps, lexps);
+ exps = merge_freevar(exps, lexps, false);
}
return exps;
case op_ddl:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
