Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

[Markos Zaharioudakis]

Fixed bug #1125444 (input group-by exprs were not treated by index-flwor_vars() functoin, leading to erroneous loop hoisting).

Fixed bug #1125444 (input group-by exprs were not treated by index-flwor_vars() functoin, leading to erroneous loop hoisting).

[lp:~zorba-coders/zorba/markos-scratch]

11019. By Markos Zaharioudakis on 2013-02-27

Fixed bug #1125444

11020. By Markos Zaharioudakis on 2013-02-27

Fixed bug #1125444

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-02-27T15-59-48.996Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-02-27T15-59-48.996Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-02-26 22:28:33 +0000
+++ ChangeLog	2013-02-27 15:35:42 +0000
@@ -37,6 +37,8 @@
   * Fixed bug #1099648 and #1088886 (XML parsing failures on Red Hat)
   * Fixed bug #1099535 (xml:parse endless loop)
   * Fixed bug #866958 (Parsing error not explicit enough)
+  * Fixed bug #1125444 (input group-by exprs were not treated by index-flwor_vars()
+    functoin, leading to erroneous loop hoisting).
   * Fixed bug #867068 (Incorrect usage of XQDY0027)
   * Fixed bug #1023362 (xsi:type attribute ignored during validation)
 

=== modified file 'src/compiler/rewriter/tools/expr_tools.cpp'
--- src/compiler/rewriter/tools/expr_tools.cpp	2012-12-29 20:25:12 +0000
+++ src/compiler/rewriter/tools/expr_tools.cpp	2013-02-27 15:35:42 +0000
@@ -785,16 +785,25 @@
         const groupby_clause* gc = static_cast<const groupby_clause *>(c);
 
         const flwor_clause::rebind_list_t& gvars = gc->get_grouping_vars();
+        const flwor_clause::rebind_list_t& ngvars = gc->get_nongrouping_vars();
         csize numGroupVars = gvars.size();
+        csize numNonGroupVars = ngvars.size();
+
+        for (csize i = 0; i < numGroupVars; ++i)
+        {
+          index_flwor_vars(gvars[i].first, numVars, varidmap, idvarmap);
+        }
+
+        for (csize i = 0; i < numNonGroupVars; ++i)
+        {
+          index_flwor_vars(ngvars[i].first, numVars, varidmap, idvarmap);
+        }
 
         for (csize i = 0; i < numGroupVars; ++i)
         {
           add_var(gvars[i].second, numVars, varidmap, idvarmap);
         }
-
-        const flwor_clause::rebind_list_t& ngvars = gc->get_nongrouping_vars();
-        csize numNonGroupVars = ngvars.size();
-
+        
         for (csize i = 0; i < numNonGroupVars; ++i)
         {
           add_var(ngvars[i].second, numVars, varidmap, idvarmap);

=== added file 'test/rbkt/ExpQueryResults/zorba/gflwor/gflwor07.xml.res'
=== added file 'test/rbkt/Queries/zorba/gflwor/gflwor07.xq'
--- test/rbkt/Queries/zorba/gflwor/gflwor07.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/gflwor/gflwor07.xq	2013-02-27 15:35:42 +0000
@@ -0,0 +1,25 @@
+import module namespace ddl = 
+"http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
+
+import module namespace dml = 
+"http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
+
+
+variable $foo := 1;
+
+ddl:create(xs:QName("FOO"));
+
+
+for $zip in dml:collection(xs:QName("FOO"))//foo
+let $zip := jn:parse-json(xs:string($zip))
+let $state := $zip("state")
+group by $state
+let $pop := sum($zip("pop"))
+where $pop > 10000000
+order by $pop descending
+return
+{
+ "state": $state,
+ "population" : $pop,
+ "seq" : { $foo := $foo+1; $foo }
+}