Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21770/compiler/algebra
Modified Files:
builtins.c logical.c
Log Message:
* add to the implty enum definition the new update types. Append union was
complaining about this.
* made a dummy implementation for the fn:error function. It returns null, so
any call to fn:error will result to segmentation fault for now:)
* re-order the enum for bat access mode in mil.h. It should be
BAT_WRITE=0
BAT_READ=1
BAT_APPEND=2
but it was: BAT_READ=0, BAT_APPEND=1, BAT_WRITE=2
Index: logical.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/logical.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- logical.c 20 Nov 2007 16:57:22 -0000 1.65
+++ logical.c 27 Nov 2007 17:12:58 -0000 1.66
@@ -1278,7 +1278,8 @@
if (j == n->schema.count)
PFoops (OOPS_FATAL,
"attribute `%s' referenced in generic function"
- " operator not found", PFatt_str (refs.atts[i]));
+ " operator not found (kind = %s)",
+ PFatt_str (refs.atts[i]), PFalg_fun_str(kind));
ix[i] = j;
}
Index: builtins.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/builtins.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- builtins.c 26 Nov 2007 16:25:48 -0000 1.63
+++ builtins.c 27 Nov 2007 17:12:57 -0000 1.64
@@ -626,6 +626,33 @@
/* 3. THE ERROR FUNCTION */
/* --------------------- */
+/**
+ * Build up operator tree for built-in function 'fn:error(string)'.
+ */
+struct PFla_pair_t
+PFbui_fn_error (const PFla_op_t *loop, bool ordering, struct PFla_pair_t *args)
+{
+ (void) loop; (void) ordering; (void) args;
+
+ return (struct PFla_pair_t) {
+ .rel = NULL,
+ .frag = PFla_empty_set ()};
+}
+
+/**
+ * Build up operator tree for built-in function 'fn:error(string?, string)'.
+ */
+struct PFla_pair_t
+PFbui_fn_error_str (const PFla_op_t *loop, bool ordering,
+ struct PFla_pair_t *args)
+{
+ (void) loop; (void) ordering; (void) args;
+
+ return (struct PFla_pair_t) {
+ .rel = NULL,
+ .frag = PFla_empty_set ()};
+}
+
/* -------------------------------------- */
/* 6. FUNCTIONS AND OPERATORS ON NUMERICS */
/* -------------------------------------- */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
