Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16:/tmp/cvs-serv3638
Modified Files:
sql.mx sql_optimizer.mx
Log Message:
Make sure the CVS is in sink with the local testing stage.
Indeed, one of the trigger tests demonstrates spurious error
behavior.
Index: sql_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_optimizer.mx,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- sql_optimizer.mx 18 Apr 2007 13:39:07 -0000 1.153
+++ sql_optimizer.mx 8 May 2007 20:33:36 -0000 1.154
@@ -258,9 +258,11 @@
lng clk = GDKusec();
int n=1,rtop=0;
InstrPtr *rest= (InstrPtr*) alloca(sizeof(InstrPtr)*mb->stop);
- SQLbind *bind= (SQLbind*) alloca(sizeof(SQLbind)*mb->stop/2);
+ SQLbind *bind= (SQLbind*) alloca(sizeof(SQLbind)*mb->stop);
int j,k=0;
+ memset((char*) rest,0, sizeof(InstrPtr)*mb->stop);
+ memset((char*) bind,0, sizeof(SQLbind)*mb->stop);
for(i=1; i<mb->stop; i++){
InstrPtr p = getInstrPtr(mb,i);
char *f = getFunctionId(p);
@@ -353,7 +355,7 @@
setProperty(getProps(mb,k),"bid", "=",
TYPE_int, &b->batCacheid);
setProperty(getProps(mb,k),"rows", "=",
TYPE_lng, &rows);
if (not_null)
- setProperty(getProps(mb,k),"not_nil",
"=", TYPE_bit, &t);
+ setProperty(getProps(mb,k),"notnil",
"=", TYPE_bit, &t);
BBPunfix(b->batCacheid);
actions++;
}
@@ -404,10 +406,10 @@
str defaultPlan=
"inline,"
"remap,"
- /* "evaluate," */
+ "evaluate,"
"costModel,"
"coercions,"
- /* "emptySet," */
+ "emptySet,"
/* "joinselect," */
"accessmode,"
"aliases,"
@@ -417,9 +419,8 @@
"joinPath,"
"deadcode,"
"reduce,"
- "garbageCollector,"
+ "garbageCollector,"
"multiplex";
-
static str minimalPlan=
"multiplex";
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- sql.mx 17 Apr 2007 17:09:36 -0000 1.221
+++ sql.mx 8 May 2007 20:33:35 -0000 1.222
@@ -62,15 +62,16 @@
command assert(b:lng,msg:str):void
address SQLassertLng
comment "Generate an exception when b!=0";
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+command startQuery(s:str):void
+address SQLstartQuery
+comment "Initialize tracing query performance";
-#command startQuery(s:str):void
-#address SQLstartQuery
-#comment "Initialize tracing query performance";
-
-#command exitQuery(s:str):void
-#address SQLexitQuery
-#comment "Finalize tracing query performance";
-
+command exitQuery(s:str):void
+address SQLexitQuery
+comment "Finalize tracing query performance";
[EMAIL PROTECTED]
@- The SQL multi-version catalog
This module also contains the definitions for managing an SQL database schema
in
version 5. It is an adaptation of the original V4.3 code base.
@@ -307,17 +308,19 @@
address @1_dec_round_wrap
comment "round off the value v to nearests multiple of r";
-#command dec_round( v:@1, r:dbl ) :@1
-#address @1_dbl_dec_round_wrap
-#comment "round off the value v to nearests multiple of r";
-#command dec_round( v:@1, r:int ) :@1
-#address @1_int_dec_round_wrap
-#comment "round off the value v to nearests multiple of r";
command round( v:@1, d:int, s:int, r:sht) :@1
address @1_round_wrap
comment "round off the decimal v(d,s) to r digits behind the dot (if r < 0,
before the dot)";
-
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+command dec_round( v:@1, r:dbl ) :@1
+address @1_dbl_dec_round_wrap
+comment "round off the value v to nearests multiple of r";
+command dec_round( v:@1, r:int ) :@1
+address @1_int_dec_round_wrap
+comment "round off the value v to nearests multiple of r";
[EMAIL PROTECTED]
@mal
command aggr.exist(b:bat[:any_1,:any_2], h:any_1):bit
@@ -334,28 +337,33 @@
command dec_round( v:dbl, r:dbl ) :dbl
address dbl_dbl_dec_round_wrap
comment "round off the value v to nearests multiple of r";
-
-#command dec_round( v:flt, r:int ) :flt
-#address flt_int_dec_round_wrap
-#comment "round off the value v to nearests multiple of r";
-#command dec_round( v:dbl, r:int ) :dbl
-#address dbl_int_dec_round_wrap
-#comment "round off the value v to nearests multiple of r";
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+command dec_round( v:flt, r:int ) :flt
+address flt_int_dec_round_wrap
+comment "round off the value v to nearests multiple of r";
+command dec_round( v:dbl, r:int ) :dbl
+address dbl_int_dec_round_wrap
+comment "round off the value v to nearests multiple of r";
[EMAIL PROTECTED]
@= mal_cast
command [EMAIL PROTECTED]( v:str ) :@1
address [EMAIL PROTECTED]
comment "Cast to @1";
-#address [EMAIL PROTECTED]
-#command calc.str( v:@1 ) :str
-#address [EMAIL PROTECTED]
-#comment "Cast @1 to str";
command [EMAIL PROTECTED]( v:str, digits:int ) :@1
address [EMAIL PROTECTED]
comment "cast to @1 and check for overflow";
command [EMAIL PROTECTED]( v:str, digits:int, scale:int ) :@1
address [EMAIL PROTECTED]
comment "cast to dec(@1) and check for overflow";
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+address [EMAIL PROTECTED]
+command calc.str( v:@1 ) :str
+address [EMAIL PROTECTED]
+comment "Cast @1 to str";
[EMAIL PROTECTED]
@mal
@:mal_cast(sht)@
@:mal_cast(int)@
@@ -394,7 +402,6 @@
address CALCbit2lng
comment "Cast bit to lng ";
-#command calc.str( v:any_1, digits:int ) :str
pattern calc.str( eclass:int, d1:int, s1:int, has_tz:int, v:any_1, digits:int
) :str
address SQLstr_cast
comment "cast to string and check for overflow";
@@ -404,8 +411,9 @@
command calc.substring(s:str,offset:int,count:int):str
address STRsubstring;
[EMAIL PROTECTED]
+command calc.str( v:any_1, digits:int ) :str
@= mal_cast_2dec
-#address [EMAIL PROTECTED]@1
command [EMAIL PROTECTED]( v:@2) :@1
address @[EMAIL PROTECTED]
comment "cast @2 to @1";
-------------------------------------------------------------------------
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
