Changeset: 145097558a04 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/145097558a04
Modified Files:
geom/monetdb5/geomBulk.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/txtsim.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_int.h
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_time.c
Branch: Jul2021
Log Message:
Fix error code
diffs (truncated from 1481 to 300 lines):
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -30,12 +30,12 @@ geom_2_geom_bat(bat *outBAT_id, bat *inB
//get the descriptor of the BAT
if ((b = BATdescriptor(*inBAT_id)) == NULL) {
- msg = createException(MAL, "batcalc.wkb", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batcalc.wkb", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
bi = bat_iterator(b);
if (cand && !is_bat_nil(*cand) && (s = BATdescriptor(*cand)) == NULL) {
- msg = createException(MAL, "batcalc.wkb", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batcalc.wkb", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
off = b->hseqbase;
@@ -120,12 +120,12 @@ wkbFromText_bat_cand(bat *outBAT_id, bat
//get the descriptor of the BAT
if ((b = BATdescriptor(*inBAT_id)) == NULL) {
- msg = createException(MAL, "batgeom.wkbFromText",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batgeom.wkbFromText",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
bi = bat_iterator(b);
if (cand && !is_bat_nil(*cand) && (s = BATdescriptor(*cand)) == NULL) {
- msg = createException(MAL, "batgeom.wkbFromText",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batgeom.wkbFromText",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
off = b->hseqbase;
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -202,11 +202,11 @@ BLOBnitems_bulk(Client cntxt, MalBlkPtr
(void) cntxt;
(void) mb;
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, "blob.nitems_bulk", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "blob.nitems_bulk", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, "blob.nitems_bulk", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "blob.nitems_bulk", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, b, bs);
@@ -439,12 +439,12 @@ BLOBblob_blob_bulk(bat *res, const bat *
bool nils = false;
if ((b = BATdescriptor(*bid)) == NULL) {
- msg = createException(SQL, "batcalc.blob_blob_bulk",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(SQL, "batcalc.blob_blob_bulk",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid && !is_bat_nil(*sid)) {
if ((s = BATdescriptor(*sid)) == NULL) {
- msg = createException(SQL, "batcalc.blob_blob_bulk",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(SQL, "batcalc.blob_blob_bulk",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
} else {
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -156,7 +156,7 @@ NAME##_bulk(Client cntxt, MalBlkPtr mb,
b1i = bat_iterator(b1);
\
if (sid && !is_bat_nil(*sid) && (s = BATdescriptor(*sid)) == NULL) {\
msg = createException(MAL, "batmtime." MALFUNC,
\
- SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
\
+ SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
\
goto bailout;
\
}
\
off = b1->hseqbase;
\
@@ -256,12 +256,12 @@ NAME##_bulk(Client cntxt, MalBlkPtr mb,
}
\
if (sid1 && !is_bat_nil(*sid1) && (s1 = BATdescriptor(*sid1)) == NULL)
{ \
msg = createException(MAL, "batmtime." MALFUNC,
\
- SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
\
+ SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
\
goto bailout;
\
}
\
if (sid2 && !is_bat_nil(*sid2) && (s2 = BATdescriptor(*sid2)) == NULL)
{ \
msg = createException(MAL, "batmtime." MALFUNC,
\
- SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
\
+ SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
\
goto bailout;
\
}
\
n = canditer_init(&ci1, b1, s1);
\
@@ -351,7 +351,7 @@ NAME##_bulk_p1(Client cntxt, MalBlkPtr m
b2i = bat_iterator(b2);
\
if (sid2 && !is_bat_nil(*sid2) && (s2 = BATdescriptor(*sid2)) == NULL)
{\
msg = createException(MAL, "batmtime." MALFUNC,
\
- SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
\
+ SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
\
goto bailout;
\
}
\
n = canditer_init(&ci2, b2, s2);
\
@@ -428,7 +428,7 @@ NAME##_bulk_p2(Client cntxt, MalBlkPtr m
b1i = bat_iterator(b1);
\
if (sid1 && !is_bat_nil(*sid1) && (s1 = BATdescriptor(*sid1)) == NULL)
{ \
msg = createException(MAL, "batmtime." MALFUNC,
\
- SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
\
+ SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
\
goto bailout;
\
}
\
n = canditer_init(&ci1, b1, s1);
\
diff --git a/monetdb5/modules/atoms/uuid.c b/monetdb5/modules/atoms/uuid.c
--- a/monetdb5/modules/atoms/uuid.c
+++ b/monetdb5/modules/atoms/uuid.c
@@ -187,12 +187,12 @@ UUIDuuid2uuid_bulk(bat *res, const bat *
BATiter bi;
if ((b = BATdescriptor(*bid)) == NULL) {
- msg = createException(SQL, "batcalc.uuid2uuidbulk",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(SQL, "batcalc.uuid2uuidbulk",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid && !is_bat_nil(*sid)) {
if ((s = BATdescriptor(*sid)) == NULL) {
- msg = createException(SQL, "batcalc.uuid2uuidbulk",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(SQL, "batcalc.uuid2uuidbulk",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
} else {
@@ -272,11 +272,11 @@ UUIDstr2uuid_bulk(bat *res, const bat *b
ssize_t (*conv)(const char *, size_t *, void **, bool) =
BATatoms[TYPE_uuid].atomFromStr;
if ((b = BATdescriptor(*bid)) == NULL) {
- msg = createException(SQL, "batcalc.str2uuidbulk",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(SQL, "batcalc.str2uuidbulk",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid && !is_bat_nil(*sid) && (s = BATdescriptor(*sid)) == NULL) {
- msg = createException(SQL, "batcalc.str2uuidbulk",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(SQL, "batcalc.str2uuidbulk",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
off = b->hseqbase;
@@ -361,11 +361,11 @@ UUIDuuid2str_bulk(bat *res, const bat *b
BATiter bi;
if ((b = BATdescriptor(*bid)) == NULL) {
- msg = createException(SQL, "batcalc.uuid2strbulk",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(SQL, "batcalc.uuid2strbulk",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid && !is_bat_nil(*sid) && (s = BATdescriptor(*sid)) == NULL) {
- msg = createException(SQL, "batcalc.uuid2strbulk",
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
+ msg = createException(SQL, "batcalc.uuid2strbulk",
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
goto bailout;
}
off = b->hseqbase;
diff --git a/monetdb5/modules/kernel/batmmath.c
b/monetdb5/modules/kernel/batmmath.c
--- a/monetdb5/modules/kernel/batmmath.c
+++ b/monetdb5/modules/kernel/batmmath.c
@@ -389,11 +389,11 @@ CMDscience_bat_randintarg(Client cntxt,
(void) cntxt;
(void) mb;
if (!(b = BBPquickdesc(*bid, false))) {
- msg = createException(MAL, "batmmath.rand", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batmmath.rand", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid && !is_bat_nil(*sid) && !(bs = BATdescriptor(*sid))) {
- msg = createException(MAL, "batmmath.rand", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batmmath.rand", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci, b, bs);
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -92,11 +92,11 @@ do_batstr_int(Client cntxt, MalBlkPtr mb
(void) cntxt;
(void) mb;
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, b, bs);
@@ -169,11 +169,11 @@ STRbatAscii(Client cntxt, MalBlkPtr mb,
(void) cntxt;
(void) mb;
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, "batstr.unicodeAt", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batstr.unicodeAt", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, "batstr.unicodeAt", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batstr.unicodeAt", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, b, bs);
@@ -236,11 +236,11 @@ STRbatFromWChr(Client cntxt, MalBlkPtr m
goto bailout;
}
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, "batstr.unicode", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batstr.unicode", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, "batstr.unicode", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batstr.unicode", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, b, bs);
@@ -332,11 +332,11 @@ STRbatSpace(Client cntxt, MalBlkPtr mb,
goto bailout;
}
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, "batstr.space", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batstr.space", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, "batstr.search", SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "batstr.search", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, b, bs);
@@ -418,11 +418,11 @@ do_batstr_str(Client cntxt, MalBlkPtr mb
goto bailout;
}
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, b, bs);
@@ -506,11 +506,11 @@ do_batstr_conststr_str(Client cntxt, Mal
goto bailout;
}
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, b, bs);
@@ -594,11 +594,11 @@ do_batstr_str_conststr(Client cntxt, Mal
goto bailout;
}
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, b, bs);
@@ -684,11 +684,11 @@ do_batstr_batstr_str(Client cntxt, MalBl
goto bailout;
}
if (!(left = BATdescriptor(*l)) || !(right = BATdescriptor(*l2))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if ((sid1 && !is_bat_nil(*sid1) && !(lefts = BATdescriptor(*sid1))) ||
(sid2 && !is_bat_nil(*sid2) && !(rights = BATdescriptor(*sid2)))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
q = canditer_init(&ci1, left, lefts);
@@ -783,11 +783,11 @@ do_batstr_constint_str(Client cntxt, Mal
goto bailout;
}
if (!(b = BATdescriptor(*bid))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
if (sid1 && !is_bat_nil(*sid1) && !(bs = BATdescriptor(*sid1))) {
- msg = createException(MAL, name, SQLSTATE(HY005)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, name, SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
