Merge lp:~zorba-coders/zorba/deterministic-keys1g into lp:zorba

[Till Westmann]

ensure deterministic test results for keys of index on unordered collection by sorting

ensure deterministic test results for keys of index on unordered collection by sorting

[David Graf (davidagraf)]

Very good. I need to do the same for the paging tests :-(

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T09-15-00.565Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T09-15-00.565Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[Ghislain Fourny (gislenius)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T12-48-00.379Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T12-48-00.379Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T13-14-03.962Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T13-14-03.962Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T13-39-57.025Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T13-39-57.025Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T14-05-57.802Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T14-05-57.802Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T14-32-00.894Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T14-32-00.894Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T14-57-58.466Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T14-57-58.466Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T15-24-06.483Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T15-24-06.483Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T15-50-02.515Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T15-50-02.515Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T16-19-49.153Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T16-19-49.153Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T16-46-59.97Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job deterministic-keys1g-2012-09-05T16-46-59.97Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/deterministic-keys1g-2012-09-05T17-13-03.364Z/log.html

=== modified file 'test/rbkt/ExpQueryResults/zorba/index/keys1g.xml.res'
--- test/rbkt/ExpQueryResults/zorba/index/keys1g.xml.res	2012-07-13 21:13:30 +0000
+++ test/rbkt/ExpQueryResults/zorba/index/keys1g.xml.res	2012-09-04 17:54:21 +0000
@@ -1,32 +1,32 @@
-<keys>
+<keys count="10">
+  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+    <attribute type="xs:long" value="0"></attribute>
+  </key>
+  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+    <attribute type="xs:long" value="2"></attribute>
+  </key>
+  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+    <attribute type="xs:long" value="4"></attribute>
+  </key>
+  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+    <attribute type="xs:long" value="6"></attribute>
+  </key>
+  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+    <attribute type="xs:long" value="8"></attribute>
+  </key>
   <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
     <attribute type="xs:string" value="2"></attribute>
   </key>
   <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
+    <attribute type="xs:string" value="4"></attribute>
+  </key>
+  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
     <attribute type="xs:string" value="6"></attribute>
   </key>
   <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
-    <attribute type="xs:string" value="4"></attribute>
+    <attribute type="xs:string" value="8"></attribute>
   </key>
   <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
     <attribute type="xs:string" value="10"></attribute>
   </key>
-  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
-    <attribute type="xs:string" value="8"></attribute>
-  </key>
-  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
-    <attribute type="xs:long" value="0"></attribute>
-  </key>
-  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
-    <attribute type="xs:long" value="6"></attribute>
-  </key>
-  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
-    <attribute type="xs:long" value="2"></attribute>
-  </key>
-  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
-    <attribute type="xs:long" value="8"></attribute>
-  </key>
-  <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
-    <attribute type="xs:long" value="4"></attribute>
-  </key>
 </keys>
 
=== modified file 'test/rbkt/Queries/zorba/index/keys1g.xq'
--- test/rbkt/Queries/zorba/index/keys1g.xq	2012-07-13 21:13:30 +0000
+++ test/rbkt/Queries/zorba/index/keys1g.xq	2012-09-04 17:54:21 +0000
@@ -17,10 +17,12 @@
       <foo id="{$i - 1}" string="true"/>
   );
 
-let $keys := index_dml:keys(xs:QName("keys-lib:FooIdx-general"))
-let $attr := $keys[1]/self::*:key/*:attribute/@*:value
+let $keys :=
+  for $key in index_dml:keys(xs:QName("keys-lib:FooIdx-general"))
+  let $attr := $key/self::*:key/*:attribute
+  order by xs:string($attr/@*:type), xs:long($attr/@*:value)
+  return $key
 return
-  <keys>{
+  <keys count="{ count($keys) }">{
     $keys
   }</keys>
-