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

Proposed by Till Westmann on 2012-09-04
Status: Merged
Approved by: Chris Hillery on 2012-09-05
Approved revision: 11020
Merged at revision: 11021
Proposed branch: lp:~zorba-coders/zorba/deterministic-keys1g
Merge into: lp:zorba
Diff against target: 77 lines (+26/-24)
2 files modified
test/rbkt/ExpQueryResults/zorba/index/keys1g.xml.res (+20/-20)
test/rbkt/Queries/zorba/index/keys1g.xq (+6/-4)
To merge this branch: bzr merge lp:~zorba-coders/zorba/deterministic-keys1g
Reviewer Review Type Date Requested Status
Ghislain Fourny 2012-09-04 Approve on 2012-09-05
David Graf (community) 2012-09-04 Approve on 2012-09-05
Review via email: mp+122729@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
David Graf (davidagraf) wrote :

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

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

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) wrote :

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

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/rbkt/ExpQueryResults/zorba/index/keys1g.xml.res'
2--- test/rbkt/ExpQueryResults/zorba/index/keys1g.xml.res 2012-07-13 21:13:30 +0000
3+++ test/rbkt/ExpQueryResults/zorba/index/keys1g.xml.res 2012-09-04 17:54:21 +0000
4@@ -1,32 +1,32 @@
5-<keys>
6+<keys count="10">
7+ <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
8+ <attribute type="xs:long" value="0"></attribute>
9+ </key>
10+ <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
11+ <attribute type="xs:long" value="2"></attribute>
12+ </key>
13+ <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
14+ <attribute type="xs:long" value="4"></attribute>
15+ </key>
16+ <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
17+ <attribute type="xs:long" value="6"></attribute>
18+ </key>
19+ <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
20+ <attribute type="xs:long" value="8"></attribute>
21+ </key>
22 <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
23 <attribute type="xs:string" value="2"></attribute>
24 </key>
25 <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
26+ <attribute type="xs:string" value="4"></attribute>
27+ </key>
28+ <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
29 <attribute type="xs:string" value="6"></attribute>
30 </key>
31 <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
32- <attribute type="xs:string" value="4"></attribute>
33+ <attribute type="xs:string" value="8"></attribute>
34 </key>
35 <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
36 <attribute type="xs:string" value="10"></attribute>
37 </key>
38- <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
39- <attribute type="xs:string" value="8"></attribute>
40- </key>
41- <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
42- <attribute type="xs:long" value="0"></attribute>
43- </key>
44- <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
45- <attribute type="xs:long" value="6"></attribute>
46- </key>
47- <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
48- <attribute type="xs:long" value="2"></attribute>
49- </key>
50- <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
51- <attribute type="xs:long" value="8"></attribute>
52- </key>
53- <key xmlns="http://www.zorba-xquery.com/modules/store/static/indexes/dml">
54- <attribute type="xs:long" value="4"></attribute>
55- </key>
56 </keys>
57
58=== modified file 'test/rbkt/Queries/zorba/index/keys1g.xq'
59--- test/rbkt/Queries/zorba/index/keys1g.xq 2012-07-13 21:13:30 +0000
60+++ test/rbkt/Queries/zorba/index/keys1g.xq 2012-09-04 17:54:21 +0000
61@@ -17,10 +17,12 @@
62 <foo id="{$i - 1}" string="true"/>
63 );
64
65-let $keys := index_dml:keys(xs:QName("keys-lib:FooIdx-general"))
66-let $attr := $keys[1]/self::*:key/*:attribute/@*:value
67+let $keys :=
68+ for $key in index_dml:keys(xs:QName("keys-lib:FooIdx-general"))
69+ let $attr := $key/self::*:key/*:attribute
70+ order by xs:string($attr/@*:type), xs:long($attr/@*:value)
71+ return $key
72 return
73- <keys>{
74+ <keys count="{ count($keys) }">{
75 $keys
76 }</keys>
77-

Subscribers

People subscribed via source and target branches