Changeset: 66b722f968c9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66b722f968c9
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_cat.c
sql/server/sql_mvc.c
sql/storage/store.c
Branch: rename-sql
Log Message:
Small cleanup.
diffs (240 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
@@ -273,7 +273,7 @@ SQLshutdown_wrap(Client cntxt, MalBlkPtr
}
str
-create_table_or_view(mvc *sql, char* sname, char *tname, sql_table *t, int
temp, sqlid reuse, bool rename)
+create_table_or_view(mvc *sql, char* sname, char *tname, sql_table *t, int
temp, sqlid reuse)
{
sql_allocator *osa;
sql_schema *s = mvc_bind_schema(sql, sname);
@@ -284,7 +284,7 @@ create_table_or_view(mvc *sql, char* sna
if (STORE_READONLY)
return sql_error(sql, 06, "25006!schema statements cannot be
executed on a readonly database.");
- if(!rename) {
+ if(!reuse) {
if (!s)
return sql_message(SQLSTATE(3F000) "CREATE %s: schema
'%s' doesn't exist", (t->query) ? "TABLE" : "VIEW", sname);
if (mvc_bind_table(sql, s, t->base.name)) {
@@ -303,7 +303,7 @@ create_table_or_view(mvc *sql, char* sna
sql->sa = NULL;
nt = sql_trans_create_table(sql->session->tr, s, tname, t->query,
t->type, t->system, temp, t->commit_action,
- t->sz,
t->properties, reuse ? reuse : 0);
+ t->sz,
t->properties, reuse);
/* first check default values */
for (n = t->columns.set->h; n; n = n->next) {
@@ -341,7 +341,7 @@ create_table_or_view(mvc *sql, char* sna
sql->sa = osa;
throw(SQL, "sql.catalog", SQLSTATE(42000) "%s",
sql->errstr);
}
- if(!rename) {
+ if(!reuse) {
id_l = rel_dependencies(sql, r);
mvc_create_dependencies(sql, id_l, nt->base.id,
FUNC_DEPENDENCY);
}
@@ -352,7 +352,7 @@ create_table_or_view(mvc *sql, char* sna
}
for (n = t->columns.set->h; n; n = n->next) {
- sql_column *c = n->data, *copied = mvc_copy_column(sql, nt, c,
NULL, !rename);
+ sql_column *c = n->data, *copied = mvc_copy_column(sql, nt, c,
NULL, !reuse);
if (copied == NULL) {
sql->sa = osa;
@@ -372,7 +372,7 @@ create_table_or_view(mvc *sql, char* sna
throw(SQL, "sql.catalog",SQLSTATE(HY001)
MAL_MALLOC_FAIL);
}
- err = bootstrap_partition_expression(sql, sql->session->tr->sa,
nt, 1, !rename);
+ err = bootstrap_partition_expression(sql, sql->session->tr->sa,
nt, 1, !reuse);
sa_destroy(sql->sa);
sql->sa = NULL;
if(err) {
@@ -380,7 +380,7 @@ create_table_or_view(mvc *sql, char* sna
return err;
}
}
- if(!rename) {
+ if(!reuse) {
check = sql_trans_set_partition_table(sql->session->tr, nt);
if(check == -1) {
sql->sa = osa;
@@ -394,7 +394,7 @@ create_table_or_view(mvc *sql, char* sna
if (t->idxs.set) {
for (n = t->idxs.set->h; n; n = n->next) {
sql_idx *i = n->data;
- mvc_copy_idx(sql, nt, i, !rename);
+ mvc_copy_idx(sql, nt, i, !reuse);
}
}
if (t->keys.set) {
@@ -415,23 +415,23 @@ create_table_or_view(mvc *sql, char* sna
sql->sa = osa;
return err;
}
- mvc_copy_key(sql, nt, k, !rename);
+ mvc_copy_key(sql, nt, k, !reuse);
}
}
if (t->members.set) {
for (n = t->members.set->h; n; n = n->next) {
sql_part *pt = n->data;
- mvc_copy_part(sql, nt, pt, !rename);
+ mvc_copy_part(sql, nt, pt, !reuse);
}
}
if (t->triggers.set) {
for (n = t->triggers.set->h; n; n = n->next) {
sql_trigger *tr = n->data;
- mvc_copy_trigger(sql, nt, tr, !rename);
+ mvc_copy_trigger(sql, nt, tr, !reuse);
}
}
/* also create dependencies when not renaming */
- if (!rename && nt->query && isView(nt)) {
+ if (!reuse && nt->query && isView(nt)) {
sql_rel *r = NULL;
sql->sa = sa_create();
@@ -499,7 +499,7 @@ create_table_from_emit(Client cntxt, cha
goto cleanup;
}
}
- msg = create_table_or_view(sql, sname, t->base.name, t, 0, 0, false);
+ msg = create_table_or_view(sql, sname, t->base.name, t, 0, 0);
if (msg != MAL_SUCCEED) {
goto cleanup;
}
diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h
--- a/sql/backends/monet5/sql.h
+++ b/sql/backends/monet5/sql.h
@@ -144,7 +144,7 @@ sql5_export str sql_dense_rank(bat *rid,
sql5_export str SQLidentity(oid *rid, const void *i);
sql5_export str BATSQLidentity(bat *rid, const bat *bid);
sql5_export str PBATSQLidentity(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str create_table_or_view(mvc *sql, char* sname, char *tname,
sql_table *t, int temp, sqlid reuse, bool rename);
+sql5_export str create_table_or_view(mvc *sql, char* sname, char *tname,
sql_table *t, int temp, sqlid reuse);
sql5_export str create_table_from_emit(Client cntxt, char *sname, char *tname,
sql_emit_col *columns, size_t ncols);
sql5_export str append_to_table_from_emit(Client cntxt, char *sname, char
*tname, sql_emit_col *columns, size_t ncols);
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -1056,7 +1056,7 @@ SQLcreate_table(Client cntxt, MalBlkPtr
int temp = *getArgReference_int(stk, pci, 4);
initcontext();
- msg = create_table_or_view(sql, sname, t->base.name, t, temp, 0, false);
+ msg = create_table_or_view(sql, sname, t->base.name, t, temp, 0);
return msg;
}
@@ -1070,7 +1070,7 @@ SQLcreate_view(Client cntxt, MalBlkPtr m
int temp = *getArgReference_int(stk, pci, 4);
initcontext();
- msg = create_table_or_view(sql, sname, t->base.name, t, temp, 0, false);
+ msg = create_table_or_view(sql, sname, t->base.name, t, temp, 0);
return msg;
}
@@ -1592,7 +1592,7 @@ SQLrename_schema(Client cntxt, MalBlkPtr
if (olds->tables.set) {
for (n = olds->tables.set->h; n; n = n->next) {
sql_table *ot = n->data;
- if((msg = create_table_or_view(sql, news->base.name,
ot->base.name, ot, ot->persistence, 0, true)) != MAL_SUCCEED)
+ if((msg = create_table_or_view(sql, news->base.name,
ot->base.name, ot, ot->persistence, ot->base.id)) != MAL_SUCCEED)
return msg;
}
}
@@ -1607,7 +1607,7 @@ SQLrename_schema(Client cntxt, MalBlkPtr
for (n = olds->seqs.set->h; n; n = n->next) {
sql_sequence *os = n->data;
(void) sql_trans_create_sequence(sql->session->tr,
news, os->base.name, os->start, os->minvalue,
-
os->maxvalue, os->increment, os->cacheinc, os->cycle, 0, os->base.id);
+
os->maxvalue, os->increment, os->cacheinc, os->cycle, os->bedropped,
os->base.id);
}
}
return msg;
@@ -1640,7 +1640,7 @@ SQLrename_table(Client cntxt, MalBlkPtr
if (sql_trans_drop_table(sql->session->tr, s, t->base.id,
DROP_RESTRICT, false))
throw(SQL, "sql.rename_table", SQLSTATE(HY001) MAL_MALLOC_FAIL);
- if ((msg = create_table_or_view(sql, s->base.name, new_name, t,
t->persistence, t->base.id, true)) != MAL_SUCCEED)
+ if ((msg = create_table_or_view(sql, s->base.name, new_name, t,
t->persistence, t->base.id)) != MAL_SUCCEED)
return msg;
return msg;
}
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -1931,7 +1931,7 @@ stack_get_number(mvc *sql, const char *n
}
sql_column *
-mvc_copy_column( mvc *m, sql_table *t, sql_column *c, char* new_name, bool
create_row)
+mvc_copy_column( mvc *m, sql_table *t, sql_column *c, char *new_name, bool
create_row)
{
return sql_trans_copy_column(m->session->tr, t, c, new_name,
create_row);
}
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2816,7 +2816,7 @@ sql_trans_name_conflict( sql_trans *tr,
}
sql_column *
-sql_trans_copy_column( sql_trans *tr, sql_table *t, sql_column *c, char*
new_name, bool create_row)
+sql_trans_copy_column( sql_trans *tr, sql_table *t, sql_column *c, char
*new_name, bool create_row)
{
sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
sql_table *syscolumn = find_sql_table(syss, "_columns");
@@ -2841,11 +2841,10 @@ sql_trans_copy_column( sql_trans *tr, sq
if (!create_row || isDeclaredTable(c->t)) {
if (isTable(t)) {
- if(!create_row && c->data && store_funcs.dup_col(tr, c,
col) != LOG_OK) {
+ if(!create_row && c->data && store_funcs.dup_col(tr, c,
col) != LOG_OK)
return NULL;
- } else if (store_funcs.create_col(tr, col) != LOG_OK) {
+ else if (store_funcs.create_col(tr, col) != LOG_OK)
return NULL;
- }
}
}
if (create_row && !isDeclaredTable(t)) {
@@ -4534,9 +4533,8 @@ sys_drop_table(sql_trans *tr, sql_table
sql_column *pcols = find_sql_column(partitions, "table_id");
rids *rs = table_funcs.rids_select(tr, pcols, &t->base.id,
&t->base.id, NULL);
oid poid;
- if((poid = table_funcs.rids_next(rs)) != oid_nil) {
+ if((poid = table_funcs.rids_next(rs)) != oid_nil)
table_funcs.table_delete(tr, partitions, poid);
- }
table_funcs.rids_destroy(rs);
}
@@ -4710,7 +4708,8 @@ sql_trans_drop_type(sql_trans *tr, sql_s
}
sql_func *
-create_sql_func(sql_allocator *sa, const char *func, list *args, list *res,
int type, int lang, const char *mod, const char *impl, const char *query, bit
varres, bit vararg, bit system)
+create_sql_func(sql_allocator *sa, const char *func, list *args, list *res,
int type, int lang, const char *mod,
+ const char *impl, const char *query, bit
varres, bit vararg, bit system)
{
sql_func *t = SA_ZNEW(sa, sql_func);
@@ -4913,7 +4912,7 @@ sql_trans_create_schema(sql_trans *tr, c
cs_add(&tr->schemas, s, TR_NEW);
if(!reuse) {
table_funcs.table_insert(tr, sysschema, &s->base.id,
s->base.name, &s->auth_id, &s->owner, &s->system);
- } else { //while renaming a schema, instead of insert a new record, we
must rename an existing one
+ } else { //while renaming a schema, instead of insert a new record, we
rename the existing one
oid rid = table_funcs.column_find_row(tr,
find_sql_column(sysschema, "id"), &s->base.id, NULL);
assert(!is_oid_nil(rid));
table_funcs.column_update_value(tr, find_sql_column(sysschema,
"name"), rid, (void*) name);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
