New subject: MonetDB: default - Defense against non-existing MAL primitives

20 Mar 2015

FYI,
test clients/R/Tests/survey.R
still fails with
"Server says '!TypeException:user.s94_2[40]:'batcalc.*' undefined in: X_168:bat[:oid,:hge] := batcalc.*(X_146,X_166);'."
i.e., the check whether the requested new signature exists does not seem to work, yet.
cf.,
http://monetdb.cwi.nl/testweb/web/testgrid.php?serial=55075:ca15cab457b8&...
Stefan
----- Original Message -----
...
Changeset: 4165dc34b2bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4165dc34b2bb
Modified Files:
   monetdb5/mal/mal_resolve.c
   monetdb5/mal/mal_resolve.h
   monetdb5/optimizer/opt_coercion.c
Branch: default
Log Message:
Defense against non-existing MAL primitives
and further limit the rewrite to the simpliest
and most expensive case encountered.
diffs (244 lines):

diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
@@ -115,7 +115,6 @@ findFunctionType(stream *out, Module sco
   Symbol s;
   InstrPtr sig;
   int i, k, unmatched = 0, s1;

/* int foundbutwrong=0; */
int polytype[MAXTYPEVAR];
int returns[256];
int *returntype = NULL;

@@ -396,7 +395,6 @@ findFunctionType(stream *out, Module sco
   			}
   		}
   	if (s1 < 0) {

	/* if(getSignature(s)->token !=PATTERNsymbol) foundbutwrong++; */
s = s->peer;
continue;

}

@@ -445,7 +443,6 @@ findFunctionType(stream *out, Module sco
   	 * typed. This should be reflected in the symbol table.
   	 */
   	s1 = returntype[0];		/* for those interested */

/* foundbutwrong = 0; */

/*
If the call refers to a polymorphic function, we clone it
to arrive at a bounded instance. Polymorphic patterns and



@@ -485,12 +482,6 @@ findFunctionType(stream *out, Module sco
    * arguments, but that clashes with one of the target variables.
    */
   wrapup:

/* foundbutwrong has not been changed, commented out code above
if (foundbutwrong && !silent) {


	showScriptException(out, mb, getPC(mb, p), TYPE,


						"type conflict in assignment");


}


*/

if (returntype && returntype != returns)
  GDKfree(returntype);
 return -3;

@@ -819,13 +810,17 @@ chkTypes(stream *out, Module s, MalBlkPt
/*

Type checking an individual instruction is dangerous,



because it ignores data flow and declarations issues.



It is only to be used in isolated cases.





because it ignores data flow and variable declarations.

*/

-void
+int
 chkInstruction(stream *out, Module s, MalBlkPtr mb, InstrPtr p)
 {

typeChecker(out, s, mb, p, FALSE);


int olderrors= mb->errors;
int error;
typeChecker(out, s, mb, p, TRUE);
error = mb->errors;
mb->errors = olderrors;
return error;

}
void
diff --git a/monetdb5/mal/mal_resolve.h b/monetdb5/mal/mal_resolve.h
--- a/monetdb5/mal/mal_resolve.h
+++ b/monetdb5/mal/mal_resolve.h
@@ -20,7 +20,7 @@
 #define MAXTYPEVAR  10
mal_export void chkProgram(stream *out, Module s, MalBlkPtr mb);
-mal_export void chkInstruction(stream *out, Module s, MalBlkPtr mb, InstrPtr
p);
+mal_export int chkInstruction(stream *out, Module s, MalBlkPtr mb, InstrPtr
p);
 mal_export void chkTypes(stream *out, Module s, MalBlkPtr mb, int silent);
 mal_export void typeChecker(stream *out,  Module scope, MalBlkPtr mb,
 InstrPtr p, int silent);
 mal_export int fcnBinder(stream *out, Module scope, MalBlkPtr mb, InstrPtr
 p);
diff --git a/monetdb5/optimizer/opt_coercion.c
b/monetdb5/optimizer/opt_coercion.c
--- a/monetdb5/optimizer/opt_coercion.c
+++ b/monetdb5/optimizer/opt_coercion.c
@@ -18,8 +18,9 @@ typedef struct{
   int fromtype;
   int totype;
   int src;
-/* not used, yet !??
+/* not used, yet !?? Indeed
   int digits;

int fromscale;
int scale;

*/
 } Coercion;
@@ -47,58 +48,60 @@ coercionOptimizerStep(MalBlkPtr mb, int
   return 0;
 }
-/* Check coercions for numeric types that can be handled with smaller ones.
+/* Check coercions for numeric types towards :hge that can be handled with
smaller ones.

For now, limit to +,-,/,*,% hge expressions



To be extended to deal with math calls as well.





Not every combination may be available in the MAL layer, which calls



for a separate type check before fixing it.



Superflous coercion statements will be garbagecollected later on in the



pipeline
  */
 static void
-coercionOptimizerCalcStep(MalBlkPtr mb, int i, Coercion *coerce)
+coercionOptimizerCalcStep(Client cntxt, MalBlkPtr mb, int i, Coercion
*coerce)
 {
   InstrPtr p = getInstrPtr(mb,i);

int r, a, b;


int r, a, b, varid;

r = getColumnType(getVarType(mb, getArg(p,0)));


+#ifdef HAVE_HGE

if ( r != TYPE_hge)
return;



+#endif
   if( getModuleId(p) != batcalcRef || getFunctionId(p) == 0) return;
   if( ! (getFunctionId(p) == plusRef || getFunctionId(p) == minusRef ||
   getFunctionId(p) == mulRef || getFunctionId(p) == divRef ||
   *getFunctionId(p) =='%') || p->argc !=3)
   	return;

r = getColumnType(getVarType(mb, getArg(p,0)));
switch(r){
case TYPE_bte:
case TYPE_sht:
case TYPE_int:
case TYPE_lng:

-#ifdef HAVE_HGE

case TYPE_hge:

-#endif

break;


case TYPE_dbl:
case TYPE_flt:
/* to be determined */


default:
return;


}
a = getColumnType(getVarType(mb, getArg(p,1)));
b = getColumnType(getVarType(mb, getArg(p,2)));
if ( a == r && coerce[getArg(p,1)].src && coerce[getArg(p,1)].fromtype < r

) /*digit/scale test as well*/

if ( a == r && coerce[getArg(p,1)].src && coerce[getArg(p,1)].fromtype < r

)

{
varid = getArg(p,1);

getArg(p,1) = coerce[getArg(p,1)].src;


if ( b == r && coerce[getArg(p,2)].src &&  coerce[getArg(p,2)].fromtype < r

) /*digit/scale test as well*/

if ( chkInstruction(NULL, cntxt->nspace, mb, p))


	p->argv[1] = varid;


}
if ( b == r && coerce[getArg(p,2)].src &&  coerce[getArg(p,2)].fromtype < r

)

{
varid = getArg(p,2);

getArg(p,2) = coerce[getArg(p,2)].src;
if ( chkInstruction(NULL, cntxt->nspace, mb, p))


	p->argv[2] = varid;


}
return;

}
static void
-coercionOptimizerAggrStep(MalBlkPtr mb, int i, Coercion *coerce)
+coercionOptimizerAggrStep(Client cntxt, MalBlkPtr mb, int i, Coercion
*coerce)
 {
   InstrPtr p = getInstrPtr(mb,i);
   int r, k;

(void) cntxt;

if( getModuleId(p) != aggrRef || getFunctionId(p) == 0) return;
 if( ! (getFunctionId(p) == subavgRef ) || p->argc !=6)
  return;
r = getColumnType(getVarType(mb, getArg(p,0)));
 k = getArg(p,1);



// check the digits/scale
if( r == TYPE_dbl &&  coerce[k].src )
getArg(p,1) = coerce[getArg(p,1)].src;
return;

@@ -124,35 +127,33 @@ OPTcoercionImplementation(Client cntxt,M
   	if (getModuleId(p) == NULL)
   		continue;
 /* Downscale the type, avoiding hge storage when lng would be sufficient.


The code template can be extended to handle other downscale options as



well
  */
 #ifdef HAVE_HGE
   	if ( getModuleId(p) == batcalcRef
   	     && getFunctionId(p) == hgeRef
   	     && p->retc == 1

     && ( p->argc == 2


          || ( p->argc == 5


               && isVarConstant(mb,getArg(p,1))


               && getArgType(mb,p,1) == TYPE_int


               && isVarConstant(mb,getArg(p,3))


               && getArgType(mb,p,3) == TYPE_int


               && isVarConstant(mb,getArg(p,4))


               && getArgType(mb,p,4) == TYPE_int


               /* from-scale == to-scale, i.e., no scale change */


               && *(int*) getVarValue(mb, getArg(p,1)) == *(int*)



getVarValue(mb, getArg(p,4)) ) ) ){

     && ( p->argc == 5


		   && isVarConstant(mb,getArg(p,1))


		   && getArgType(mb,p,1) == TYPE_int


		   && isVarConstant(mb,getArg(p,3))


		   && getArgType(mb,p,3) == TYPE_int


		   && isVarConstant(mb,getArg(p,4))


		   && getArgType(mb,p,4) == TYPE_int


		   /* from-scale == to-scale, i.e., no scale change */


		   && *(int*) getVarValue(mb, getArg(p,1)) == *(int*) getVarValue(mb,



getArg(p,4)) ) ){
   		k = getArg(p,0);
   		coerce[k].pc= i;
   		coerce[k].totype= TYPE_hge;
   		coerce[k].src= getArg(p,2);
   		coerce[k].fromtype= getColumnType(getArgType(mb,p,2));
-/* not used, yet !??

	if (p->argc == 5) {


		coerce[k].digits= getVarConstant(mb,getArg(p,3)).val.ival;


		coerce[k].scale= getVarConstant(mb,getArg(p,4)).val.ival;


	}



+/* not used, yet !?? indeed

	coerce[k].fromscale= getVarConstant(mb,getArg(p,1)).val.ival;


	coerce[k].digits= getVarConstant(mb,getArg(p,3)).val.ival;


	coerce[k].scale= getVarConstant(mb,getArg(p,4)).val.ival;



*/
   	}
 #endif
+/*
   	if ( getModuleId(p) == batcalcRef
   	     && getFunctionId(p) == dblRef
   	     && p->retc == 1
@@ -160,7 +161,7 @@ OPTcoercionImplementation(Client cntxt,M
   	          || ( p->argc == 3
   	               && isVarConstant(mb,getArg(p,1))
   	               && getArgType(mb,p,1) == TYPE_int

               /* to-scale == 0, i.e., no scale change */




               //to-scale == 0, i.e., no scale change
          && *(int*) getVarValue(mb, getArg(p,1)) == 0 ) ) ) {
k = getArg(p,0);
coerce[k].pc= i;



@@ -168,8 +169,9 @@ OPTcoercionImplementation(Client cntxt,M
   		coerce[k].src= getArg(p,1 + (p->argc ==3));
   		coerce[k].fromtype= getColumnType(getArgType(mb,p,1 + (p->argc ==3)));
   	}

coercionOptimizerAggrStep(mb, i, coerce);


coercionOptimizerCalcStep(mb, i, coerce);



+*/

coercionOptimizerAggrStep(cntxt,mb, i, coerce);


coercionOptimizerCalcStep(cntxt,mb, i, coerce);

if (getModuleId(p)==calcRef && p->argc == 2) {
	k= coercionOptimizerStep(mb, i, p);
	actions += k;


checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
-- 
| Stefan.Manegold@CWI.nl | DB Architectures   (DA) |
| www.CWI.nl/~manegold/  | Science Park 123 (L321) |
| +31 (0)20 592-4212     | 1098 XG Amsterdam  (NL) |


    

Re: MonetDB: default - Defense against non-existing MAL primitives

Stefan Manegold

Stefan Manegold

Stefan Manegold

Hannes Mühleisen

Stefan Manegold

Stefan Manegold

Stefan Manegold

tags (0)

participants (2)