Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9464/src/backends/monet4
Modified Files:
sql_server.mx
Log Message:
propagated changes of Thursday Jun 28 2007 - Sunday Jul 01 2007
from the SQL_2-18 branch to the development trunk
NOTE:
I hope, I resolved the conflicts in
src/backends/monet4/sql_server.mx
src/backends/monet5/sql.mx
src/backends/monet5/sql_optimizer.mx
src/test/Dependencies/Tests/Dependencies.stable.out
correctly --- please double-check!
Index: sql_server.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_server.mx,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- sql_server.mx 29 Jun 2007 11:28:43 -0000 1.167
+++ sql_server.mx 1 Jul 2007 14:34:34 -0000 1.168
@@ -794,7 +794,8 @@
SQL-99 are shown below. At some point they also should be
moved to module code base.
@= round
-int @1_dec_round_wrap( @1 *res, @1 *v, @1 *r )
+int
[EMAIL PROTECTED]( @1 *res, @1 *v, @1 *r )
{
@1 val = *v;
@1 add = *r;
@@ -814,7 +815,8 @@
return GDK_SUCCEED;
}
-int @1_round_wrap( @1 *res, @1 *v, int *d, int *s, bte *r )
+int
[EMAIL PROTECTED]( @1 *res, @1 *v, int *d, int *s, bte *r )
{
/* shortcut nil */
if (*v == @1_nil) {
@@ -839,12 +841,13 @@
return GDK_SUCCEED;
}
-int [EMAIL PROTECTED]( @1 *res, str val, int *d, int *sc )
+int
[EMAIL PROTECTED]( @1 *res, str val, int *d, int *sc )
{
char *s = strip_extra_zeros(val);
char *dot = strchr(s, '.');
int digits = _strlen(s) - 1;
- int scale = digits - (int) (dot-s);
+ int scale = digits - (dot-s);
lng value = 0;
if (!dot) {
@@ -855,14 +858,14 @@
value = decimal_from_str(s);
if (*s == '+' || *s == '-')
digits --;
- if (scale < *sc) {
+ if (scale < *sc){
/* the current scale is too small, increase it by adding 0's */
int d = *sc - scale; /* CANNOT be 0! */
value *= scales[d];
scale += d;
digits += d;
- } else if (scale > *sc) {
+ } else if (scale > *sc){
/* the current scale is too big, decrease it by correctly
rounding */
int d = scale - *sc; /* CANNOT be 0 */
lng rnd = scales[d]>>1;
@@ -893,7 +896,8 @@
@:round(lng)@
@= fround
-int @1_dec_round_wrap( @1 *res, @1 *v, @1 *r )
+int
[EMAIL PROTECTED]( @1 *res, @1 *v, @1 *r )
{
@1 val = *v;
@@ -972,7 +976,8 @@
}
@= simpleupcast
-int @[EMAIL PROTECTED]( @1 *res, @2 *v )
+int
[EMAIL PROTECTED]@1( @1 *res, @2 *v )
{
/* shortcut nil */
if (*v == @2_nil) {
@@ -990,7 +995,7 @@
@= simpledowncast
int @[EMAIL PROTECTED]( @1 *res, @2 *v )
{
- lng val = (lng) *v;
+ lng val = *v;
/* shortcut nil */
if (*v == @2_nil) {
@@ -1012,7 +1017,8 @@
@= numcastup
@:simpleupcast(@1,@2)@
-int @[EMAIL PROTECTED]( @1 *res, int *s1, @2 *v )
+int
[EMAIL PROTECTED]@1( @1 *res, int *s1, @2 *v )
{
int scale = *s1;
@1 r, h = (*v<0)?-5:5;
@@ -1022,7 +1028,7 @@
*res = @1_nil;
return(GDK_SUCCEED);
}
-
+
/* since the @1 type is bigger than or equal to the @2 type, it will
always fit */
r = (@1)*v;
@@ -1032,13 +1038,8 @@
return GDK_SUCCEED;
}
-int @[EMAIL PROTECTED]( @1 *res, @2 *v, int *d2, int *s2 )
-{
- int zero = 0;
- return @[EMAIL PROTECTED]( res, &zero, v, d2, s2 );
-}
-
-int @[EMAIL PROTECTED]( @1 *res, int *S1, @2 *v, int *d2, int *S2 )
+int
[EMAIL PROTECTED]@1( @1 *res, int *S1, @2 *v, int *d2, int *S2 )
{
int p = *d2, inlen = 1;
@2 cpyval = *v;
@@ -1072,6 +1073,14 @@
*res = r;
return GDK_SUCCEED;
}
+
+int
[EMAIL PROTECTED]@1( @1 *res, @2 *v, int *d2, int *s2 )
+{
+ int zero = 0;
+ return @[EMAIL PROTECTED]( res, &zero, v, d2, s2 );
+}
+
@c
@:numcastup(bte,bte)@
@:numcastup(sht,bte)@
@@ -1090,7 +1099,8 @@
/* when casting a floating point to an decimal we like to preserve the
* precision. This means we first scale the float before converting.
*/
-int @[EMAIL PROTECTED]( @1 *res, @2 *v, int *d2, int *s2 )
+int
[EMAIL PROTECTED]@1( @1 *res, @2 *v, int *d2, int *s2 )
{
int p = *d2, inlen = 1, scale = *s2;
@2 r;
@@ -1133,7 +1143,8 @@
@= fnumcastup
@:simpleupcast(@1,@2)@
-int @[EMAIL PROTECTED]( @1 *res, int *s1, @2 *v )
+int
[EMAIL PROTECTED]@1( @1 *res, int *s1, @2 *v )
{
int scale = *s1;
@1 r;
@@ -1153,13 +1164,8 @@
return GDK_SUCCEED;
}
-int @[EMAIL PROTECTED]( @1 *res, @2 *v, int *d2, int *s2 )
-{
- int zero = 0;
- return @[EMAIL PROTECTED]( res, &zero, v, d2, s2 );
-}
-
-int @[EMAIL PROTECTED]( @1 *res, int *S1, @2 *v, int *d2, int *S2 )
+int
[EMAIL PROTECTED]@1( @1 *res, int *S1, @2 *v, int *d2, int *S2 )
{
int p = *d2, inlen = 1;
@2 cpyval = *v;
@@ -1192,6 +1198,13 @@
*res = r;
return GDK_SUCCEED;
}
+int
[EMAIL PROTECTED]@1( @1 *res, @2 *v, int *d2, int *s2 )
+{
+ int zero = 0;
+ return @[EMAIL PROTECTED]( res, &zero, v, d2, s2 );
+}
+
@c
@:fnumcastup(flt,bte)@
@:fnumcastup(flt,sht)@
@@ -1206,7 +1219,8 @@
@= numcastdown
@:simpledowncast(@1,@2)@
-int @[EMAIL PROTECTED]( @1 *res, int *s1, @2 *v )
+int
[EMAIL PROTECTED]@1( @1 *res, int *s1, @2 *v )
{
int scale = *s1;
lng val = *v, h = (val<0)?-5:5;
@@ -1229,13 +1243,8 @@
}
}
-int @[EMAIL PROTECTED]( @1 *res, @2 *v, int *d2, int *s2 )
-{
- int zero = 0;
- return @[EMAIL PROTECTED]( res, &zero, v, d2, s2 );
-}
-
-int @[EMAIL PROTECTED]( @1 *res, int *S1, @2 *v, int *d2, int *S2 )
+int
[EMAIL PROTECTED]@1( @1 *res, int *S1, @2 *v, int *d2, int *S2 )
{
int p = *d2, inlen = 1;
lng val = *v, cpyval = val, h = (val<0)?-5:5;
@@ -1271,6 +1280,13 @@
return GDK_FAIL;
}
}
+
+int
[EMAIL PROTECTED]@1( @1 *res, @2 *v, int *d2, int *s2 )
+{
+ int zero = 0;
+ return @[EMAIL PROTECTED]( res, &zero, v, d2, s2 );
+}
@c
@:numcastdown(bte,sht)@
@:numcastdown(bte,int)@
@@ -1279,7 +1295,9 @@
@:numcastdown(sht,lng)@
@:numcastdown(int,lng)@
-int month_interval_str( int *ret, str s, int *ek, int *sk ){
+int
+month_interval_str( int *ret, str s, int *ek, int *sk )
+{
lng res;
if (interval_from_str( s, *sk, *ek, &res ) < 0)
@@ -1287,7 +1305,10 @@
*ret = (int) res;
return GDK_SUCCEED;
}
-int second_interval_str( lng *res, str s, int *ek, int *sk ){
+
+int
+second_interval_str( lng *res, str s, int *ek, int *sk )
+{
if (interval_from_str( s, *sk, *ek, res ) < 0)
return GDK_FAIL;
@@ -1295,7 +1316,8 @@
}
@= c_interval
-int [EMAIL PROTECTED]( int *ret, @1 *s, int *ek, int *sk ){
+int
[EMAIL PROTECTED]( int *ret, @1 *s, int *ek, int *sk ){
int r = (int)*s;
(void)ek;
@@ -1310,7 +1332,8 @@
*ret = r;
return GDK_SUCCEED;
}
-int [EMAIL PROTECTED]( lng *res, @1 *s, int *ek, int *sk ){
+int
[EMAIL PROTECTED]( lng *res, @1 *s, int *ek, int *sk ){
lng r = *s;
(void)ek;
@@ -1336,7 +1359,8 @@
@:c_interval(int)@
@:c_interval(lng)@
-int zero_or_one(ptr ret, BAT* b)
+int
+zero_or_one(ptr ret, BAT* b)
{
ptr p;
int c = BATcount(b);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
