[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: Jul2021 - Throw GDK errors to the upper layers
From:       Pedro_Ferreira <commits+pedro.ferreira=monetdbsolutions.com () mon
Date:       2021-05-27 11:40:42
Message-ID: hg.536f883adbac.1622115642.7711217477896374174 () monetdb-vm0 ! spin-off ! cwi ! nl
[Download RAW message or body]

Changeset: 536f883adbac for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/536f883adbac
Modified Files:
	monetdb5/modules/atoms/batxml.c
	monetdb5/modules/atoms/json.c
	monetdb5/modules/kernel/algebra.c
	monetdb5/modules/kernel/bat5.c
	sql/backends/monet5/sql.c
Branch: Jul2021
Log Message:

Throw GDK errors to the upper layers


diffs (130 lines):

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
@@ -1250,7 +1250,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
 		if (BATsort(&t1, &t2, NULL, g, NULL, NULL, false, false, true) != GDK_SUCCEED) {
 			BBPreclaim(bn);
 			bn = NULL;
-			err = "internal sort failed";
+			err = GDK_EXCEPTION;
 			goto out;
 		}
 		if (freeg)
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
@@ -2431,7 +2431,7 @@ JSONjsonaggr(BAT **bnp, BAT *b, BAT *g, 
 	if (g) {
 		/* stable sort g */
 		if (BATsort(&t1, &t2, NULL, g, NULL, NULL, false, false, true) != GDK_SUCCEED) {
-			err = "internal sort failed";
+			err = GDK_EXCEPTION;
 			goto out;
 		}
 		if (freeg)
diff --git a/monetdb5/modules/kernel/algebra.c b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -907,7 +907,7 @@ ALGsort33(bat *result, bat *norder, bat 
 		if (g)
 			BBPunfix(g->batCacheid);
 		BBPunfix(b->batCacheid);
-		throw(MAL, "algebra.sort", OPERATION_FAILED);
+		throw(MAL, "algebra.sort", GDK_EXCEPTION);
 	}
 	BBPunfix(b->batCacheid);
 	if (o)
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -833,7 +833,7 @@ BKCshrinkBAT(bat *ret, const bat *bid, c
 	if (res != GDK_SUCCEED) {
 		BBPunfix(b->batCacheid);
 		BBPunfix(bn->batCacheid);
-		throw(MAL, "bat.shrink", SQLSTATE(HY013) MAL_MALLOC_FAIL );
+		throw(MAL, "bat.shrink", GDK_EXCEPTION);
 	}
 
 	o = (oid*)Tloc(bs, 0);
@@ -864,7 +864,7 @@ BKCshrinkBAT(bat *ret, const bat *bid, c
 					if (BUNappend(bn, BUNtail(bi, p), false) != GDK_SUCCEED) {
 						BBPunfix(b->batCacheid);
 						BBPunfix(bn->batCacheid);
-						throw(MAL, "bat.shrink", SQLSTATE(HY013) MAL_MALLOC_FAIL);
+						throw(MAL, "bat.shrink", GDK_EXCEPTION);
 					}
 					cnt++;
 				}
@@ -928,7 +928,7 @@ BKCshrinkBATmap(bat *ret, const bat *bid
 	if (res != GDK_SUCCEED) {
 		BBPunfix(b->batCacheid);
 		BBPunfix(bn->batCacheid);
-		throw(MAL, "bat.shrinkMap", SQLSTATE(HY013) MAL_MALLOC_FAIL );
+		throw(MAL, "bat.shrinkMap", GDK_EXCEPTION);
 	}
 
 	o = (oid*)Tloc(bs, 0);
@@ -1001,7 +1001,7 @@ BKCreuseBAT(bat *ret, const bat *bid, co
 	if (res != GDK_SUCCEED) {
 		BBPunfix(b->batCacheid);
 		BBPunfix(bn->batCacheid);
-		throw(MAL, "bat.reuse", SQLSTATE(HY013) MAL_MALLOC_FAIL );
+		throw(MAL, "bat.reuse", GDK_EXCEPTION);
 	}
 
 	const oid *o = (const oid *) Tloc(bs, 0);
@@ -1098,7 +1098,7 @@ BKCreuseBATmap(bat *ret, const bat *bid,
 	if (res != GDK_SUCCEED) {
 		BBPunfix(b->batCacheid);
 		BBPunfix(bn->batCacheid);
-		throw(MAL, "bat.shrinkMap", SQLSTATE(HY013) MAL_MALLOC_FAIL );
+		throw(MAL, "bat.shrinkMap", GDK_EXCEPTION);
 	}
 
 	const oid *o = (const oid *) Tloc(bs, 0);
@@ -1147,7 +1147,7 @@ BKCmergecand(bat *ret, const bat *aid, c
 	BBPunfix(a->batCacheid);
 	BBPunfix(b->batCacheid);
 	if (bn == NULL)
-		throw(MAL, "bat.mergecand", OPERATION_FAILED);
+		throw(MAL, "bat.mergecand", GDK_EXCEPTION);
 	*ret = bn->batCacheid;
 	BBPkeepref(*ret);
 	return MAL_SUCCEED;
@@ -1169,7 +1169,7 @@ BKCintersectcand(bat *ret, const bat *ai
 	BBPunfix(a->batCacheid);
 	BBPunfix(b->batCacheid);
 	if (bn == NULL)
-		throw(MAL, "bat.intersectcand", OPERATION_FAILED);
+		throw(MAL, "bat.intersectcand", GDK_EXCEPTION);
 	*ret = bn->batCacheid;
 	BBPkeepref(*ret);
 	return MAL_SUCCEED;
@@ -1191,7 +1191,7 @@ BKCdiffcand(bat *ret, const bat *aid, co
 	BBPunfix(a->batCacheid);
 	BBPunfix(b->batCacheid);
 	if (bn == NULL)
-		throw(MAL, "bat.diffcand", OPERATION_FAILED);
+		throw(MAL, "bat.diffcand", GDK_EXCEPTION);
 	*ret = bn->batCacheid;
 	BBPkeepref(*ret);
 	return MAL_SUCCEED;
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
@@ -2127,13 +2127,13 @@ DELTAsub(bat *result, const bat *col, co
 			cminu = NULL;
 			if (ret != GDK_SUCCEED) {
 				BBPunfix(res->batCacheid);
-				throw(MAL, "sql.delta", SQLSTATE(HY013) MAL_MALLOC_FAIL);
+				throw(MAL, "sql.delta", GDK_EXCEPTION);
 			}
 
 			ret = BATsort(&u, NULL, NULL, res, NULL, NULL, false, false, false);
 			BBPunfix(res->batCacheid);
 			if (ret != GDK_SUCCEED) {
-				throw(MAL, "sql.delta", SQLSTATE(HY013) MAL_MALLOC_FAIL);
+				throw(MAL, "sql.delta", GDK_EXCEPTION);
 			}
 			res = u;
 		} else {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]