Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18219/mil
Modified Files:
milgen.brg
Log Message:
- ftc operator now produces an [iter|pos|item|score] table
U milgen.brg
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- milgen.brg 3 Apr 2009 14:03:54 -0000 1.213
+++ milgen.brg 8 Apr 2009 09:16:32 -0000 1.214
@@ -2078,7 +2078,8 @@
PFalg_col_t a_iter,
PFalg_col_t a_item, PFalg_simple_type_t t_item,
PFalg_col_t a_frag,
- PFalg_col_t a_pos
+ PFalg_col_t a_pos,
+ PFalg_col_t a_score
)
{
mvar_t *v_iter = new_var (dest->refctr);
@@ -2106,6 +2107,14 @@
assgn (var (v_pos->name),
fetch (var (pack->name), lit_int (3))));
env_add (dest->env, a_pos, aat_nat, v_pos);
+
+ if ( a_score ) {
+ mvar_t *v_score = new_var (dest->refctr);
+ execute (
+ assgn (var (v_score->name),
+ fetch (var (pack->name), lit_int (3))));
+ env_add (dest->env, a_score, aat_dbl, v_score);
+ }
}
#endif
@@ -10161,11 +10170,13 @@
unpin(pfop_query,1);
unpin(pfop_opt,1);
-
pft_unpack_pfop(p,tjqres,fc_iter_a,fc_item_a,restype,fc_item_a,fc_pos_a);
+
pft_unpack_pfop(p,tjqres,fc_iter_a,fc_item_a,restype,fc_item_a,fc_pos_a,0);
unpin(tjqres,1);
} else if ( PFT_FUN_FTFUN(fcname) ) {
int fcci = 0;
+ PFalg_col_t fc_score_a = p->schema.items[3].name;
+
PFalg_simple_type_t restype;
/* function returns nodes OR booleans */
int returnNodes = PTF_QUERY_NODES(fcname);
@@ -10227,7 +10238,7 @@
unpin(pfop_opt,1);
unpin(pfop_ign,1);
-
pft_unpack_pfop(p,tjqres,fc_iter_a,fc_item_a,restype,fc_item_a,fc_pos_a);
+
pft_unpack_pfop(p,tjqres,fc_iter_a,fc_item_a,restype,fc_item_a,fc_pos_a,fc_score_a);
unpin(tjqres,1);
} else if ( PFT_FUN_MANAGE(fcname) ) {
@@ -10322,7 +10333,7 @@
unpin(pfop_id,1);
unpin(pfop_nodes,1);
-
pft_unpack_pfop(p,tjsres,fc_iter_a,fc_item_a,aat_dbl,0,fc_pos_a);
+
pft_unpack_pfop(p,tjsres,fc_iter_a,fc_item_a,aat_dbl,0,fc_pos_a,0);
unpin(tjsres,1);
} else if (strcmp(fcname,PFT_NODES) == 0 ) {
@@ -10342,7 +10353,7 @@
);
unpin(pfop_id,1);
-
pft_unpack_pfop(p,tjnres,fc_iter_a,fc_item_a,aat_pre,fc_item_a,fc_pos_a);
+
pft_unpack_pfop(p,tjnres,fc_iter_a,fc_item_a,aat_pre,fc_item_a,fc_pos_a,0);
unpin(tjnres,1);
} else if ( (strcmp(fcname,PFT_TOKENIZE) == 0) ||
@@ -10425,7 +10436,7 @@
);
unpin(pfop_names,1);
-
pft_unpack_pfop(p,tjires,fc_iter_a,fc_item_a,aat_pre,fc_item_a,fc_pos_a);
+
pft_unpack_pfop(p,tjires,fc_iter_a,fc_item_a,aat_pre,fc_item_a,fc_pos_a,0);
unpin(tjires,1);
} else {
------------------------------------------------------------------------------
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
