Changeset: 5872a00f22b6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5872a00f22b6
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_optimizer.c
Branch: nested
Log Message:
for now disable composite/vector/multiset inserts (in pipeline mode), ie
fallback
diffs (35 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
@@ -6470,6 +6470,10 @@ rel2bin_insert_ms(backend *be, sql_rel *
node *n, *m, *idx_m = NULL;
sql_rel *tr = rel->l;
sql_table *t = NULL;
+ int sync = 0;
+
+ if (be->need_pipeline)
+ sync = pp_counter(be, -1, -1, false);
if (is_physical(tr->op))
tr = tr->l;
@@ -6563,7 +6567,7 @@ rel2bin_insert_ms(backend *be, sql_rel *
}
if (t->s) /* only not declared tables, need this */
- pos = stmt_claim(be, t, cnt, 0);
+ pos = stmt_claim(be, t, cnt, sync);
if (t->idxs) {
for (n = ol_first_node(t->idxs), m = idx_m; n && m; n =
n->next, m = m->next) {
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -43,7 +43,7 @@ rel_properties(visitor *v, sql_rel *rel)
t = pbt->l;
else
t = rel_ddl_table_get(pbt);
- gp->complex_modify |= ol_length(t->triggers) ||
+ gp->complex_modify |= ol_length(t->triggers) || t->composite ||
t->multiset || t->vector ||
(rel->op != op_insert && ol_length(t->keys)) ||
(rel->op == op_delete && !rel->r);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
