Update of /cvsroot/monetdb/pathfinder/compiler/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25375/include

Modified Files:
      Tag: XQuery_0-24
        properties.h 
Log Message:
-- Changed the implementation of the icols property inference
   to correctly work on unique column names.

   (This change is necessary for my next checkin
    -- the join push down optimizer.)


U properties.h
Index: properties.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/include/properties.h,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -d -r1.37 -r1.37.2.1
--- properties.h        8 May 2008 20:13:21 -0000       1.37
+++ properties.h        28 May 2008 11:34:45 -0000      1.37.2.1
@@ -64,7 +64,7 @@
                                   disjoint domains) */
     bool         set;        /**< boolean flag that indicates whether the
                                   cardinality of an operator is important */
-    PFalg_att_t  icols;      /**< List of attributes required by the
+    PFarray_t   *icols;      /**< List of attributes required by the
                                   parent operators. */
     PFarray_t   *keys;       /**< List of attributes that have
                                   unique values. */
@@ -84,6 +84,9 @@
                                        node usage information. */
     PFarray_t   *name_pairs; /**< List of attributes with their corresponding
                                   unique names. */
+    PFalg_att_t  free_cols;  /**< List of columns that are not in use. */  
+    PFalg_att_t  left_cols;  /**< List of left columns (intro_thetajoin.c) */
+    PFalg_att_t  right_cols; /**< List of right columns (intro_thetajoin.c) */
     PFarray_t   *level_mapping; /**< List of attributes annotated with
                                      level information. */
     PFarray_t   *guide_mapping_list; /**< List of guide mappings that contain
@@ -102,9 +105,9 @@
                                   corresponding domain identifier. */
     PFarray_t  *r_domains;   /**< List of attributes along with their
                                   corresponding domain identifier. */
-    PFalg_att_t l_icols;     /**< List of attributes required by the
+    PFarray_t  *l_icols;     /**< List of attributes required by the
                                   parent operators. */
-    PFalg_att_t r_icols;     /**< List of attributes required by the
+    PFarray_t  *r_icols;     /**< List of attributes required by the
                                   parent operators. */
     PFarray_t  *l_keys;      /**< List of attributes that have
                                   unique values. */


-------------------------------------------------------------------------
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

Reply via email to