Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8394/compiler/include
Modified Files:
mil.h mil_mnemonic.h
Log Message:
* Add mil functions hmark, tmark and leftfetchjoin for the algebra backend.
* With the help of hmark and leftfetchjoin now the fn:name works as it should,
thus test benchmark/XPathMark/A11.xq should produce the right output from
now on.
Index: mil_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil_mnemonic.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- mil_mnemonic.h 11 Jan 2008 10:47:07 -0000 1.41
+++ mil_mnemonic.h 17 Jan 2008 14:10:53 -0000 1.42
@@ -111,6 +111,12 @@
/** mark() operator */
#define mark(a,b) PFmil_mark((a), (b))
+/** hmark() operator */
+#define hmark(a,b) PFmil_hmark((a), (b))
+
+/** tmark() operator */
+#define tmark(a,b) PFmil_tmark((a), (b))
+
/** mark_grp() operator */
#define mark_grp(a,b) PFmil_mark_grp((a), (b))
@@ -139,8 +145,8 @@
/** leftjoin() operator */
#define leftjoin(a,b) PFmil_leftjoin((a), (b))
-/** leftjoin() operator */
-#define leftjoin(a,b) PFmil_leftjoin((a), (b))
+/** leftfetchjoin() operator */
+#define leftfetchjoin(a,b) PFmil_leftfetchjoin((a), (b))
/** thetajoin() operator */
#define tjoin(a,b,c,d) PFmil_thetajoin((a), (b), (c), (d))
Index: mil.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- mil.h 15 Jan 2008 15:52:57 -0000 1.51
+++ mil.h 17 Jan 2008 14:10:53 -0000 1.52
@@ -143,6 +143,8 @@
, m_project /**< MIL project() function */
, m_mark /**< MIL mark() function */
+ , m_hmark /**< MIL hmark() function */
+ , m_tmark /**< MIL tmark() function */
, m_mark_grp /**< MIL mark_grp() function */
, m_fetch /**< MIL fetch() function */
, m_access /**< change access restrictions to a BAT */
@@ -150,6 +152,7 @@
, m_cross /**< MIL join operator */
, m_join /**< MIL join operator */
, m_leftjoin /**< MIL leftjoin operator */
+ , m_leftfetchjoin/**< MIL leftfetchjoin operation */
, m_thetajoin /**< MIL thetajoin operator */
, m_unq2_tjoin /**< MIL htordered_unique_thetajoin PROC
applying a unique on both iter columns */
@@ -577,6 +580,12 @@
/** MIL mark() function */
PFmil_t * PFmil_mark (const PFmil_t *, const PFmil_t *);
+/** MIL hmark() function */
+PFmil_t * PFmil_hmark (const PFmil_t *, const PFmil_t *);
+
+/** MIL tmark() function */
+PFmil_t * PFmil_tmark (const PFmil_t *, const PFmil_t *);
+
/** MIL mark_grp() function */
PFmil_t * PFmil_mark_grp (const PFmil_t *, const PFmil_t *);
@@ -595,6 +604,9 @@
/** MIL leftjoin() operator ensures ordering by left operand */
PFmil_t * PFmil_leftjoin (const PFmil_t *, const PFmil_t *);
+/** MIL leftfetchjoin() operator */
+PFmil_t * PFmil_leftfetchjoin (const PFmil_t *, const PFmil_t *);
+
/** MIL thetajoin() operator */
PFmil_t * PFmil_thetajoin (const PFmil_t *, const PFmil_t *,
const PFmil_t *, const PFmil_t *);
-------------------------------------------------------------------------
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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
