[Monetdb-developers] [Monetdb-checkins] MonetDB5/src/optimizer Makefile.ag, , 1.74, 1.75 opt_selcrack.mx, , 1.2, 1.3

Stefan Manegold Stefan.Manegold at cwi.nl
Mon Jun 29 19:56:32 CEST 2009


On Mon, Jun 29, 2009 at 05:35:40PM +0000, Martin Kersten wrote:
> Update of /cvsroot/monetdb/MonetDB5/src/optimizer
> In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13608
> 
> Modified Files:
> 	Makefile.ag opt_selcrack.mx 
> Log Message:
> A first cracker inconvenience solved.
> 

What about types void, bit, bte, chr, bat, ptr?

Stefan

> 
> U Makefile.ag
> Index: Makefile.ag
> ===================================================================
> RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Makefile.ag,v
> retrieving revision 1.74
> retrieving revision 1.75
> diff -u -d -r1.74 -r1.75
> --- Makefile.ag	30 Apr 2009 18:42:48 -0000	1.74
> +++ Makefile.ag	29 Jun 2009 17:35:38 -0000	1.75
> @@ -15,7 +15,7 @@
>  # Copyright August 2008-2009 MonetDB B.V.
>  # All Rights Reserved.
>  
> -INCLUDES = -I../mal -I../modules/mal -I../modules/kernel $(MONETDB_INCS) \
> +INCLUDES = -I../mal -I../modules/atoms -I../modules/mal -I../modules/kernel $(MONETDB_INCS) \
>  	$(Z_CFLAGS) $(BZ_CFLAGS) $(PCL_FLAGS) $(PCRE_CFLAGS)
>  
>  
> 
> U opt_selcrack.mx
> Index: opt_selcrack.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_selcrack.mx,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -d -r1.2 -r1.3
> --- opt_selcrack.mx	30 Apr 2009 12:56:43 -0000	1.2
> +++ opt_selcrack.mx	29 Jun 2009 17:35:38 -0000	1.3
> @@ -74,22 +74,27 @@
>  
>  		/* add a property "can be cracked" to every base relation that is a candidate for selection cracking */
>  		/* also, for every candidate bat, maintain the table name */
> -		if ( match2(p, batRef, newRef) || match2(p, sqlRef, bindRef) ){  
> +		if ( match2(p, sqlRef, bindRef) ){  
>  			ValRecord v, *vp;
>  
>  		  	/* crack only supported data types */
> -			if ( getTailType(mb->var[getArg(p,0)]->type)==TYPE_str )
> +			switch( getTailType(mb->var[getArg(p,0)]->type) ){
> +			case TYPE_int: case TYPE_lng: case TYPE_sht:
> +			case TYPE_flt: case TYPE_dbl: case TYPE_oid:

What about types void, bit, bte, chr, bat, ptr?

Stefan

> +				break;
> +			case TYPE_wrd: /* to be moved up */
> +			default:
>  					continue;
> +			}
>  
>  			/* avoid cracking delta bats used for updates */
> -			if (getModuleId(p)== sqlRef && mb->var[getArg(p,4)]->value.val.ival != 0 ) 
> +			if (mb->var[getArg(p,4)]->value.val.ival != 0 ) 
>  				continue;		
>  				
>  			varSetProp(mb, getArg(p, 0), canBeCrackedProp, 0, NULL);
>  
>  			vp = VALset(&v, TYPE_str, GDKstrdup(getVar(mb,getArg(p,2))->value.val.sval));
> -                        varSetProp(mb, getArg(p,0), tableProp, op_eq, vp);
> -
> +			varSetProp(mb, getArg(p,0), tableProp, op_eq, vp);
>  			continue;
>  		}
>  
> 
> 
> ------------------------------------------------------------------------------
> _______________________________________________
> Monetdb-checkins mailing list
> Monetdb-checkins at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
> 
> 

-- 
| Dr. Stefan Manegold | mailto:Stefan.Manegold at cwi.nl |
| CWI,  P.O.Box 94079 | http://www.cwi.nl/~manegold/  |
| 1090 GB Amsterdam   | Tel.: +31 (20) 592-4212       |
| The Netherlands     | Fax : +31 (20) 592-4312       |




More information about the developers-list mailing list