Changeset: 4669554437c7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4669554437c7
Modified Files:
sql/backends/monet5/sql.c
sql/storage/bat/bat_storage.c
Branch: Jul2021
Log Message:
make sure we call the right garbage collection function
diffs (41 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -329,14 +329,13 @@ create_table_or_view(mvc *sql, char* sna
return sql_message(SQLSTATE(42000) "%s TABLE: '%s' cannot have
constraints", action, t->base.name);
}
- osa = sql->sa;
- sql->sa = sql->ta;
-
nt = sql_trans_create_table(sql->session->tr, s, tname, t->query,
t->type, t->system, temp, t->commit_action,
t->sz,
t->properties);
if (!nt)
return sql_message(SQLSTATE(42000) "%s TABLE: '%s' name
conflicts", action, t->base.name);
+ osa = sql->sa;
+ sql->sa = sql->ta;
/* first check default values */
for (n = ol_first_node(t->columns); n; n = n->next) {
sql_column *c = n->data;
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -2252,7 +2252,7 @@ drop_col(sql_trans *tr, sql_column *c)
if (!isNew(c) && !isTempTable(c->t)) {
sql_delta *d = ATOMIC_PTR_GET(&c->data);
- trans_add(tr, &c->base, d, &tc_gc_del, &commit_destroy_del,
&log_destroy_col);
+ trans_add(tr, &c->base, d, &tc_gc_col, &commit_destroy_del,
&log_destroy_col);
}
return ok;
}
@@ -2264,7 +2264,7 @@ drop_idx(sql_trans *tr, sql_idx *i)
if (!isNew(i) && !isTempTable(i->t)) {
sql_delta *d = ATOMIC_PTR_GET(&i->data);
- trans_add(tr, &i->base, d, &tc_gc_del, &commit_destroy_del,
&log_destroy_idx);
+ trans_add(tr, &i->base, d, &tc_gc_idx, &commit_destroy_del,
&log_destroy_idx);
}
return ok;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
