Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26181/compiler/include
Modified Files:
Tag: xquery-decomposition
Makefile.ag algebra.h logical.h logical_mnemonic.h physical.h
physical_mnemonic.h xml2lalg_converters.h
Log Message:
propagated changes of Friday 15 Feb 2008 - Monday Feb 18 2008
from the development trunk to the xquery-decomposition branch
Index: physical.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/physical.h,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -u -d -r1.36.2.2 -r1.36.2.3
--- physical.h 16 Feb 2008 01:02:14 -0000 1.36.2.2
+++ physical.h 18 Feb 2008 16:21:32 -0000 1.36.2.3
@@ -277,9 +277,7 @@
/** semantic content for staircase join operator */
struct {
- PFalg_axis_t axis;
- PFty_t ty; /**< sequence type that describes the
- node test */
+ PFalg_step_spec_t spec; /**< step specification */
PFord_ordering_t in; /**< input ordering */
PFord_ordering_t out; /**< output ordering */
PFalg_att_t iter; /**< iter column */
@@ -647,8 +645,7 @@
* Input must have iter|item schema
*/
PFpa_op_t *PFpa_llscjoin (const PFpa_op_t *ctx,
- PFalg_axis_t axis,
- const PFty_t test,
+ PFalg_step_spec_t spec,
const PFord_ordering_t in,
const PFord_ordering_t out,
PFalg_att_t iter,
Index: logical_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/logical_mnemonic.h,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -d -r1.34.2.1 -r1.34.2.2
--- logical_mnemonic.h 8 Feb 2008 22:59:18 -0000 1.34.2.1
+++ logical_mnemonic.h 18 Feb 2008 16:21:32 -0000 1.34.2.2
@@ -137,12 +137,12 @@
#define all(a,b,c,d) PFla_all((a), (b), (c), (d))
/* path step */
-#define step(a,b,c,d,e,f,g,h) PFla_step ((a),(b),(c),(d),(e),(f),(g),(h))
-#define step_join(a,b,c,d,e,f,g) PFla_step_join ((a),(b),(c),(d),(e),(f),(g))
-#define guide_step(a,b,c,d,e,f,g,h,i,j) \
- PFla_guide_step ((a),(b),(c),(d),(e),(f),(g),(h),(i),(j))
-#define guide_step_join(a,b,c,d,e,f,g,h,i) \
- PFla_guide_step_join ((a),(b),(c),(d),(e),(f),(g),(h),(i))
+#define step(a,b,c,d,e,f,g) PFla_step ((a),(b),(c),(d),(e),(f),(g))
+#define step_join(a,b,c,d,e,f) PFla_step_join ((a),(b),(c),(d),(e),(f))
+#define guide_step(a,b,c,d,e,f,g,h,i) \
+ PFla_guide_step ((a),(b),(c),(d),(e),(f),(g),(h),(i))
+#define guide_step_join(a,b,c,d,e,f,g,h) \
+ PFla_guide_step_join ((a),(b),(c),(d),(e),(f),(g),(h))
/* doc index join */
#define doc_index_join(a,b,c,d,e,f) \
Index: algebra.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/algebra.h,v
retrieving revision 1.67.2.3
retrieving revision 1.67.2.4
diff -u -d -r1.67.2.3 -r1.67.2.4
--- algebra.h 16 Feb 2008 01:02:13 -0000 1.67.2.3
+++ algebra.h 18 Feb 2008 16:21:32 -0000 1.67.2.4
@@ -284,15 +284,12 @@
};
typedef enum PFalg_node_kind_t PFalg_node_kind_t;
-struct PFalg_scj_spec_t {
- PFalg_axis_t axis; /**< represented axis */
- PFalg_node_kind_t kind; /**< node kind to test for */
- union {
- char *target; /**< target specified for pi's */
- PFqname_t qname; /**< for name tests */
- } str;
+struct PFalg_step_spec_t {
+ PFalg_axis_t axis; /**< represented axis */
+ PFalg_node_kind_t kind; /**< node kind to test for */
+ PFqname_t qname; /**< for name tests */
};
-typedef struct PFalg_scj_spec_t PFalg_scj_spec_t;
+typedef struct PFalg_step_spec_t PFalg_step_spec_t;
/** function call result occurrence indicator */
enum PFalg_occ_ind_t {
@@ -494,24 +491,24 @@
PFalg_att_t PFalg_ori_name (PFalg_att_t unq, PFalg_att_t free);
/**
- * Print simple type name
+ * Print XPath axis
*/
-char * PFalg_simple_type_str (PFalg_simple_type_t att);
+char * PFalg_axis_str (PFalg_axis_t axis);
/**
- * Print function call kind
+ * Print node kind
*/
-char * PFalg_fun_call_kind_str (PFalg_fun_call_t kind);
+char * PFalg_node_kind_str (PFalg_node_kind_t kind);
/**
- * Extract all possible algebra types from the XQuery type.
+ * Print simple type name
*/
-PFalg_simple_type_t PFalg_type (PFty_t ty);
+char * PFalg_simple_type_str (PFalg_simple_type_t att);
/**
- * Extract occurrence indicator from the XQuery type.
+ * Print function call kind
*/
-PFalg_occ_ind_t PFalg_type_occ (PFty_t ty);
+char * PFalg_fun_call_kind_str (PFalg_fun_call_t kind);
/**
* Print function name
Index: physical_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/physical_mnemonic.h,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -d -r1.28.2.2 -r1.28.2.3
--- physical_mnemonic.h 16 Feb 2008 01:02:14 -0000 1.28.2.2
+++ physical_mnemonic.h 18 Feb 2008 16:21:33 -0000 1.28.2.3
@@ -104,8 +104,7 @@
#define cast(a,b,c,d) PFpa_cast ((a), (b), (c), (d))
/** StaircaseJoin */
-#define llscjoin(a,b,c,d,e,f,g) PFpa_llscjoin ((a), (b), (c), \
- (d), (e), (f), (g))
+#define llscjoin(a,b,c,d,e,f) PFpa_llscjoin ((a), (b), (c), (d), (e), (f))
#define doc_tbl(a,b,c) PFpa_doc_tbl ((a), (b), (c))
#define doc_access(a,b,c,d) PFpa_doc_access ((a), (b), (c), (d))
Index: xml2lalg_converters.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/xml2lalg_converters.h,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- xml2lalg_converters.h 16 Feb 2008 01:02:14 -0000 1.2.2.2
+++ xml2lalg_converters.h 18 Feb 2008 16:21:33 -0000 1.2.2.3
@@ -78,6 +78,9 @@
PFalg_axis_t
PFxml2la_conv_2PFLA_xpathaxis(char* s);
+PFalg_node_kind_t
+PFxml2la_conv_2PFLA_nodekind(char* s);
+
PFalg_doc_t
PFxml2la_conv_2PFLA_docType(char* s);
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/Makefile.ag,v
retrieving revision 1.46.2.1
retrieving revision 1.46.2.2
diff -u -d -r1.46.2.1 -r1.46.2.2
--- Makefile.ag 16 Feb 2008 01:02:13 -0000 1.46.2.1
+++ Makefile.ag 18 Feb 2008 16:21:32 -0000 1.46.2.2
@@ -58,7 +58,6 @@
map_names.h \
mem.h \
mil_dce.h \
- mildebug.h \
milgen.h \
mil.h \
mil_mnemonic.h \
Index: logical.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/logical.h,v
retrieving revision 1.51.2.1
retrieving revision 1.51.2.2
diff -u -d -r1.51.2.1 -r1.51.2.2
--- logical.h 8 Feb 2008 22:59:18 -0000 1.51.2.1
+++ logical.h 18 Feb 2008 16:21:32 -0000 1.51.2.2
@@ -336,13 +336,12 @@
/* store the semantic information for path steps (with guide information)
*/
struct {
- PFalg_axis_t axis;
- PFty_t ty;
- unsigned int guide_count;
- PFguide_tree_t **guides;
- int level;
- PFalg_att_t iter; /**< column to look up the iterations */
- PFalg_att_t item; /**< column to look up the context nodes */
+ PFalg_step_spec_t spec; /**< step specification */
+ unsigned int guide_count; /**< number of attached guide nodes */
+ PFguide_tree_t **guides; /**< list of attached guide nodes */
+ int level; /**< level of the result nodes */
+ PFalg_att_t iter; /**< column to look up the iterations */
+ PFalg_att_t item; /**< column to look up the context nodes */
PFalg_att_t item_res; /**< column to store the resulting nodes */
} step;
@@ -825,7 +824,7 @@
* Constructor for XPath step evaluation.
*/
PFla_op_t * PFla_step_simple (const PFla_op_t *doc, const PFla_op_t *n,
- PFalg_axis_t axis, PFty_t seqty,
+ PFalg_step_spec_t spec,
PFalg_att_t iter, PFalg_att_t item,
PFalg_att_t item_res);
@@ -833,7 +832,7 @@
* Constructor for XPath step evaluation.
*/
PFla_op_t * PFla_step (const PFla_op_t *doc, const PFla_op_t *n,
- PFalg_axis_t axis, PFty_t seqty, int level,
+ PFalg_step_spec_t spec, int level,
PFalg_att_t iter, PFalg_att_t item,
PFalg_att_t item_res);
@@ -841,7 +840,7 @@
* Constructor for XPath step evaluation (without duplicate removal).
*/
PFla_op_t * PFla_step_join_simple (const PFla_op_t *doc, const PFla_op_t *n,
- PFalg_axis_t axis, PFty_t seqty,
+ PFalg_step_spec_t spec,
PFalg_att_t item,
PFalg_att_t item_res);
@@ -849,7 +848,7 @@
* Constructor for XPath step evaluation (without duplicate removal).
*/
PFla_op_t * PFla_step_join (const PFla_op_t *doc, const PFla_op_t *n,
- PFalg_axis_t axis, PFty_t seqty, int level,
+ PFalg_step_spec_t spec, int level,
PFalg_att_t item,
PFalg_att_t item_res);
@@ -857,7 +856,7 @@
* Constructor for XPath step evaluation (with guide information).
*/
PFla_op_t * PFla_guide_step_simple (const PFla_op_t *doc, const PFla_op_t *n,
- PFalg_axis_t axis, PFty_t seqty,
+ PFalg_step_spec_t spec,
unsigned int guide_count,
PFguide_tree_t **guides,
PFalg_att_t iter, PFalg_att_t item,
@@ -867,7 +866,7 @@
* Constructor for XPath step evaluation (with guide information).
*/
PFla_op_t * PFla_guide_step (const PFla_op_t *doc, const PFla_op_t *n,
- PFalg_axis_t axis, PFty_t seqty,
+ PFalg_step_spec_t spec,
unsigned int guide_count,
PFguide_tree_t **guides, int level,
PFalg_att_t iter, PFalg_att_t item,
@@ -879,7 +878,7 @@
*/
PFla_op_t * PFla_guide_step_join_simple (const PFla_op_t *doc,
const PFla_op_t *n,
- PFalg_axis_t axis, PFty_t seqty,
+ PFalg_step_spec_t spec,
unsigned int guide_count,
PFguide_tree_t **guides,
PFalg_att_t item,
@@ -890,7 +889,7 @@
* with guide information).
*/
PFla_op_t * PFla_guide_step_join (const PFla_op_t *doc, const PFla_op_t *n,
- PFalg_axis_t axis, PFty_t seqty,
+ PFalg_step_spec_t spec,
unsigned int guide_count,
PFguide_tree_t **guides, int level,
PFalg_att_t item,
-------------------------------------------------------------------------
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
