Changeset: 4d5e564c08c6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d5e564c08c6
Modified Files:
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_parser.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.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/group.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/orderidx.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/transaction.c
monetdb5/modules/mal/txtsim.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_pipes.c
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
Branch: default
Log Message:
Added some missing SQL error codes
diffs (truncated from 2248 to 300 lines):
diff --git a/monetdb5/mal/mal_factory.c b/monetdb5/mal/mal_factory.c
--- a/monetdb5/mal/mal_factory.c
+++ b/monetdb5/mal/mal_factory.c
@@ -306,7 +306,7 @@ yieldFactory(MalBlkPtr mb, InstrPtr p, i
pl->env = NULL;
return MAL_SUCCEED;
}
- throw(MAL, "factory.yield", RUNTIME_OBJECT_MISSING);
+ throw(MAL, "factory.yield", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
}
/*
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
@@ -320,7 +320,7 @@ compileString(Symbol *fcn, Client cntxt,
b = (buffer *) GDKzalloc(sizeof(buffer));
if (b == NULL) {
GDKfree(qry);
- return MAL_MALLOC_FAIL;
+ throw(MAL,"mal.eval",SQLSTATE(HY001) MAL_MALLOC_FAIL);
}
buffer_init(b, qry, len);
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -815,7 +815,7 @@ str runMALsequence(Client cntxt, MalBlkP
b =
BBPquickdesc(stk->stk[getArg(pci, i)].val.bval, FALSE);
if (b == NULL) {
if (ret == MAL_SUCCEED)
- ret =
createException(MAL, "mal.propertyCheck", RUNTIME_OBJECT_MISSING);
+ ret =
createException(MAL, "mal.propertyCheck", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
continue;
}
b =
BATdescriptor(stk->stk[getArg(pci, i)].val.bval);
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1115,7 +1115,7 @@ fcnHeader(Client cntxt, int kind)
cntxt->backup = cntxt->curprg;
cntxt->curprg = newFunction( modnme, fnme, kind);
if(cntxt->curprg == NULL) {
- parseError(cntxt, MAL_MALLOC_FAIL);
+ parseError(cntxt, SQLSTATE(HY001) MAL_MALLOC_FAIL);
cntxt->curprg = cntxt->backup;
return 0;
}
@@ -1374,7 +1374,7 @@ parseFunction(Client cntxt, int kind)
}
nme = idCopy(cntxt, i);
if (nme == NULL) {
- parseError(cntxt, MAL_MALLOC_FAIL);
+ parseError(cntxt, SQLSTATE(HY001) MAL_MALLOC_FAIL);
return 0;
}
curInstr->fcn = getAddress(nme);
@@ -1529,7 +1529,7 @@ parseAssign(Client cntxt, int cntrl)
curPrg = cntxt->curprg;
curBlk = curPrg->def;
if((curInstr = newInstruction(curBlk, NULL, NULL)) == NULL) {
- parseError(cntxt, MAL_MALLOC_FAIL);
+ parseError(cntxt, SQLSTATE(HY001) MAL_MALLOC_FAIL);
return;
}
@@ -1776,7 +1776,7 @@ parseMAL(Client cntxt, Symbol curPrg, in
if (! skipcomments && e > start && curBlk->stop > 0 ) {
ValRecord cst;
if((curInstr = newInstruction(curBlk, NULL,
NULL)) == NULL) {
- parseError(cntxt, MAL_MALLOC_FAIL);
+ parseError(cntxt, SQLSTATE(HY001)
MAL_MALLOC_FAIL);
continue;
}
curInstr->token= REMsymbol;
@@ -1784,7 +1784,7 @@ parseMAL(Client cntxt, Symbol curPrg, in
cst.vtype = TYPE_str;
cst.len = (int) strlen(start);
if((cst.val.sval = GDKstrdup(start)) == NULL) {
- parseError(cntxt, MAL_MALLOC_FAIL);
+ parseError(cntxt, SQLSTATE(HY001)
MAL_MALLOC_FAIL);
freeInstruction(curInstr);
continue;
}
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -141,7 +141,7 @@ BATXMLxmltext(bat *ret, const bat *bid)
content = (str) xmlNodeGetContent(elem);
xmlFreeDoc(d);
if (content == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
break;
@@ -153,7 +153,7 @@ BATXMLxmltext(bat *ret, const bat *bid)
content = (str) xmlNodeGetContent(elem);
xmlFreeNodeList(elem);
if (content == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
break;
@@ -166,7 +166,7 @@ BATXMLxmltext(bat *ret, const bat *bid)
GDKfree(buf);
buf = GDKmalloc(size);
if (buf == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
}
@@ -259,7 +259,7 @@ BATXMLstr2xml(bat *ret, const bat *bid)
GDKfree(buf);
buf = GDKmalloc(size);
if (buf == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
}
@@ -388,7 +388,7 @@ BATXMLcontent(bat *ret, const bat *bid)
size = len + 128;
buf = GDKmalloc(size);
if (buf == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
}
@@ -515,7 +515,7 @@ BATXMLoptions(bat *ret, const char * con
size += strlen(t);
tmp = (char *) GDKrealloc(val, size +
strlen(t));
if (tmp == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
val = tmp;
@@ -577,7 +577,7 @@ BATXMLcomment(bat *ret, const bat *bid)
GDKfree(buf);
buf = GDKmalloc(size);
if (buf == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
}
@@ -644,7 +644,7 @@ BATXMLpi(bat *ret, const char * const *t
GDKfree(buf);
buf = GDKmalloc(size);
if (buf == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
}
@@ -714,7 +714,7 @@ BATXMLroot(bat *ret, const bat *bid, con
GDKfree(buf);
buf = GDKmalloc(size);
if (buf == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
}
@@ -789,7 +789,7 @@ BATXMLattribute(bat *ret, const char * c
GDKfree(buf);
buf = GDKmalloc(size);
if (buf == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
}
@@ -871,7 +871,7 @@ BATXMLelement(bat *ret, const char * con
GDKfree(buf);
buf = GDKmalloc(size);
if (buf == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
}
@@ -979,7 +979,7 @@ BATXMLforest(Client cntxt, MalBlkPtr mb,
size += len + 128;
tmp = GDKrealloc(buf, size);
if (tmp == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
buf = tmp;
@@ -1124,7 +1124,7 @@ BATXMLgroup(xml *ret, const bat *bid)
throw(MAL, "xml.aggr", SQLSTATE(HY001) MAL_MALLOC_FAIL);
if ((b = BATdescriptor(*bid)) == NULL) {
GDKfree(buf);
- throw(MAL, "xml.aggr", RUNTIME_OBJECT_MISSING);
+ throw(MAL, "xml.aggr", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
}
strcpy(buf, str_nil);
@@ -1231,13 +1231,13 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
maxlen = BUFSIZ;
if ((buf = GDKmalloc(maxlen)) == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto out;
}
buflen = 0;
bn = COLnew(min, TYPE_xml, ngrp, TRANSIENT);
if (bn == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto out;
}
bi = bat_iterator(b);
@@ -1291,7 +1291,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
maxlen += len + BUFSIZ;
tmp = GDKrealloc(buf, maxlen);
if (tmp == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001)
MAL_MALLOC_FAIL;
goto bunins_failed;
}
buf = tmp;
@@ -1331,7 +1331,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
maxlen += len + BUFSIZ;
tmp = GDKrealloc(buf, maxlen);
if (tmp == NULL) {
- err = MAL_MALLOC_FAIL;
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL;
goto bunins_failed;
}
buf = tmp;
@@ -1377,7 +1377,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
BBPreclaim(bn);
bn = NULL;
if (err == NULL)
- err = MAL_MALLOC_FAIL; /* insertion into result BAT failed */
+ err = SQLSTATE(HY001) MAL_MALLOC_FAIL; /* insertion into
result BAT failed */
goto out;
}
@@ -1397,7 +1397,7 @@ AGGRsubxmlcand(bat *retval, const bat *b
BBPunfix(g->batCacheid);
if (e)
BBPunfix(e->batCacheid);
- throw(MAL, "aggr.subxml", RUNTIME_OBJECT_MISSING);
+ throw(MAL, "aggr.subxml", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
}
if (sid) {
s = BATdescriptor(*sid);
@@ -1407,7 +1407,7 @@ AGGRsubxmlcand(bat *retval, const bat *b
BBPunfix(g->batCacheid);
if (e)
BBPunfix(e->batCacheid);
- throw(MAL, "aggr.subxml", RUNTIME_OBJECT_MISSING);
+ throw(MAL, "aggr.subxml", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
}
} else {
s = NULL;
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -1826,7 +1826,7 @@ JSONfoldKeyValue(str *ret, const bat *id
if (key) {
bk = BATdescriptor(*key);
if (bk == NULL) {
- throw(MAL, "json.fold", RUNTIME_OBJECT_MISSING);
+ throw(MAL, "json.fold", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
}
}
@@ -1834,7 +1834,7 @@ JSONfoldKeyValue(str *ret, const bat *id
if (bv == NULL) {
if (bk)
BBPunfix(bk->batCacheid);
- throw(MAL, "json.fold", RUNTIME_OBJECT_MISSING);
+ throw(MAL, "json.fold", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
}
tpe = bv->ttype;
cnt = BATcount(bv);
@@ -1847,7 +1847,7 @@ JSONfoldKeyValue(str *ret, const bat *id
if (bk)
BBPunfix(bk->batCacheid);
BBPunfix(bv->batCacheid);
- throw(MAL, "json.nest", RUNTIME_OBJECT_MISSING);
+ throw(MAL, "json.nest", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
}
}
@@ -2038,7 +2038,7 @@ JSONgroupStr(str *ret, const bat *bid)
throw(MAL, "json.group", SQLSTATE(HY001) MAL_MALLOC_FAIL);
if ((b = BATdescriptor(*bid)) == NULL) {
GDKfree(buf);
- throw(MAL, "json.agg", RUNTIME_OBJECT_MISSING);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
