Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14352/src/backends/monet5
Modified Files:
Tag: SQL_2-22
sql.mx
Log Message:
fixes in the zero_or_one function
Handle nil case3 correctly
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.251.2.2
retrieving revision 1.251.2.3
diff -u -d -r1.251.2.2 -r1.251.2.3
--- sql.mx 19 Feb 2008 15:57:19 -0000 1.251.2.2
+++ sql.mx 26 Feb 2008 17:53:45 -0000 1.251.2.3
@@ -580,11 +580,14 @@
function sql.zero_or_one( b:bat[:oid,:any_1], gp:bat[:oid,:oid],
gpe:bat[:oid,:oid]) :bat[:oid,:any_1];
(e,g) := group.new(gp);
m := aggr.max(e);
- c := calc.>(m,1);
+ c0 := calc.isnil(m);
+ c0 := calc.not(c0);
+ c1 := calc.>(m,1);
+ c1 := calc.and(c0,c1);
ms := calc.str(m);
msg := str.+("zero_or_one: cardinality violation (", ms);
msg := str.+(msg, ">1)");
- assert(c, msg);
+ assert(c1, msg);
return b;
end sql.zero_or_one;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
