Changeset: c732a13e0bc4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c732a13e0bc4
Modified Files:
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_orderidx.c
Branch: Jul2021
Log Message:
Some defensive lines
diffs (31 lines):
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -1139,6 +1139,8 @@ alter_table(Client cntxt, mvc *sql, char
if (i->type == ordered_idx) {
sql_kc *ic = i->columns->h->data;
BAT *b = mvc_bind(sql, nt->s->base.name,
nt->base.name, ic->c->base.name, 0);
+ if (b == NULL)
+
throw(SQL,"sql.alter_table",SQLSTATE(HY005) "Cannot access ordered index
%s_%s_%s", s->base.name, t->base.name, i->base.name);
char *msg = OIDXcreateImplementation(cntxt,
newBatType(b->ttype), b, -1);
BBPunfix(b->batCacheid);
if (msg != MAL_SUCCEED) {
@@ -1151,6 +1153,8 @@ alter_table(Client cntxt, mvc *sql, char
gdk_return r;
sql_kc *ic = i->columns->h->data;
BAT *b = mvc_bind(sql, nt->s->base.name,
nt->base.name, ic->c->base.name, 0);
+ if (b == NULL)
+
throw(SQL,"sql.alter_table",SQLSTATE(HY005) "Cannot access imprints index
%s_%s_%s", s->base.name, t->base.name, i->base.name);
r = BATimprints(b);
BBPunfix(b->batCacheid);
if (r != GDK_SUCCEED)
diff --git a/sql/backends/monet5/sql_orderidx.c
b/sql/backends/monet5/sql_orderidx.c
--- a/sql/backends/monet5/sql_orderidx.c
+++ b/sql/backends/monet5/sql_orderidx.c
@@ -89,5 +89,5 @@ sql_droporderindex(Client cntxt, MalBlkP
throw(SQL,"sql.droporderindex", SQLSTATE(38000) "Column can not
be accessed");
msg = OIDXdropImplementation(cntxt, b);
BBPunfix(b->batCacheid);
- return MAL_SUCCEED;
+ return msg;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
