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

[Markos Zaharioudakis]

No node ordering/distinct required for self axis.

No node ordering/distinct required for self axis.

[Markos Zaharioudakis (markos-za)]

review: Approve

[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-06-24T20-08-54.829Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-06-24T20-08-54.829Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-06-24 08:15:37 +0000
+++ ChangeLog	2013-06-24 19:47:27 +0000
@@ -19,6 +19,7 @@
   * Optimized switch expression
   * Optimized implementation of function caching and removed the restriction
     on the return type.
+  * No node ordering/distinct required for self axis.
 
 Bug Fixes/Other Changes:
   * Fixed bug #1117952 (Improve XML error output format)
@@ -46,6 +47,7 @@
     of general flwor)
   * Fixed bug #1188281 (casting to xs:anySimpleType not allowed)
   * jn:members function takes item()* as aparameter (instead of item())
+  * Fixed bug #1188095 (do correct normalization for fn:string-length()))
   * jn:keys function takes item()* as aparameter (instead of item())
   * Fixed bug #1189996 (Relocate some public API headers to util)
   * Object/array navigation allows item()* as the type of the input sequence

=== modified file 'src/compiler/rewriter/tools/dataflow_annotations.cpp'
--- src/compiler/rewriter/tools/dataflow_annotations.cpp	2013-06-15 02:57:08 +0000
+++ src/compiler/rewriter/tools/dataflow_annotations.cpp	2013-06-24 19:47:27 +0000
@@ -578,7 +578,9 @@
       if (axis == axis_kind_following || axis == axis_kind_following_sibling)
         num_following_axes++;
 
-      if (axis != axis_kind_child && axis != axis_kind_attribute)
+      if (axis != axis_kind_child &&
+          axis != axis_kind_attribute &&
+          axis != axis_kind_self)
       {
         if (only_child_axes && i == num_steps - 1 && num_desc_axes == 1)
         {

=== added file 'test/rbkt/ExpQueryResults/zorba/index/auto_idx_01.xml.res'
=== added file 'test/rbkt/Queries/zorba/index/auto_idx_01.xq'
--- test/rbkt/Queries/zorba/index/auto_idx_01.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/index/auto_idx_01.xq	2013-06-24 19:47:27 +0000
@@ -0,0 +1,20 @@
+
+import module namespace ddl = 
+"http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+
+import module namespace dml = 
+"http://www.zorba-xquery.com/modules/store/static/collections/dml";
+
+import module namespace iddl = 
+"http://www.zorba-xquery.com/modules/store/static/indexes/ddl";
+
+import module namespace idml = 
+"http://www.zorba-xquery.com/modules/store/static/indexes/dml";
+
+import module namespace upd="www.upd_01.com" at "auto_idx_01.xqlib";
+
+
+ddl:create(xs:QName("upd:auctions"));
+
+iddl:create(xs:QName("upd:PersonId"));
+

=== added file 'test/rbkt/Queries/zorba/index/auto_idx_01.xqlib'
--- test/rbkt/Queries/zorba/index/auto_idx_01.xqlib	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/index/auto_idx_01.xqlib	2013-06-24 19:47:27 +0000
@@ -0,0 +1,19 @@
+
+module namespace upd = "www.upd_01.com";
+
+import module namespace ddl = 
+"http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+
+import module namespace dml = 
+"http://www.zorba-xquery.com/modules/store/static/collections/dml";
+
+import module namespace iddl = 
+"http://www.zorba-xquery.com/modules/store/static/indexes/ddl";
+
+declare namespace an = "http://www.zorba-xquery.com/annotations";
+
+declare collection upd:auctions as node()*;
+
+declare %an:unique %an:automatic index upd:PersonId
+on nodes dml:collection(xs:QName("upd:auctions"))/self::person
+by xs:string(./@id) as xs:string;