Changeset: ecc1eefb4054 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ecc1eefb4054
Modified Files:
geom/monetdb5/geom.c
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mcurl.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/streams.c
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/iterator.c
monetdb5/modules/mal/json_util.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/manual.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/oltp.c
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/projectionpath.c
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/txtsim.c
monetdb5/optimizer/opt_aliases.c
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_jit.c
monetdb5/optimizer/opt_json.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_matpack.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_oltp.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_querylog.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_volcano.c
monetdb5/optimizer/opt_wlc.c
monetdb5/optimizer/opt_wrapper.c
monetdb5/scheduler/run_adder.c
monetdb5/scheduler/run_memo.c
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/UDF/cudf/udf.c
sql/backends/monet5/UDF/pyapi/connection.c
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/generator/generator.c
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/netcdf/netcdf.c
Branch: data-vaults
Log Message:
Merge with default
diffs (truncated from 5150 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
@@ -4624,7 +4624,7 @@ wkbBox2D(mbr **box, wkb **point1, wkb **
//Assign the coordinates. Ensure that they are in correct order
*box = GDKmalloc(sizeof(mbr));
if (*box == NULL) {
- err = createException(MAL, SQLSTATE(38000)
"geom.MakeBox2D", MAL_MALLOC_FAIL);
+ err = createException(MAL, "geom.MakeBox2D",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
} else {
(*box)->xmin = (float) (xmin < xmax ? xmin : xmax);
(*box)->ymin = (float) (ymin < ymax ? ymin : ymax);
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -268,7 +268,7 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
args = (str*) GDKzalloc(sizeof(str) * pci->argc);
if (args == NULL) {
- throw(MAL, "rapi.eval", MAL_MALLOC_FAIL);
+ throw(MAL, "rapi.eval", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
// get the lock even before initialization of the R interpreter, as
this can take a second and must be done only once.
@@ -312,21 +312,21 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
if (!isaBatType(getArgType(mb,pci,i))) {
b = COLnew(0, getArgType(mb, pci, i), 0, TRANSIENT);
if (b == NULL) {
- msg = createException(MAL, "rapi.eval",
MAL_MALLOC_FAIL);
+ msg = createException(MAL, "rapi.eval",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto wrapup;
}
if ( getArgType(mb,pci,i) == TYPE_str) {
if (BUNappend(b, *getArgReference_str(stk, pci,
i), FALSE) != GDK_SUCCEED) {
BBPreclaim(b);
b = NULL;
- msg = createException(MAL, "rapi.eval",
MAL_MALLOC_FAIL);
+ msg = createException(MAL, "rapi.eval",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto wrapup;
}
} else {
if (BUNappend(b, getArgReference(stk, pci, i),
FALSE) != GDK_SUCCEED) {
BBPreclaim(b);
b = NULL;
- msg = createException(MAL, "rapi.eval",
MAL_MALLOC_FAIL);
+ msg = createException(MAL, "rapi.eval",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto wrapup;
}
}
@@ -335,7 +335,7 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
} else {
b = BATdescriptor(*getArgReference_bat(stk, pci, i));
if (b == NULL) {
- msg = createException(MAL, "rapi.eval",
MAL_MALLOC_FAIL);
+ msg = createException(MAL, "rapi.eval",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto wrapup;
}
}
@@ -369,7 +369,7 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
pos = 0;
argnames = malloc(argnameslen);
if (argnames == NULL) {
- msg = createException(MAL, "rapi.eval", MAL_MALLOC_FAIL);
+ msg = createException(MAL, "rapi.eval", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
goto wrapup;
}
argnames[0] = '\0';
@@ -380,7 +380,7 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
rcalllen = 2 * pos + strlen(exprStr) + 100;
rcall = malloc(rcalllen);
if (rcall == NULL) {
- msg = createException(MAL, "rapi.eval", MAL_MALLOC_FAIL);
+ msg = createException(MAL, "rapi.eval", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
goto wrapup;
}
snprintf(rcall, rcalllen,
@@ -453,7 +453,7 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
BATiter li = bat_iterator(b);
if (VALinit(&stk->stk[pci->argv[i]], bat_type,
BUNtail(li, 0)) == NULL) { //
TODO BUNtail here
- msg = createException(MAL, "rapi.eval",
MAL_MALLOC_FAIL);
+ msg = createException(MAL, "rapi.eval",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto wrapup;
}
}
diff --git a/monetdb5/mal/mal_atom.c b/monetdb5/mal/mal_atom.c
--- a/monetdb5/mal/mal_atom.c
+++ b/monetdb5/mal/mal_atom.c
@@ -183,7 +183,7 @@ malAtomDefinition(str name, int tpe)
i = ATOMallocate(name);
if (i == int_nil)
- throw(TYPE,"atomDefinition", MAL_MALLOC_FAIL);
+ throw(TYPE,"atomDefinition", SQLSTATE(HY001) MAL_MALLOC_FAIL);
/* overload atom ? */
if (tpe) {
BATatoms[i] = BATatoms[tpe];
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -172,7 +172,7 @@ AUTHinitTables(const char *passwd) {
if (!bid) {
user = COLnew(0, TYPE_str, 256, PERSISTENT);
if (user == NULL)
- throw(MAL, "initTables.user", MAL_MALLOC_FAIL " user
table");
+ throw(MAL, "initTables.user", SQLSTATE(HY001)
MAL_MALLOC_FAIL " user table");
if (BATkey(user, TRUE) != GDK_SUCCEED ||
BBPrename(BBPcacheid(user), "M5system_auth_user") != 0
||
@@ -194,7 +194,7 @@ AUTHinitTables(const char *passwd) {
if (!bid) {
pass = COLnew(0, TYPE_str, 256, PERSISTENT);
if (pass == NULL)
- throw(MAL, "initTables.passwd", MAL_MALLOC_FAIL "
password table");
+ throw(MAL, "initTables.passwd", SQLSTATE(HY001)
MAL_MALLOC_FAIL " password table");
if (BBPrename(BBPcacheid(pass), "M5system_auth_passwd_v2") != 0
||
BATmode(pass, PERSISTENT) != GDK_SUCCEED) {
@@ -215,7 +215,7 @@ AUTHinitTables(const char *passwd) {
if (!bid) {
duser = COLnew(0, TYPE_oid, 256, PERSISTENT);
if (duser == NULL)
- throw(MAL, "initTables.duser", MAL_MALLOC_FAIL "
deleted user table");
+ throw(MAL, "initTables.duser", SQLSTATE(HY001)
MAL_MALLOC_FAIL " deleted user table");
if (BBPrename(BBPcacheid(duser), "M5system_auth_deleted") != 0
||
BATmode(duser, PERSISTENT) != GDK_SUCCEED) {
@@ -345,7 +345,7 @@ AUTHaddUser(oid *uid, Client cntxt, cons
if (BUNappend(user, username, TRUE) != GDK_SUCCEED ||
BUNappend(pass, hash, TRUE) != GDK_SUCCEED) {
GDKfree(hash);
- throw(MAL, "addUser", MAL_MALLOC_FAIL);
+ throw(MAL, "addUser", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
GDKfree(hash);
/* retrieve the oid of the just inserted user */
@@ -388,7 +388,7 @@ AUTHremoveUser(Client cntxt, const char
/* now, we got the oid, start removing the related tuples */
if (BUNappend(duser, &id, TRUE) != GDK_SUCCEED)
- throw(MAL, "removeUser", MAL_MALLOC_FAIL);
+ throw(MAL, "removeUser", SQLSTATE(HY001) MAL_MALLOC_FAIL);
/* make the stuff persistent */
AUTHcommit();
@@ -558,7 +558,7 @@ AUTHresolveUser(str *username, oid uid)
assert(username != NULL);
useri = bat_iterator(user);
if ((*username = GDKstrdup((str)(BUNtail(useri, p)))) == NULL)
- throw(MAL, "resolveUser", MAL_MALLOC_FAIL);
+ throw(MAL, "resolveUser", SQLSTATE(HY001) MAL_MALLOC_FAIL);
return(MAL_SUCCEED);
}
@@ -583,7 +583,7 @@ AUTHgetUsername(str *username, Client cn
useri = bat_iterator(user);
if ((*username = GDKstrdup( BUNtail(useri, p))) == NULL)
- throw(MAL, "getUsername", MAL_MALLOC_FAIL);
+ throw(MAL, "getUsername", SQLSTATE(HY001) MAL_MALLOC_FAIL);
return(MAL_SUCCEED);
}
@@ -600,7 +600,7 @@ AUTHgetUsers(BAT **ret1, BAT **ret2, Cli
*ret1 = BATdense(user->hseqbase, user->hseqbase, BATcount(user));
if (*ret1 == NULL)
- throw(MAL, "getUsers", MAL_MALLOC_FAIL);
+ throw(MAL, "getUsers", SQLSTATE(HY001) MAL_MALLOC_FAIL);
if (BATcount(duser)) {
bn = BATdiff(*ret1, duser, NULL, NULL, 0, BUN_NONE);
BBPunfix((*ret1)->batCacheid);
@@ -614,7 +614,7 @@ AUTHgetUsers(BAT **ret1, BAT **ret2, Cli
BBPunfix((*ret1)->batCacheid);
if (*ret2)
BBPunfix((*ret2)->batCacheid);
- throw(MAL, "getUsers", MAL_MALLOC_FAIL);
+ throw(MAL, "getUsers", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
return(NULL);
}
@@ -675,7 +675,7 @@ AUTHunlockVault(const char *password)
GDKfree(vaultKey);
if ((vaultKey = GDKstrdup(password)) == NULL)
- throw(MAL, "unlockVault", MAL_MALLOC_FAIL " vault key");
+ throw(MAL, "unlockVault", SQLSTATE(HY001) MAL_MALLOC_FAIL "
vault key");
return(MAL_SUCCEED);
}
@@ -712,7 +712,7 @@ AUTHdecypherValue(str *ret, const char *
throw(MAL, "decypherValue", "The vault is still locked!");
w = r = GDKmalloc(sizeof(char) * (strlen(value) + 1));
if( r == NULL)
- throw(MAL, "decypherValue", MAL_MALLOC_FAIL);
+ throw(MAL, "decypherValue", SQLSTATE(HY001) MAL_MALLOC_FAIL);
keylen = (int) strlen(vaultKey);
@@ -754,7 +754,7 @@ AUTHcypherValue(str *ret, const char *va
throw(MAL, "cypherValue", "The vault is still locked!");
w = r = GDKmalloc(sizeof(char) * (strlen(value) * 2 + 1));
if( r == NULL)
- throw(MAL, "cypherValue", MAL_MALLOC_FAIL);
+ throw(MAL, "cypherValue", SQLSTATE(HY001) MAL_MALLOC_FAIL);
keylen = (int) strlen(vaultKey);
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -556,7 +556,7 @@ DFLOWinitBlk(DataFlow flow, MalBlkPtr mb
PARDEBUG fprintf(stderr, "#Initialize dflow block\n");
assign = (int *) GDKzalloc(mb->vtop * sizeof(int));
if (assign == NULL)
- throw(MAL, "dataflow", MAL_MALLOC_FAIL);
+ throw(MAL, "dataflow", SQLSTATE(HY001) MAL_MALLOC_FAIL);
etop = flow->stop - flow->start;
for (n = 0, pc = flow->start; pc < flow->stop; pc++, n++) {
p = getInstrPtr(mb, pc);
@@ -595,13 +595,13 @@ DFLOWinitBlk(DataFlow flow, MalBlkPtr mb
tmp = (int*)
GDKrealloc(flow->nodes, sizeof(int) * 2 * size);
if (tmp == NULL) {
GDKfree(assign);
- throw(MAL, "dataflow",
MAL_MALLOC_FAIL);
+ throw(MAL, "dataflow",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
flow->nodes = tmp;
tmp = (int*)
GDKrealloc(flow->edges, sizeof(int) * 2 * size);
if (tmp == NULL) {
GDKfree(assign);
- throw(MAL, "dataflow",
MAL_MALLOC_FAIL);
+ throw(MAL, "dataflow",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
flow->edges = tmp;
size *=2;
@@ -639,13 +639,13 @@ DFLOWinitBlk(DataFlow flow, MalBlkPtr mb
tmp = (int*)
GDKrealloc(flow->nodes, sizeof(int) * 2 * size);
if (tmp == NULL) {
GDKfree(assign);
- throw(MAL,
"dataflow", MAL_MALLOC_FAIL);
+ throw(MAL,
"dataflow", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
flow->nodes = tmp;
tmp = (int*)
GDKrealloc(flow->edges, sizeof(int) * 2 * size);
if (tmp == NULL) {
GDKfree(assign);
- throw(MAL,
"dataflow", MAL_MALLOC_FAIL);
+ throw(MAL,
"dataflow", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
flow->edges = tmp;
size *=2;
@@ -904,7 +904,7 @@ runMALdataflow(Client cntxt, MalBlkPtr m
flow = (DataFlow)GDKzalloc(sizeof(DataFlowRec));
if (flow == NULL)
- throw(MAL, "dataflow", MAL_MALLOC_FAIL);
+ throw(MAL, "dataflow", SQLSTATE(HY001) MAL_MALLOC_FAIL);
flow->cntxt = cntxt;
flow->mb = mb;
@@ -928,7 +928,7 @@ runMALdataflow(Client cntxt, MalBlkPtr m
q_destroy(flow->done);
MT_lock_destroy(&flow->flowlock);
GDKfree(flow);
- throw(MAL, "dataflow", MAL_MALLOC_FAIL);
+ throw(MAL, "dataflow", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
size = DFLOWgraphSize(mb, startpc, stoppc);
size += stoppc - startpc;
@@ -938,7 +938,7 @@ runMALdataflow(Client cntxt, MalBlkPtr m
q_destroy(flow->done);
MT_lock_destroy(&flow->flowlock);
GDKfree(flow);
- throw(MAL, "dataflow", MAL_MALLOC_FAIL);
+ throw(MAL, "dataflow", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
flow->edges = (int*)GDKzalloc(sizeof(int) * size);
if (flow->edges == NULL) {
@@ -947,7 +947,7 @@ runMALdataflow(Client cntxt, MalBlkPtr m
q_destroy(flow->done);
MT_lock_destroy(&flow->flowlock);
GDKfree(flow);
- throw(MAL, "dataflow", MAL_MALLOC_FAIL);
+ throw(MAL, "dataflow", SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
msg = DFLOWinitBlk(flow, mb, size);
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
@@ -96,7 +96,7 @@ createException(enum malexception type,
if (GDKerrbuf &&
/* prevent recursion
* note, sizeof("string") includes terminating NULL byte */
- strncmp(format, MAL_MALLOC_FAIL ":", sizeof(MAL_MALLOC_FAIL))
!= 0 &&
+ strncmp(format, SQLSTATE(HY001) MAL_MALLOC_FAIL ":",
sizeof(MAL_MALLOC_FAIL)) != 0 &&
(strncmp(GDKerrbuf, "GDKmalloc", 9) == 0 ||
strncmp(GDKerrbuf, "GDKrealloc", 10) == 0 ||
strncmp(GDKerrbuf, "GDKzalloc", 9) == 0 ||
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
