Changeset: af322adf3207 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af322adf3207
Modified Files:
sql/server/rel_propagate.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/rel_updates.h
Branch: default
Log Message:
Change rel_insert argument 1 to mvc *.
diffs (122 lines):
diff --git a/sql/server/rel_propagate.c b/sql/server/rel_propagate.c
--- a/sql/server/rel_propagate.c
+++ b/sql/server/rel_propagate.c
@@ -733,7 +733,7 @@ rel_generate_subinserts(sql_query *query
list_remove_data(dup->exps, del);
}
- s1 = rel_insert(query, new_table, dup);
+ s1 = rel_insert(query->sql, new_table, dup);
if (just_one == 0) {
sel = rel_list(sql->sa, sel, s1);
} else {
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1117,7 +1117,7 @@ rel_create_table(sql_query *query, sql_s
temp = (tt == tt_table)?temp:SQL_PERSIST;
res = rel_table(sql, ddl_create_table, sname, t, temp);
if (with_data) {
- res = rel_insert(query, res, sq);
+ res = rel_insert(query->sql, res, sq);
} else {
rel_destroy(sq);
}
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -96,9 +96,8 @@ get_inserts( sql_rel *ins )
}
static sql_rel *
-rel_insert_hash_idx(sql_query *query, const char* alias, sql_idx *i, sql_rel
*inserts)
+rel_insert_hash_idx(mvc *sql, const char* alias, sql_idx *i, sql_rel *inserts)
{
- mvc *sql = query->sql;
char *iname = sa_strconcat( sql->sa, "%", i->base.name);
node *m;
sql_subtype *it, *lng;
@@ -148,9 +147,8 @@ rel_insert_hash_idx(sql_query *query, co
}
static sql_rel *
-rel_insert_join_idx(sql_query *query, const char* alias, sql_idx *i, sql_rel
*inserts)
+rel_insert_join_idx(mvc *sql, const char* alias, sql_idx *i, sql_rel *inserts)
{
- mvc *sql = query->sql;
char *iname = sa_strconcat( sql->sa, "%", i->base.name);
int need_nulls = 0;
node *m, *o;
@@ -234,9 +232,8 @@ rel_insert_join_idx(sql_query *query, co
}
static sql_rel *
-rel_insert_idxs(sql_query *query, sql_table *t, const char* alias, sql_rel
*inserts)
+rel_insert_idxs(mvc *sql, sql_table *t, const char* alias, sql_rel *inserts)
{
- mvc *sql = query->sql;
sql_rel *p = inserts->r;
node *n;
@@ -251,9 +248,9 @@ rel_insert_idxs(sql_query *query, sql_ta
if (ins->op == op_union)
inserts->r = rel_project(sql->sa, ins,
rel_projections(sql, ins, NULL, 0, 1));
if (hash_index(i->type) || i->type == no_idx) {
- rel_insert_hash_idx(query, alias, i, inserts);
+ rel_insert_hash_idx(sql, alias, i, inserts);
} else if (i->type == join_idx) {
- rel_insert_join_idx(query, alias, i, inserts);
+ rel_insert_join_idx(sql, alias, i, inserts);
}
}
if (inserts->r != p) {
@@ -271,9 +268,9 @@ rel_insert_idxs(sql_query *query, sql_ta
}
sql_rel *
-rel_insert(sql_query *query, sql_rel *t, sql_rel *inserts)
+rel_insert(mvc *sql, sql_rel *t, sql_rel *inserts)
{
- sql_rel * r = rel_create(query->sql->sa);
+ sql_rel * r = rel_create(sql->sa);
sql_table *tab = get_table(t);
if(!r)
return NULL;
@@ -283,14 +280,14 @@ rel_insert(sql_query *query, sql_rel *t,
r->r = inserts;
/* insert indices */
if (tab)
- return rel_insert_idxs(query, tab, rel_name(t), r);
+ return rel_insert_idxs(sql, tab, rel_name(t), r);
return r;
}
static sql_rel *
rel_insert_table(sql_query *query, sql_table *t, char *name, sql_rel *inserts)
{
- return rel_insert(query, rel_basetable(query->sql, t, name), inserts);
+ return rel_insert(query->sql, rel_basetable(query->sql, t, name),
inserts);
}
static list *
@@ -1602,7 +1599,7 @@ merge_into_table(sql_query *query, dlist
extra_project = rel_project(sql->sa, extra_select,
rel_projections(sql, joined, NULL, 1, 0));
if (!(insert = merge_generate_inserts(query, t,
extra_project, sts->h->data.lval, sts->h->next->data.sym)))
return NULL;
- if (!(insert = rel_insert(query, rel_dup(bt), insert)))
+ if (!(insert = rel_insert(query->sql, rel_dup(bt),
insert)))
return NULL;
} else {
assert(0);
diff --git a/sql/server/rel_updates.h b/sql/server/rel_updates.h
--- a/sql/server/rel_updates.h
+++ b/sql/server/rel_updates.h
@@ -18,7 +18,7 @@
extern sql_exp **table_update_array(mvc *sql, sql_table *t);
extern sql_rel *rel_update(mvc *sql, sql_rel *t, sql_rel *uprel, sql_exp
**updates, list *exps);
-extern sql_rel *rel_insert(sql_query *query, sql_rel *t, sql_rel *inserts);
+extern sql_rel *rel_insert(mvc *sql, sql_rel *t, sql_rel *inserts);
extern sql_rel *rel_delete(sql_allocator *sa, sql_rel *t, sql_rel *deletes);
extern sql_rel *rel_truncate(sql_allocator *sa, sql_rel *t, int drop_action,
int check_identity);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
