Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22072/include
Modified Files:
algebra.h builtins.h mil.h mil_mnemonic.h
Log Message:
- add framework for handling ftcontains operator by funcall/funparam operators
U mil_mnemonic.h
Index: mil_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil_mnemonic.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- mil_mnemonic.h 10 Mar 2009 12:20:43 -0000 1.67
+++ mil_mnemonic.h 1 Apr 2009 13:25:18 -0000 1.68
@@ -477,6 +477,9 @@
/** pftijah main query handler */
#define tj_query_handler(a,b,c,d,e,f,g) PFmil_tj_query_handler ((a), (b), (c),
(d), (e), (f), (g))
+/** pftijah main ftfun handler */
+#define tj_ftfun_handler(a,b,c,d,e,f,g,h) PFmil_tj_ftfun_handler ((a), (b),
(c), (d), (e), (f), (g), (h))
+
/** pftijah computes nodes from id's */
#define tj_query_nodes(a,b,c) PFmil_tj_query_nodes ((a), (b), (c) )
U algebra.h
Index: algebra.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/algebra.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- algebra.h 10 Mar 2009 12:20:42 -0000 1.108
+++ algebra.h 1 Apr 2009 13:25:17 -0000 1.109
@@ -669,21 +669,31 @@
#define PFT_FUN(F) (strncmp(F,"pftijah_",8)==0)
-#define PFT_QUERY_N_XX "pftijah_query_n_xx"
-#define PFT_QUERY_N_SX "pftijah_query_n_sx"
-#define PFT_QUERY_N_XO "pftijah_query_n_xo"
-#define PFT_QUERY_N_SO "pftijah_query_n_so"
-#define PFT_QUERY_I_XX "pftijah_query_i_xx"
-#define PFT_QUERY_I_SX "pftijah_query_i_sx"
-#define PFT_QUERY_I_XO "pftijah_query_i_xo"
-#define PFT_QUERY_I_SO "pftijah_query_i_so"
+#define PFT_QUERY_N_XX "pftijah_query_n_xx"
+#define PFT_QUERY_N_SX "pftijah_query_n_sx"
+#define PFT_QUERY_N_XO "pftijah_query_n_xo"
+#define PFT_QUERY_N_SO "pftijah_query_n_so"
+#define PFT_QUERY_I_XX "pftijah_query_i_xx"
+#define PFT_QUERY_I_SX "pftijah_query_i_sx"
+#define PFT_QUERY_I_XO "pftijah_query_i_xo"
+#define PFT_QUERY_I_SO "pftijah_query_i_so"
+
+#define PFT_FTFUN_N_SOI "pftijah_ftfun_n_soi"
+#define PFT_FTFUN_B_SXX "pftijah_ftfun_b_sxx"
+#define PFT_FTFUN_B_SOI "pftijah_ftfun_b_soi"
#define PFT_FUN_QUERY(F) (strncmp(F,"pftijah_query_",14)==0)
+#define PFT_FUN_FTFUN(F) (strncmp(F,"pftijah_ftfun_",14)==0)
#define PTF_QUERY_NODES(N) (N[14]=='n')
#define PTF_QUERY_STARTNODES(N) (N[16]=='s')
#define PTF_QUERY_OPTIONS(N) (N[17]=='o')
+#define PTF_FTFUN_RESNODE(N) (N[14]=='n')
+#define PTF_FTFUN_RESBOOL(N) (N[14]=='b')
+#define PTF_FTFUN_STARTNODES(N) (N[16]=='s')
+#define PTF_FTFUN_OPTIONS(N) (N[17]=='o')
+#define PTF_FTFUN_IGNORES(N) (N[18]=='i')
#define PFT_MANAGE_FTI_C_XX "pftijah_manage_fti_c_xx"
#define PFT_MANAGE_FTI_C_CX "pftijah_manage_fti_c_cx"
U builtins.h
Index: builtins.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/builtins.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- builtins.h 10 Mar 2009 12:20:42 -0000 1.61
+++ builtins.h 1 Apr 2009 13:25:18 -0000 1.62
@@ -1281,6 +1281,14 @@
struct PFla_pair_t *args);
/*
+ * The ftfun functions
+ */
+struct PFla_pair_t PFbui_tijah_ftfun_b_sxx(const PFla_op_t *loop,
+ bool ordering,
+ PFla_op_t **side_effects,
+ struct PFla_pair_t *args);
+
+/*
* The main query functions
*/
struct PFla_pair_t PFbui_tijah_query_i_xx (const PFla_op_t *loop,
U mil.h
Index: mil.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- mil.h 10 Mar 2009 12:20:43 -0000 1.83
+++ mil.h 1 Apr 2009 13:25:18 -0000 1.84
@@ -421,6 +421,7 @@
, m_tj_pfop
, m_tj_tokenize
, m_tj_query_handler
+ , m_tj_ftfun_handler
, m_tj_query_score
, m_tj_query_nodes
, m_tj_ft_index_info
@@ -1087,6 +1088,8 @@
PFmil_t * PFmil_tj_query_handler (const PFmil_t *a, const PFmil_t *b, const
PFmil_t *c, const PFmil_t *d, const PFmil_t *e, const PFmil_t *f, const PFmil_t
*g);
+PFmil_t * PFmil_tj_ftfun_handler (const PFmil_t *a, const PFmil_t *b, const
PFmil_t *c, const PFmil_t *d, const PFmil_t *e, const PFmil_t *f, const PFmil_t
*g, const PFmil_t *h);
+
PFmil_t * PFmil_tj_query_score (const PFmil_t *a, const PFmil_t *b, const
PFmil_t *c, const PFmil_t *d);
PFmil_t * PFmil_tj_query_nodes (const PFmil_t *a, const PFmil_t *b, const
PFmil_t *c);
------------------------------------------------------------------------------
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
