Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19290/compiler/include
Modified Files:
Tag: PF_ROX
algebra.h physical.h
Log Message:
propagated changes of Tuesday Jun 17 2008 - Thursday Jun 19 2008
from the development trunk to the PF_ROX branch
U physical.h
Index: physical.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/physical.h,v
retrieving revision 1.36.4.5
retrieving revision 1.36.4.6
diff -u -d -r1.36.4.5 -r1.36.4.6
--- physical.h 24 May 2008 10:51:33 -0000 1.36.4.5
+++ physical.h 19 Jun 2008 15:54:27 -0000 1.36.4.6
@@ -297,6 +297,13 @@
PFalg_att_t item; /**< item column */
} ii;
+ /* store the column names necessary for a merge_adjacent operator */
+ struct {
+ PFalg_att_t iter; /**< name of the iter column */
+ PFalg_att_t pos; /**< name of the pos column */
+ PFalg_att_t item; /**< name of the item column */
+ } iter_pos_item;
+
/* store the column names necessary for document access */
struct {
PFalg_att_t res; /**< attribute to hold the result */
U algebra.h
Index: algebra.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/algebra.h,v
retrieving revision 1.70.2.10
retrieving revision 1.70.2.11
diff -u -d -r1.70.2.10 -r1.70.2.11
--- algebra.h 13 Jun 2008 14:29:38 -0000 1.70.2.10
+++ algebra.h 19 Jun 2008 15:54:26 -0000 1.70.2.11
@@ -490,21 +490,33 @@
char * PFatt_str (PFalg_att_t att);
/**
+ * Initialize the column name counter.
+ */
+void PFalg_init (void);
+
+/**
* Checks whether a name is unique or not.
*/
bool PFalg_is_unq_name (PFalg_att_t att);
/**
- * Return the id of a unique name
+ * Return a new unique column name
*/
-unsigned int PFalg_unq_name_id (PFalg_att_t att);
+PFalg_att_t PFalg_new_name (PFalg_att_t att);
/**
- * Create a unique name based on an id @a id and
+ * Create a unique name based on an original bit-encoded name @a ori
+ * that retains the usage information of the new variable (iter, pos
+ * or item).
+ */
+PFalg_att_t PFalg_unq_name (PFalg_att_t ori);
+
+/**
+ * Create an unique name based on an id @a id and
* an original name @a ori that retains the usage information
* of the new variable (iter, pos or item).
*/
-PFalg_att_t PFalg_unq_name (PFalg_att_t ori, unsigned int id);
+PFalg_att_t PFalg_unq_fixed_name (PFalg_att_t ori, unsigned int id);
/**
* Create an original column name based on an unique name @a unq
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
