Changeset: 92e12edb6819 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92e12edb6819
Modified Files:
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_user.c
sql/common/sql_backend.c
sql/common/sql_backend.h
sql/include/sql_catalog.h
sql/server/rel_schema.c
sql/server/rel_sequence.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_privileges.c
sql/server/sql_privileges.h
sql/storage/bat/bat_table.c
sql/storage/sql_catalog.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/storage/store_dependency.c
Branch: default
Log Message:
Use the proper type while referencing SQL object ids. It should be sqlid
instead of int. For dependencies types use sht instead of short.
diffs (truncated from 1363 to 300 lines):
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
@@ -686,7 +686,7 @@ drop_seq(mvc *sql, char *sname, char *na
}
static str
-drop_func(mvc *sql, char *sname, char *name, int fid, int type, int action)
+drop_func(mvc *sql, char *sname, char *name, sqlid fid, int type, int action)
{
sql_schema *s = NULL;
char is_aggr = (type == F_AGGR);
@@ -993,7 +993,7 @@ SQLcreate_schema(Client cntxt, MalBlkPtr
str msg = MAL_SUCCEED;
str sname = *getArgReference_str(stk, pci, 1);
str name = SaveArgReference(stk, pci, 2);
- int auth_id;
+ sqlid auth_id;
initcontext();
auth_id = sql->role_id;
@@ -1178,7 +1178,7 @@ SQLgrant_roles(Client cntxt, MalBlkPtr m
str msg;
str sname = *getArgReference_str(stk, pci, 1);
char *auth = SaveArgReference(stk, pci, 2);
- int grantor = *getArgReference_int(stk, pci, 3);
+ sqlid grantor = (sqlid) *getArgReference_int(stk, pci, 3);
int admin = *getArgReference_int(stk, pci, 4);
initcontext();
@@ -1192,7 +1192,7 @@ SQLrevoke_roles(Client cntxt, MalBlkPtr
str msg;
str sname = *getArgReference_str(stk, pci, 1);
char *auth = SaveArgReference(stk, pci, 2);
- int grantor = *getArgReference_int(stk, pci, 3);
+ sqlid grantor = (sqlid) *getArgReference_int(stk, pci, 3);
int admin = *getArgReference_int(stk, pci, 4);
initcontext();
@@ -1210,7 +1210,7 @@ SQLgrant(Client cntxt, MalBlkPtr mb, Mal
int privs = *getArgReference_int(stk, pci, 4);
char *cname = SaveArgReference(stk, pci, 5);
int grant = *getArgReference_int(stk, pci, 6);
- int grantor = *getArgReference_int(stk, pci, 7);
+ sqlid grantor = (sqlid) *getArgReference_int(stk, pci, 7);
initcontext();
if (!tname || strcmp(tname, str_nil) == 0)
@@ -1229,7 +1229,7 @@ str SQLrevoke(Client cntxt, MalBlkPtr mb
int privs = *getArgReference_int(stk, pci, 4);
char *cname = SaveArgReference(stk, pci, 5);
int grant = *getArgReference_int(stk, pci, 6);
- int grantor = *getArgReference_int(stk, pci, 7);
+ sqlid grantor = (sqlid) *getArgReference_int(stk, pci, 7);
initcontext();
if (!tname || strcmp(tname, str_nil) == 0)
@@ -1243,12 +1243,12 @@ str
SQLgrant_function(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{ mvc *sql = NULL;
str msg;
- str sname = *getArgReference_str(stk, pci, 1);
- int func_id = *getArgReference_int(stk, pci, 2);
+ str sname = *getArgReference_str(stk, pci, 1);
+ sqlid func_id = (sqlid) *getArgReference_int(stk, pci, 2);
char *grantee = *getArgReference_str(stk, pci, 3);
int privs = *getArgReference_int(stk, pci, 4);
int grant = *getArgReference_int(stk, pci, 5);
- int grantor = *getArgReference_int(stk, pci, 6);
+ sqlid grantor = (sqlid) *getArgReference_int(stk, pci, 6);
initcontext();
msg = sql_grant_func_privs(sql, grantee, privs, sname, func_id, grant,
grantor);
@@ -1259,12 +1259,12 @@ str
SQLrevoke_function(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{ mvc *sql = NULL;
str msg;
- str sname = *getArgReference_str(stk, pci, 1);
- int func_id = *getArgReference_int(stk, pci, 2);
+ str sname = *getArgReference_str(stk, pci, 1);
+ sqlid func_id = (sqlid) *getArgReference_int(stk, pci, 2);
char *grantee = *getArgReference_str(stk, pci, 3);
int privs = *getArgReference_int(stk, pci, 4);
int grant = *getArgReference_int(stk, pci, 5);
- int grantor = *getArgReference_int(stk, pci, 6);
+ sqlid grantor = (sqlid) *getArgReference_int(stk, pci, 6);
initcontext();
msg = sql_revoke_func_privs(sql, grantee, privs, sname, func_id, grant,
grantor);
@@ -1331,7 +1331,7 @@ SQLcreate_role(Client cntxt, MalBlkPtr m
str msg;
str sname = *getArgReference_str(stk, pci, 1);
char *role = sname;
- int grantor = *getArgReference_int(stk, pci, 3);
+ sqlid grantor = (sqlid)*getArgReference_int(stk, pci, 3);
initcontext();
msg = sql_create_role(sql, role, grantor);
@@ -1368,7 +1368,7 @@ SQLdrop_function(Client cntxt, MalBlkPtr
str msg;
str sname = *getArgReference_str(stk, pci, 1);
char *fname = *getArgReference_str(stk, pci, 2);
- int fid = *getArgReference_int(stk, pci, 3);
+ sqlid fid = (sqlid)*getArgReference_int(stk, pci, 3);
int type = *getArgReference_int(stk, pci, 4);
int action = *getArgReference_int(stk, pci, 5);
@@ -1508,7 +1508,7 @@ SQLcomment_on(Client cntxt, MalBlkPtr mb
{
mvc *sql = NULL;
str msg;
- int objid = *getArgReference_int(stk, pci, 1);
+ sqlid objid = (sqlid) *getArgReference_int(stk, pci, 1);
char *remark = *getArgReference_str(stk, pci, 2);
sql_trans *tx;
sql_schema *sys;
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -89,7 +89,7 @@ monet5_create_user(ptr _mvc, str user, s
oid uid = 0;
bat bid = 0;
str ret;
- int user_id;
+ sqlid user_id;
str pwd;
sql_schema *s = find_sql_schema(m->session->tr, "sys");
sql_table *db_user_info, *auths;
@@ -204,7 +204,7 @@ monet5_create_privileges(ptr _mvc, sql_s
sql_table *t, *uinfo;
mvc *m = (mvc *) _mvc;
char *err = NULL;
- int schema_id = 0;
+ sqlid schema_id = 0;
str monetdbuser = "monetdb";
list *res, *ops;
diff --git a/sql/common/sql_backend.c b/sql/common/sql_backend.c
--- a/sql/common/sql_backend.c
+++ b/sql/common/sql_backend.c
@@ -99,7 +99,7 @@ backend_rename_user(ptr mvc, str olduser
}
void*
-backend_schema_user_dependencies(ptr trans, int schema_id)
+backend_schema_user_dependencies(ptr trans, sqlid schema_id)
{
if (be_funcs.fschuserdep != NULL)
return(be_funcs.fschuserdep(trans, schema_id));
diff --git a/sql/common/sql_backend.h b/sql/common/sql_backend.h
--- a/sql/common/sql_backend.h
+++ b/sql/common/sql_backend.h
@@ -53,7 +53,7 @@ extern void backend_create_privileges(pt
extern int backend_schema_has_user(ptr mvc, sql_schema *s);
extern int backend_alter_user(ptr mvc, str user, str passwd, char enc,
sqlid schema_id, str oldpasswd);
extern int backend_rename_user(ptr mvc, str olduser, str newuser);
-extern void* backend_schema_user_dependencies(ptr trans, int schema_id);
+extern void* backend_schema_user_dependencies(ptr trans, sqlid schema_id);
extern int backend_resolve_function(ptr trans, sql_func *f);
extern backend_functions be_funcs;
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -226,7 +226,7 @@ extern void cs_del(changeset * cs, node
extern void *cs_transverse_with_validate(changeset * cs, void *elm, fvalidate
cmp);
extern int cs_size(changeset * cs);
extern node *cs_find_name(changeset * cs, const char *name);
-extern node *cs_find_id(changeset * cs, int id);
+extern node *cs_find_id(changeset * cs, sqlid id);
extern node *cs_first_node(changeset * cs);
extern node *cs_last_node(changeset * cs);
extern void cs_remove_node(changeset * cs, node *n);
@@ -255,8 +255,8 @@ typedef struct sql_trans {
typedef struct sql_schema {
sql_base base;
- int auth_id;
- int owner;
+ sqlid auth_id;
+ sqlid owner;
bit system; /* system or user schema */
// TODO? int type; /* persistent, session local, transaction local
*/
@@ -646,8 +646,8 @@ extern void idx_destroy(sql_idx * i);
extern int base_key(sql_base *b);
extern node *list_find_name(list *l, const char *name);
-extern node *list_find_id(list *l, int id);
-extern node *list_find_base_id(list *l, int id);
+extern node *list_find_id(list *l, sqlid id);
+extern node *list_find_base_id(list *l, sqlid id);
extern sql_key *find_sql_key(sql_table *t, const char *kname);
@@ -658,24 +658,24 @@ extern sql_column *find_sql_column(sql_t
extern sql_part *find_sql_part(sql_table *t, const char *tname);
extern sql_table *find_sql_table(sql_schema *s, const char *tname);
-extern sql_table *find_sql_table_id(sql_schema *s, int id);
-extern node *find_sql_table_node(sql_schema *s, int id);
+extern sql_table *find_sql_table_id(sql_schema *s, sqlid id);
+extern node *find_sql_table_node(sql_schema *s, sqlid id);
extern sql_sequence *find_sql_sequence(sql_schema *s, const char *sname);
extern sql_schema *find_sql_schema(sql_trans *t, const char *sname);
-extern sql_schema *find_sql_schema_id(sql_trans *t, int id);
-extern node *find_sql_schema_node(sql_trans *t, int id);
+extern sql_schema *find_sql_schema_id(sql_trans *t, sqlid id);
+extern node *find_sql_schema_node(sql_trans *t, sqlid id);
extern sql_type *find_sql_type(sql_schema * s, const char *tname);
extern sql_type *sql_trans_bind_type(sql_trans *tr, sql_schema *s, const char
*name);
-extern node *find_sql_type_node(sql_schema *s, int id);
+extern node *find_sql_type_node(sql_schema *s, sqlid id);
extern sql_func *find_sql_func(sql_schema * s, const char *tname);
extern list *find_all_sql_func(sql_schema * s, const char *tname, int type);
extern sql_func *sql_trans_bind_func(sql_trans *tr, const char *name);
-extern sql_func *sql_trans_find_func(sql_trans *tr, int id);
-extern node *find_sql_func_node(sql_schema *s, int id);
+extern sql_func *sql_trans_find_func(sql_trans *tr, sqlid id);
+extern node *find_sql_func_node(sql_schema *s, sqlid id);
extern void *sql_values_list_element_validate_and_insert(void *v1, void *v2,
int* res);
extern void *sql_range_part_validate_and_insert(void *v1, void *v2);
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
@@ -1351,7 +1351,7 @@ rel_create_schema(mvc *sql, dlist *auth_
{
char *name = dlist_get_schema_name(auth_name);
char *auth = schema_auth(auth_name);
- int auth_id = sql->role_id;
+ sqlid auth_id = sql->role_id;
if (auth && (auth_id = sql_find_auth(sql, auth)) < 0) {
sql_error(sql, 02, SQLSTATE(28000) "CREATE SCHEMA: no such
authorization '%s'", auth);
diff --git a/sql/server/rel_sequence.c b/sql/server/rel_sequence.c
--- a/sql/server/rel_sequence.c
+++ b/sql/server/rel_sequence.c
@@ -16,7 +16,7 @@
char*
sql_next_seq_name(mvc *m)
{
- int id = store_next_oid();
+ sqlid id = store_next_oid();
size_t len = 5 + 10; /* max nr of digits of (4 bytes) int is 10 */
char *msg = sa_alloc(m->sa, len);
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
@@ -1087,7 +1087,7 @@ mvc_drop_all_func(mvc *m, sql_schema *s,
}
sql_schema *
-mvc_create_schema(mvc *m, const char *name, int auth_id, int owner)
+mvc_create_schema(mvc *m, const char *name, sqlid auth_id, int owner)
{
sql_schema *s = NULL;
@@ -1381,34 +1381,32 @@ mvc_drop_column(mvc *m, sql_table *t, sq
}
void
-mvc_create_dependency(mvc *m, int id, int depend_id, int depend_type)
+mvc_create_dependency(mvc *m, sqlid id, sqlid depend_id, sht depend_type)
{
if (mvc_debug)
fprintf(stderr, "#mvc_create_dependency %d %d %d\n", id,
depend_id, depend_type);
if ( (id != depend_id) || (depend_type == BEDROPPED_DEPENDENCY) )
sql_trans_create_dependency(m->session->tr, id, depend_id,
depend_type);
-
}
void
-mvc_create_dependencies(mvc *m, list *id_l, sqlid depend_id, int dep_type)
+mvc_create_dependencies(mvc *m, list *id_l, sqlid depend_id, sht dep_type)
{
node *n = id_l->h;
int i;
-
+
if (mvc_debug)
fprintf(stderr, "#mvc_create_dependencies on %d of type %d\n",
depend_id, dep_type);
for (i = 0; i < list_length(id_l); i++)
{
- mvc_create_dependency(m, *(int *) n->data, depend_id, dep_type);
+ mvc_create_dependency(m, *(sqlid *) n->data, depend_id,
dep_type);
n = n->next;
}
-
}
int
-mvc_check_dependency(mvc * m, int id, int type, list *ignore_ids)
+mvc_check_dependency(mvc * m, sqlid id, sht type, list *ignore_ids)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
