zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/99792

Fixed bug #866547
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/99792
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-28 05:19:57 +0000
+++ ChangeLog	2012-03-28 17:32:21 +0000
@@ -6,7 +6,8 @@
   * Extended API for Python, Java, PHP and Ruby.
 
 Bug Fixes/Other Changes:
-  * Fixed bug in window iterator
+  * Fixed bug in window iterator (binding the end vars in the output tuple stream)
+  * Fixed bug #866547 (protect index-join rule from general flwor)
   * Fixed performance problem with the findNodeSources function of the no-copy rule
   * Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
 

=== modified file 'src/compiler/rewriter/rules/index_join_rule.cpp'
--- src/compiler/rewriter/rules/index_join_rule.cpp	2012-03-28 05:19:57 +0000
+++ src/compiler/rewriter/rules/index_join_rule.cpp	2012-03-28 17:32:21 +0000
@@ -74,6 +74,9 @@
 {
   flwor_expr* flworExpr = NULL;
 
+  if (node->get_expr_kind() == gflwor_expr_kind)
+    return node;
+
   if (node->get_expr_kind() == flwor_expr_kind)
   {
     flworExpr = static_cast<flwor_expr *>(node);