Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2307/src/backends/monet5
Modified Files:
sql.mx
Log Message:
propagated changes of Friday Oct 23 2009 - Saturday Oct 24 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/23 - mlkersten: src/backends/monet5/sql.mx,1.358.2.3
Silence compilers.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/23 - mlkersten: src/backends/monet5/sql.mx,1.358.2.4
Keep track of the nonil property.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/23 - mlkersten: src/backends/monet5/sql.mx,1.358.2.5
Use the optimizer='off' instead of 'none'.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -d -r1.361 -r1.362
--- sql.mx 21 Oct 2009 09:41:49 -0000 1.361
+++ sql.mx 23 Oct 2009 22:43:35 -0000 1.362
@@ -3304,7 +3304,6 @@
str b...@2_dec2_@1( int *res, int *s1, int *bid )
{
BAT *b, *bn;
- BATiter bi;
@2 *p,*q;
char *msg = NULL;
int scale = *s1;
@@ -3313,19 +3312,20 @@
if( (b = BATdescriptor(*bid)) == NULL ){
throw(SQL, "batca...@2_dec2_@1", "Cannot access descriptor");
}
- bi = bat_iterator(b);
bn = BATnew(b->htype, ty...@1, BATcount(b));
BATseqbase(bn, b->hseqbase);
o = (@1*) Tloc(bn,BUNfirst(bn));
p = (@2*) Tloc(b, BUNfirst(b));
q = (@2*) Tloc(b, BUNlast(b));
+ bn->T->nonil= b->T->nonil;
if ( b->T->nonil){
for (; p<q; p++)
*o = (@1) ((*p + (*p<0)?-5:5) / scales[scale]);
} else{
- if (*p == @2_nil)
+ if (*p == @2_nil) {
*o = @1_nil;
- else
+ bn->T->nonil= FALSE;
+ } else
*o = (@1) ((*p + (*p<0)?-5:5) / scales[scale]);
}
BATsetcount(bn, BATcount(b));
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
