Changeset: d91b9ee0ed7b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d91b9ee0ed7b
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/server/sql_mvc.c
sql/server/sqlparse.c
Branch: resource_management
Log Message:
name allocators
diffs (167 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
@@ -332,7 +332,7 @@ create_table_or_view(mvc *sql, char *sna
break;
}
osa = sql->sa;
- allocator *nsa = sql->sa = create_allocator(ma_get_parent(osa), NULL,
false);
+ allocator *nsa = sql->sa = create_allocator(ma_get_parent(osa),
"MA_mvc", false);
/* first check default values */
for (n = ol_first_node(t->columns); n; n = n->next) {
sql_column *c = n->data;
@@ -5251,7 +5251,7 @@ str_vacuum_callback(int argc, void *argv
(void) argc;
- if ((sa = create_allocator(NULL, NULL, false)) == NULL) {
+ if ((sa = create_allocator(NULL, "MA_str_vacuum", false)) == NULL) {
TRC_ERROR(SQL_EXECUTION, "[str_vacuum_callback] -- Failed to
create allocator!");
return GDK_FAIL;
}
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
@@ -595,7 +595,7 @@ create_trigger(mvc *sql, char *sname, ch
sql_rel *r = NULL;
allocator *sa = sql->sa;
- if (!(sql->sa = create_allocator(sql->pa, NULL,
false))) {
+ if (!(sql->sa = create_allocator(sql->pa, "MA_mvc",
false))) {
sql->sa = sa;
throw(SQL, "sql.create_trigger",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
@@ -1091,7 +1091,7 @@ create_func(mvc *sql, char *sname, char
allocator *sa = sql->sa;
assert(nf->query);
- if (!(sql->sa = create_allocator(sql->pa, NULL, false))) {
+ if (!(sql->sa = create_allocator(sql->pa, "MA_mvc", false))) {
sql->sa = sa;
throw(SQL, "sql.create_func", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -240,7 +240,7 @@ SQLstatementIntern(Client c, const char
m->params = NULL;
m->session->auto_commit = 0;
if (!m->sa) {
- if (!(m->sa = create_allocator(m->pa, NULL, false)) ) {
+ if (!(m->sa = create_allocator(m->pa, "MA_mvc", false)) ) {
msg =
createException(SQL,"sql.statement",SQLSTATE(HY013) MAL_MALLOC_FAIL);
goto endofcompile;
}
@@ -436,7 +436,7 @@ RAstatement(Client c, MalBlkPtr mb, MalS
if ((msg = SQLtrans(m)) != MAL_SUCCEED)
return msg;
if (!m->sa)
- m->sa = create_allocator(m->pa, NULL, false);
+ m->sa = create_allocator(m->pa, "MA_mvc", false);
if (!m->sa)
return RAcommit_statement(be,
createException(SQL,"RAstatement",SQLSTATE(HY013) MAL_MALLOC_FAIL));
refs = sa_list(m->sa);
@@ -551,7 +551,7 @@ RAstatement2(Client cntxt, MalBlkPtr mb,
if ((msg = SQLtrans(m)) != MAL_SUCCEED)
return msg;
if (!m->sa)
- m->sa = create_allocator(m->pa, NULL, false);
+ m->sa = create_allocator(m->pa, "MA_mvc", false);
if (!m->sa)
return RAstatement2_return(be, m, nlevels, gvars, gentries,
createException(SQL,"RAstatement2",SQLSTATE(HY013) MAL_MALLOC_FAIL));
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -362,7 +362,7 @@ SQLexecPostLoginTriggers(Client c)
Symbol curprg = c->curprg;
allocator *sa = m->sa;
- if (!(m->sa = create_allocator(m->pa,
NULL, false))) {
+ if (!(m->sa = create_allocator(m->pa,
"MA_mvc", false))) {
m->sa = sa;
throw(SQL,
"sql.SQLexecPostLoginTriggers", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
@@ -478,7 +478,7 @@ SQLprepareClient(Client c, const char *p
if (msg)
return msg;
if (c->sqlcontext == 0) {
- allocator *sa = create_allocator(NULL, NULL, false);
+ allocator *sa = create_allocator(NULL, "PA_mvc", false);
if (sa == NULL) {
msg = createException(SQL,"sql.initClient",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
goto bailout2;
@@ -818,7 +818,7 @@ SQLinit(Client c, const char *initpasswd
TRC_INFO(SQL_PARSER, "%s\n", msg);
} else { /* handle upgrades */
if (!m->sa) {
- m->sa = create_allocator(m->pa, NULL, false);
+ m->sa = create_allocator(m->pa, "MA_mvc", false);
if (!m->sa)
msg = createException(MAL, "createdb",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
@@ -1679,7 +1679,7 @@ SQLparser(Client c, backend *be)
/* sqlparse needs sql allocator to be available. It can be NULL at
* this point if this is a recursive call. */
if (m->sa == NULL) {
- m->sa = create_allocator(m->pa, NULL, false);
+ m->sa = create_allocator(m->pa, "MA_mvc", false);
if (m->sa == NULL) {
c->mode = FINISHCLIENT;
throw(SQL, "SQLparser", SQLSTATE(HY013) MAL_MALLOC_FAIL
" for SQL allocator");
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2304,7 +2304,7 @@ sql_update_jun2023(Client c, mvc *sql, s
/* new function sys.regexp_replace */
allocator *old_sa = sql->sa;
- if ((sql->sa = create_allocator(sql->pa, NULL, false)) != NULL) {
+ if ((sql->sa = create_allocator(sql->pa, "MA_mvc", false)) != NULL) {
list *l;
if ((l = sa_list(sql->sa)) != NULL) {
sql_subtype tp;
@@ -3127,7 +3127,7 @@ sql_update_dec2023(Client c, mvc *sql, s
/* 52_describe.sql New function sys.sql_datatype(mtype varchar(999),
digits integer, tscale integer, nameonly boolean, shortname boolean) */
allocator *old_sa = sql->sa;
- if ((sql->sa = create_allocator(sql->pa, NULL, false)) != NULL) {
+ if ((sql->sa = create_allocator(sql->pa, "MA_mvc", false)) != NULL) {
list *l;
if ((l = sa_list(sql->sa)) != NULL) {
sql_subtype t1, t2;
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
@@ -164,7 +164,7 @@ mvc_init(int debug, store_type store_tpe
}
assert(m->sa == NULL);
- m->sa = create_allocator(m->pa, NULL, false);
+ m->sa = create_allocator(m->pa, "MA_mvc", false);
if (!m->sa) {
mvc_destroy(m);
mvc_exit(store);
diff --git a/sql/server/sqlparse.c b/sql/server/sqlparse.c
--- a/sql/server/sqlparse.c
+++ b/sql/server/sqlparse.c
@@ -79,7 +79,7 @@ static mvc *
mvc_new( bstream *rs, stream *ws) {
mvc *m;
- allocator *pa = create_allocator(NULL, NULL, false);
+ allocator *pa = create_allocator(NULL, "PA_mvc", false);
m = SA_ZNEW(pa, mvc);
if (!m)
return NULL;
@@ -92,8 +92,8 @@ mvc_new( bstream *rs, stream *ws) {
m->qc = NULL;
m->pa = pa;
- m->sa = create_allocator(m->pa, NULL, false);
- m->ta = create_allocator(m->pa, NULL, false);
+ m->sa = create_allocator(m->pa, "MA_mvc", false);
+ m->ta = create_allocator(m->pa, "TA_mvc", false);
#ifdef __has_builtin
#if __has_builtin(__builtin_frame_address)
m->sp = (uintptr_t) __builtin_frame_address(0);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
