Update of /cvsroot/monetdb/pathfinder/compiler/algebra/map
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1643/algebra/map
Modified Files:
Tag: XQuery_0-24
map_ori_names.c
Log Message:
-- circumvent bugs #1981491 and #1908822 for the release.
This 'hack' does not fix the real problem (that we have to get rid
of bit-encoded column names), but just disables some optimizations
in case we might get into trouble. Thus we can apply less rewrites
and get 'suboptimal' plans.
THIS IS A RELEASE ONLY CHECKIN --- PLEASE DO NOT PROPAGATE!
U map_ori_names.c
Index: map_ori_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/map/map_ori_names.c,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- map_ori_names.c 28 May 2008 11:37:21 -0000 1.33.2.1
+++ map_ori_names.c 2 Jun 2008 08:44:29 -0000 1.33.2.2
@@ -1018,10 +1018,15 @@
PFla_op_t *
PFmap_ori_names (PFla_op_t *root)
{
+ bool out_of_names;
+
PFarray_t *map = PFarray (sizeof (ori_unq_map), 300);
/* infer original bit-encoded names */
- PFprop_infer_ori_names (root);
+ out_of_names = PFprop_infer_ori_names (root);
+
+ /* do not return anything if we get into trouble with the column names */
+ if (out_of_names) return NULL;
/* generate equivalent algebra DAG */
map_ori_names (root, map);
-------------------------------------------------------------------------
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
