Changeset: 031824f65828 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=031824f65828
Modified Files:
geom/monetdb5/geom.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_support.c
monetdb5/scheduler/srvpool.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/bam/bam_globals.h
sql/backends/monet5/vaults/bam/bam_loader.c
tools/merovingian/daemon/controlrunner.c
tools/mserver/mserver5.c
Branch: default
Log Message:
Use freeException() to free exception strings.
diffs (truncated from 502 to 300 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2236,7 +2236,7 @@ wkbaFROMSTR_withSRID(char *fromStr, int
size_t parsedBytes;
str err = wkbFROMSTR_withSRID(fromStr + skipBytes, len,
&(*toArray)->data[i], srid, &parsedBytes);
if (err != MAL_SUCCEED) {
- GDKfree(err);
+ freeException(err);
return 0;
}
skipBytes += parsedBytes;
@@ -3272,7 +3272,7 @@ wkbMakeLineAggr(wkb **outWKB, bat *inBAT
err = wkbFromWKB(outWKB, &aWKB);
BBPunfix(inBAT->batCacheid);
if (err) {
- GDKfree(err);
+ freeException(err);
throw(MAL, "geom.MakeLine", MAL_MALLOC_FAIL);
}
return MAL_SUCCEED;
@@ -4223,7 +4223,7 @@ wkbUnionAggr(wkb **outWKB, bat *inBAT_id
err = wkbFromWKB(outWKB, &aWKB);
BBPunfix(inBAT->batCacheid);
if (err) {
- GDKfree(err);
+ freeException(err);
throw(MAL, "geom.Union", MAL_MALLOC_FAIL);
}
return MAL_SUCCEED;
@@ -5096,7 +5096,7 @@ wkbFROMSTR(char *geomWKT, int *len, wkb
err = wkbFROMSTR_withSRID(geomWKT, len, geomWKB, 0, &parsedBytes);
if (err != MAL_SUCCEED) {
- GDKfree(err);
+ freeException(err);
return 0;
}
return (int) parsedBytes;
diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -561,7 +561,7 @@ pushNilType(MalBlkPtr mb, InstrPtr q, ch
cst.len = 0;
msg = convertConstant(idx, &cst);
if (msg != MAL_SUCCEED) {
- GDKfree(msg);
+ freeException(msg);
return NULL;
}
_t = defConstant(mb,idx,&cst);
@@ -583,7 +583,7 @@ pushType(MalBlkPtr mb, InstrPtr q, int t
cst.len = 0;
msg = convertConstant(tpe, &cst);
if (msg != MAL_SUCCEED) {
- GDKfree(msg);
+ freeException(msg);
return NULL;
}
_t = defConstant(mb,tpe,&cst);
@@ -606,7 +606,7 @@ pushZero(MalBlkPtr mb, InstrPtr q, int t
cst.len = 0;
msg = convertConstant(tpe, &cst);
if (msg != MAL_SUCCEED) {
- GDKfree(msg);
+ freeException(msg);
return NULL;
}
_t = defConstant(mb,tpe,&cst);
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -248,7 +248,7 @@ MCinitClientRecord(Client c, oid user, b
{
str msg = AUTHgetUsername(&c->username, c);
if (msg) /* shouldn't happen */
- GDKfree(msg);
+ freeException(msg);
}
#endif
MT_sema_init(&c->s, 0, "Client->s");
diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -236,7 +236,7 @@ showScriptException(stream *out, MalBlkP
va_end(ap);
dumpExceptionsToStream(out,msg);
- GDKfree(msg);
+ freeException(msg);
}
/**
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -296,7 +296,7 @@ evalFile(Client c, str fname, int listin
msg = runScenario(c);
if (msg != MAL_SUCCEED) {
dumpExceptionsToStream(c->fdout, msg);
- GDKfree(msg);
+ freeException(msg);
}
}
filename = p + 1;
@@ -395,7 +395,7 @@ compileString(Symbol *fcn, Client c, str
#define runPhase(X, Y) \
if (msg == MAL_SUCCEED && c->phase[X] && (msg = (str)
(*c->phase[X])(c))) { \
/* error occurred and ignored */ \
- GDKfree(msg); msg = MAL_SUCCEED; \
+ freeException(msg); msg = MAL_SUCCEED; \
Y; \
if (b) \
GDKfree(b); \
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -1159,7 +1159,7 @@ defConstant(MalBlkPtr mb, int type, ValP
GDKfree(ft);
GDKfree(tt);
mb->errors++;
- GDKfree(msg);
+ freeException(msg);
} else {
assert(cst->vtype == type);
}
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -42,7 +42,7 @@ malBootstrap(void)
assert(c != NULL);
c->nspace = newModule(NULL, putName("user"));
if ( (msg = defaultScenario(c)) ) {
- GDKfree(msg);
+ freeException(msg);
GDKerror("malBootstrap:Failed to initialise default scenario");
return 0;
}
@@ -262,7 +262,7 @@ MSscheduleClient(str command, str challe
if (err != MAL_SUCCEED) {
mnstr_printf(fout, "!%s\n", err);
exit_streams(fin, fout);
- GDKfree(err);
+ freeException(err);
GDKfree(command);
return;
}
@@ -450,7 +450,7 @@ MSserveClient(void *dummy)
if (msg) {
showException(c->fdout, MAL, "serveClient", "could not
initialize default scenario");
c->mode = RUNCLIENT;
- GDKfree(msg);
+ freeException(msg);
} else {
do {
do {
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -825,7 +825,7 @@ str RMTregisterInternal(Client cntxt, st
mod, fcn);
} else {
/* we basically hope/assume this is a "doesn't exist" error */
- GDKfree(msg);
+ freeException(msg);
}
if (mhdl)
mapi_close_handle(mhdl);
diff --git a/monetdb5/optimizer/opt_evaluate.c
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -230,7 +230,7 @@ OPTevaluateImplementation(Client cntxt,
#ifdef DEBUG_OPT_EVALUATE
fprintf(stderr, "Evaluated %s\n", msg);
#endif
- GDKfree(msg);
+ freeException(msg);
msg= MAL_SUCCEED;
mb->errors = 0;
}
diff --git a/monetdb5/optimizer/opt_macro.c b/monetdb5/optimizer/opt_macro.c
--- a/monetdb5/optimizer/opt_macro.c
+++ b/monetdb5/optimizer/opt_macro.c
@@ -409,7 +409,7 @@ OPTmacroImplementation(Client cntxt, Mal
// failures from the macro expansion
are ignored
// They leave the scene as is
if ( msg)
- GDKfree(msg);
+ freeException(msg);
}
}
}
@@ -490,7 +490,7 @@ str OPTmacro(Client cntxt, MalBlkPtr mb,
msg= OPTmacroImplementation(cntxt,mb,stk,p);
// similar to OPTmacro
if( msg)
- GDKfree(msg);
+ freeException(msg);
/* Defense line against incorrect plans */
chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -125,7 +125,7 @@ optimizeMALBlock(Client cntxt, MalBlkPtr
str place = getExceptionPlace(msg);
str nmsg =
createException(getExceptionType(msg), place, "%s", getExceptionMessage(msg));
if (nmsg && place) {
- GDKfree(msg);
+ freeException(msg);
msg = nmsg;
GDKfree(place);
}
diff --git a/monetdb5/scheduler/srvpool.c b/monetdb5/scheduler/srvpool.c
--- a/monetdb5/scheduler/srvpool.c
+++ b/monetdb5/scheduler/srvpool.c
@@ -179,7 +179,7 @@ SRVPOOLdisconnect(Client cntxt)
for ( i=0; i< srvtop; i++)
if ( servers[i].conn != NULL ) {
if( msg)
- GDKfree(msg);
+ freeException(msg);
msg = RMTdisconnect(cntxt,&servers[i].conn);
GDKfree(servers[i].conn);
servers[i].conn = NULL;
@@ -288,7 +288,7 @@ SRVPOOLdiscover(Client cntxt)
#endif
/* Upon receiving an
initialization error, the entry should be ignored */
SRVPOOLdropServer(j);
- GDKfree(msg);
+ freeException(msg);
msg = MAL_SUCCEED;
}
}
@@ -307,7 +307,7 @@ SRVPOOLdiscover(Client cntxt)
#ifdef DEBUG_RUN_SRVPOOL
fprintf(stderr,"#%s\n", msg);
#endif
- GDKfree(msg);
+ freeException(msg);
msg = MAL_SUCCEED;
}
@@ -325,7 +325,7 @@ SRVPOOLdiscover(Client cntxt)
fprintf(stderr,"#Worker site %d connection %s %s\n", j,
servers[j].conn, s);
#endif
} else
- GDKfree(msg);
+ freeException(msg);
}
#ifdef DEBUG_RUN_SRVPOOL
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
@@ -376,7 +376,7 @@ SQLstatementIntern(Client c, str *expr,
sql = (backend *) c->sqlcontext;
}
if (msg){
- GDKfree(msg);
+ freeException(msg);
throw(SQL, "SQLstatement", "Catalogue not available");
}
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -241,7 +241,7 @@ SQLoptimizeQuery(Client c, MalBlkPtr mb)
if (be->mvc->debug) {
msg = runMALDebugger(c, c->curprg->def);
if (msg != MAL_SUCCEED)
- GDKfree(msg); /* ignore error */
+ freeException(msg); /* ignore error */
}
return NULL;
}
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
@@ -74,7 +74,7 @@ monet5_freecode(int clientid, backend_co
(void) clientid;
msg = SQLCacheRemove(MCgetClient(clientid), name);
if (msg)
- GDKfree(msg); /* do something with error? */
+ freeException(msg); /* do something with error? */
#ifdef _SQL_SCENARIO_DEBUG
fprintf(stderr, "#monet5_free:%d\n", nr);
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1356,7 +1356,7 @@ argumentZero(MalBlkPtr mb, int tpe)
cst.val.ival = 0;
msg = convertConstant(tpe, &cst);
if( msg)
- GDKfree(msg); // will not be called
+ freeException(msg); // will not be called
return defConstant(mb, tpe, &cst);
}
*/
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
