Changeset: 587dbda15060 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/587dbda15060
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/server/rel_psm.c
Branch: default
Log Message:
Don't pass pointer to client's ID
diffs (40 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1111,6 +1111,7 @@ backend_create_mal_func(mvc *m, sql_func
if (!f->instantiated) {
char *F = NULL, *fn = NULL;
bit side_effect = f->side_effect;
+ int clientid = m->clientid;
FUNC_TYPE_STR(f->type, F, fn)
(void) F;
@@ -1123,7 +1124,7 @@ backend_create_mal_func(mvc *m, sql_func
unlock_function(m->store, f->base.id);
return -1;
}
- if (!backend_resolve_function(&(m->clientid), f)) {
+ if (!backend_resolve_function(&clientid, f)) {
(void) sql_error(m, 02, SQLSTATE(3F000) "MAL external
name %s.%s not bound (%s.%s)", f->mod, f->imp, f->s->base.name, f->base.name);
_DELETE(f->imp);
unlock_function(m->store, f->base.id);
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -995,6 +995,7 @@ rel_create_func(sql_query *query, dlist
if (instantiate || deps)
return rel_psm_block(sql->sa, b);
} else { /* MAL implementation */
+ int clientid = sql->clientid;
char *fmod = qname_module(ext_name);
char *fnme = qname_schema_object(ext_name);
@@ -1017,7 +1018,7 @@ rel_create_func(sql_query *query, dlist
break;
}
/* instantiate MAL functions while being created. This
also sets the side-effects flag */
- if (!backend_resolve_function(&(sql->clientid), f))
+ if (!backend_resolve_function(&clientid, f))
return sql_error(sql, 02, SQLSTATE(3F000)
"CREATE %s: external name %s.%s not bound (%s.%s)", F, fmod, fnme,
s->base.name, fname );
f->instantiated = TRUE;
} else if (!sf) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
