Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19571/compiler/include
Modified Files:
algebra.h mil.h mil_mnemonic.h
Log Message:
* Changed the names of the new types that were introduced for the docmgm
functions. Now the types are:
- aat_docmgmt
- aat_path
- aat_docnm
- aat_colnm
Note that we used only 1 more bit for these types since we re-used
the types introduced for the update functions.
* Algebra and MIL implementation for the docmgm functions:
- pf:add-doc(str,str)
- pf:add-doc(str,str,str)
- pf:add-doc(str,str,int)
- pf:add-doc(str,str,str,int)
* Change the serialize operator to identify docmgm queries and produce
the correct MIL code for that
* MIL implementation for the docmgmt_tape
* Dummy implementation of the DocmgmTape proc in pathfinder.mx
For now it just prints the BAT parameters, but next commit will be
with the correct implementation.
Everything works great, but for one *very very* strange thing. Inside the 1to1
function, case alg_fun_pf_add_doc_str_int reaches until logical level and then
disappears! This case has 4 params but that must not be the problem since case
alg_fun_fn_replace_flag has also 4 params and works fine. I could use some
help/suggestions on this one, since I have no idea why this is happening.
could it be some strange elimination/optimization code?
Index: mil_mnemonic.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil_mnemonic.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- mil_mnemonic.h 18 Jan 2008 16:11:37 -0000 1.43
+++ mil_mnemonic.h 20 Jan 2008 22:35:04 -0000 1.44
@@ -592,4 +592,7 @@
/** play update tape function */
#define update_tape(a) PFmil_upd (a)
+/** play docmgmt tape function */
+#define docmgmt_tape(a) PFmil_docmgmt (a)
+
/* vim:set shiftwidth=4 expandtab: */
Index: algebra.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/algebra.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- algebra.h 18 Jan 2008 16:11:37 -0000 1.68
+++ algebra.h 20 Jan 2008 22:35:04 -0000 1.69
@@ -105,9 +105,10 @@
* types from the update functions since doc management and update functions
* can not be together in the same query.
*/
-#define aat_docmgmt 0x00020000 /**< represents the doc management type */
-#define aat_str1 0x00001000 /**< second string param of a docmgmt fun */
-#define aat_str2 0x00002000 /**< third string param of a docmgmt fun */
+#define aat_docmgmt 0x00020000 /**< represents the doc management type */
+#define aat_path 0x00001000 /**< the path where a document resides*/
+#define aat_docnm 0x00002000 /**< the name of the document */
+#define aat_colnm 0x00004000 /**< the name of the collection */
/** Simple atomic types in our algebra */
typedef unsigned int PFalg_simple_type_t;
@@ -326,9 +327,7 @@
, alg_fun_fn_qname /**< fn:QName */
, alg_fun_pf_fragment /**< #pf:fragment */
, alg_fun_pf_supernode /**< #pf:supernode */
- , alg_fun_pf_add_doc /**< pf:add-doc */
, alg_fun_pf_add_doc_str /**< pf:add-doc */
- , alg_fun_pf_add_doc_int /**< pf:add-doc */
, alg_fun_pf_add_doc_str_int /**< pf:add-doc */
, alg_fun_pf_del_doc /**< pf:del-doc */
, alg_fun_upd_rename /**< upd:rename */
Index: mil.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/mil.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- mil.h 18 Jan 2008 16:11:37 -0000 1.53
+++ mil.h 20 Jan 2008 22:35:04 -0000 1.54
@@ -431,6 +431,7 @@
, m_module /**< module loading */
, m_update_tape /**< play update tape function */
+ , m_docmgmt_tape /**< play docmgmt tape function */
};
typedef enum PFmil_kind_t PFmil_kind_t;
@@ -1374,6 +1375,8 @@
PFmil_t * PFmil_upd (const PFmil_t *);
+PFmil_t * PFmil_docmgmt (const PFmil_t *);
+
#define PFmil_seq(...) \
PFmil_seq_ (sizeof ((PFmil_t *[]) { __VA_ARGS__} ) / sizeof (PFmil_t *), \
(const PFmil_t *[]) { __VA_ARGS__ } )
-------------------------------------------------------------------------
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
