Changeset: c0c3ce94a0b5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0c3ce94a0b5 Modified Files: sql/backends/monet5/sql.c Branch: Mar2018 Log Message:
Use better error message. diffs (107 lines): 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 @@ -1525,7 +1525,7 @@ DELTAsub(bat *result, const bat *col, co BBPunfix(u_id->batCacheid); if (!u) { BBPunfix(c->batCacheid); - throw(MAL, "sql.delta", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING); + throw(MAL, "sql.delta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } if (BATcount(u)) { /* check selected updated values against candidates */ BAT *c_ids = BATdescriptor(*cid); @@ -1541,7 +1541,7 @@ DELTAsub(bat *result, const bat *col, co if (rc != GDK_SUCCEED) { BBPunfix(c->batCacheid); BBPunfix(u->batCacheid); - throw(MAL, "sql.delta", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING); + throw(MAL, "sql.delta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } } ret = BATappend(res, u, cminu, TRUE); @@ -1551,7 +1551,7 @@ DELTAsub(bat *result, const bat *col, co cminu = NULL; if (ret != GDK_SUCCEED) { BBPunfix(res->batCacheid); - throw(MAL, "sql.delta", SQLSTATE(45000) "Internal error in delta processing"); + throw(MAL, "sql.delta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } ret = BATsort(&u, NULL, NULL, res, NULL, NULL, 0, 0); @@ -1580,7 +1580,7 @@ DELTAsub(bat *result, const bat *col, co if (!cminu) { BBPunfix(res->batCacheid); BBPunfix(i->batCacheid); - throw(MAL, "sql.delta", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING); + throw(MAL, "sql.delta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } } if (isVIEW(res)) { @@ -1591,7 +1591,7 @@ DELTAsub(bat *result, const bat *col, co BBPunfix(i->batCacheid); if (cminu) BBPunfix(cminu->batCacheid); - throw(MAL, "sql.delta", SQLSTATE(45000) "Internal error in delta processing"); + throw(MAL, "sql.delta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } } ret = BATappend(res, i, cminu, TRUE); @@ -1600,13 +1600,13 @@ DELTAsub(bat *result, const bat *col, co BBPunfix(cminu->batCacheid); if (ret != GDK_SUCCEED) { BBPunfix(res->batCacheid); - throw(MAL, "sql.delta", SQLSTATE(45000) "Internal error in delta processing"); + throw(MAL, "sql.delta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } ret = BATsort(&u, NULL, NULL, res, NULL, NULL, 0, 0); BBPunfix(res->batCacheid); if (ret != GDK_SUCCEED) - throw(MAL, "sql.delta", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING); + throw(MAL, "sql.delta", SQLSTATE(HY001) MAL_MALLOC_FAIL); res = u; } BATkey(res, TRUE); @@ -1632,7 +1632,7 @@ DELTAproject(bat *result, const bat *sub BBPunfix(s->batCacheid); BBPunfix(i->batCacheid); if (res == NULL) - throw(MAL, "sql.projectdelta", SQLSTATE(45000) "Internal error in delta processing"); + throw(MAL, "sql.projectdelta", SQLSTATE(HY001) MAL_MALLOC_FAIL); BBPkeepref(*result = res->batCacheid); return MAL_SUCCEED; @@ -1656,13 +1656,13 @@ DELTAproject(bat *result, const bat *sub BBPunfix(s->batCacheid); BBPunfix(i->batCacheid); BBPunfix(c->batCacheid); - throw(MAL, "sql.projectdelta", SQLSTATE(45000) "Internal error in delta processing"); + throw(MAL, "sql.projectdelta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } BBPunfix(c->batCacheid); if (BATappend(res, i, NULL, FALSE) != GDK_SUCCEED) { BBPunfix(s->batCacheid); BBPunfix(i->batCacheid); - throw(MAL, "sql.projectdelta", SQLSTATE(45000) "Internal error in delta processing"); + throw(MAL, "sql.projectdelta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } } } @@ -1673,7 +1673,7 @@ DELTAproject(bat *result, const bat *sub BBPunfix(res->batCacheid); if (tres == NULL) { BBPunfix(s->batCacheid); - throw(MAL, "sql.projectdelta", SQLSTATE(45000) "Internal error in delta processing"); + throw(MAL, "sql.projectdelta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } res = tres; @@ -1705,7 +1705,7 @@ DELTAproject(bat *result, const bat *sub BBPunfix(res->batCacheid); BBPunfix(u_id->batCacheid); BBPunfix(u_val->batCacheid); - throw(MAL, "sql.delta", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING); + throw(MAL, "sql.delta", SQLSTATE(HY001) MAL_MALLOC_FAIL); } nu_id = BATproject(o, u_id); nu_val = BATproject(o, u_val); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list