Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27299/src/backends/monet5
Modified Files:
sql.mx sql_scenario.mx
Log Message:
count now returns wrd
U sql_scenario.mx
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- sql_scenario.mx 6 Sep 2008 20:02:43 -0000 1.318
+++ sql_scenario.mx 7 Sep 2008 14:27:07 -0000 1.319
@@ -49,6 +49,7 @@
sql5_export str SQLengine(Client c);
sql5_export str SQLassert(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
sql5_export str SQLassertInt(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+sql5_export str SQLassertWrd(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLassertLng(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLinitEnvironment(int *ret);
@@ -1463,6 +1464,19 @@
}
str
+SQLassertWrd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
+ wrd *flg = (wrd*) getArgReference(stk,pci, 1);
+ str *msg = (str*) getArgReference(stk,pci, 2);
+ (void) cntxt;
+ (void)mb;
+ if (*flg){
+ /* mdbDump(mb,stk,pci);*/
+ throw(SQL, "assert", *msg);
+ }
+ return MAL_SUCCEED;
+}
+
+str
SQLassertLng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
lng *flg = (lng*) getArgReference(stk,pci, 1);
str *msg = (str*) getArgReference(stk,pci, 2);
U sql.mx
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -d -r1.280 -r1.281
--- sql.mx 31 Aug 2008 21:57:58 -0000 1.280
+++ sql.mx 7 Sep 2008 14:27:06 -0000 1.281
@@ -60,6 +60,10 @@
address SQLassertInt
comment "Generate an exception when b!=0";
+pattern assert{unsafe}(b:wrd,msg:str):void
+address SQLassertWrd
+comment "Generate an exception when b!=0";
+
pattern assert{unsafe}(b:lng,msg:str):void
address SQLassertLng
comment "Generate an exception when b!=0";
@@ -145,7 +149,7 @@
address mvc_update_wrap
comment "Append b to the column tname.cname (possibly optimized to replace the
insert bat of tname.cname";
-pattern clear_table{unsafe}(sname:str, tname:str) :lng
+pattern clear_table{unsafe}(sname:str, tname:str) :wrd
address mvc_clear_table_wrap
comment "Clear table";
@@ -204,11 +208,7 @@
address mvc_export_operation_wrap
comment "Export result of schema/transaction queries";
-pattern affectedRows{unsafe}(nr:int, w:str) :void
-address mvc_affected_rows_wrap
-comment "export the number of affected rows by the current query";
-
-pattern affectedRows{unsafe}(nr:lng, w:str) :void
+pattern affectedRows{unsafe}(nr:wrd, w:str) :void
address mvc_affected_rows_wrap
comment "export the number of affected rows by the current query";
@@ -1550,7 +1550,7 @@
throw(SQL, "mvc_bind_dbat_wrap", "error");
}
-/* str mvc_clear_table_wrap(lng *res, str *sname, str *tname); */
+/* str mvc_clear_table_wrap(wrd *res, str *sname, str *tname); */
str
mvc_clear_table_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
@@ -1809,7 +1809,6 @@
return MAL_SUCCEED;
}
-/* str mvc_affected_rows_wrap(int *r, lng *nr, str *w); */
str
mvc_drop_declared_table_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci )
{
@@ -1847,6 +1846,7 @@
return MAL_SUCCEED;
}
+/* str mvc_affected_rows_wrap(int *r, wrd *nr, str *w); */
str
mvc_affected_rows_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
@@ -1855,17 +1855,15 @@
str msg = getContext(cntxt,mb, &c, &b);
int *r = (int *) getArgReference(stk, pci, 0);
int mtype = getArgType(mb, pci, 1);
- lng nr;
+ wrd nr;
str *w = (str *) getArgReference(stk, pci, 2);
(void) cntxt;
if (msg)
return msg;
c->type = Q_UPDATE;
- if (mtype == TYPE_int)
- nr = *(int *) getArgReference(stk, pci, 1);
- else
- nr = *(lng *) getArgReference(stk, pci, 1);
+ assert (mtype == TYPE_wrd);
+ nr = *(wrd *) getArgReference(stk, pci, 1);
if (mvc_export_affrows(c, b->out, nr, *w)) {
throw(SQL, "sql.affectedRows", "failed");
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
