Changeset: 4460340bdf88 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4460340bdf88
Modified Files:
monetdb5/optimizer/opt_pipes.c
Branch: Apr2012
Log Message:
Ensure proper optimizer MAL blocks
The MAL block should exist, otherwise validation is useless.
(transplanted from 9f0f431cba645261129b13ffdab170fe6d81ef79)
diffs (12 lines):
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -542,6 +542,8 @@ validatePipe(MalBlkPtr mb){
int mitosis= FALSE, deadcode= FALSE, mergetable= FALSE,
multiplex=FALSE, garbage=FALSE;
int i;
+ if ( mb == NULL || getInstrPtr(mb,1) == 0)
+ throw(MAL,"optimizer.validate","improper optimizer mal
block\n");
if ( getFunctionId(getInstrPtr(mb,1)) == NULL || idcmp(getFunctionId(
getInstrPtr(mb,1)), "inline" ) )
throw(MAL,"optimizer.validate","'inline' should be the
first\n");
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
