Update of /cvsroot/monetdb/pathfinder/compiler/algebra
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18219/algebra
Modified Files:
algebra.c builtins.c
Log Message:
- ftc operator now produces an [iter|pos|item|score] table
U algebra.c
Index: algebra.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/algebra.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- algebra.c 8 Apr 2009 07:54:08 -0000 1.105
+++ algebra.c 8 Apr 2009 09:16:29 -0000 1.106
@@ -676,6 +676,28 @@
}
/**
+ * Return a schema of iter|pos|item|score where item type is item_t
+ */
+PFalg_schema_t
+PFalg_iter_pos_item_score_schema(PFalg_simple_type_t item_t)
+{
+ PFalg_schema_t schema;
+ schema.count = 4;
+ schema.items = PFmalloc (4 * sizeof (PFalg_schema_t));
+
+ schema.items[0].name = col_iter;
+ schema.items[0].type = aat_nat;
+ schema.items[1].name = col_pos;
+ schema.items[1].type = aat_nat;
+ schema.items[2].name = col_item;
+ schema.items[2].type = item_t;
+ schema.items[3].name = col_score1;
+ schema.items[3].type = aat_dbl;
+
+ return schema;
+}
+
+/**
* Return a schema of iter|item where item type is item_t
*/
PFalg_schema_t
U builtins.c
Index: builtins.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/builtins.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- builtins.c 1 Apr 2009 13:25:17 -0000 1.120
+++ builtins.c 8 Apr 2009 09:16:30 -0000 1.121
@@ -45,6 +45,7 @@
#include "oops.h"
#include <assert.h>
+#include <string.h>
#include <stdio.h>
#include "mem.h"
@@ -6726,7 +6727,8 @@
.rel = fun_call(
loop,
p_fun_param.rel,
- ipi_schema(funcall_t),
+ ((PFT_FUN_FTFUN(query_name)) ?
+ ipis_schema(funcall_t) : ipi_schema(funcall_t) ),
alg_fun_call_tijah,
PFqname (PFns_wild, query_name),
NULL, /* ctx */
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
