Zorba

Merge lp:~zorba-coders/zorba/probe-no-doc-order-sort into lp:zorba

  1. probe-no-doc-order-sort
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11041
Merged at revision: 11041
Proposed branch: lp:~zorba-coders/zorba/probe-no-doc-order-sort
Merge into: lp:zorba
Diff against target: 231 lines (+32/-42)
7 files modified
ChangeLog (+1/-0)
src/compiler/translator/translator.cpp (+0/-11)
test/rbkt/Queries/zorba/index/auctions1.xq (+9/-9)
test/rbkt/Queries/zorba/index/auctions_module1.xqlib (+4/-4)
test/rbkt/Queries/zorba/index/undo2.xq (+5/-5)
test/rbkt/Queries/zorba/index/undo3.xq (+11/-11)
test/rbkt/Queries/zorba/index/undo4.xq (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/probe-no-doc-order-sort
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Matthias Brantner Approve
Review via email: mp+124322@code.launchpad.net

Commit message

Removed implicit document-order sorting after value probe functions. If this is required to answer queries,
the optimizer should make sure that he puts sorting in place if needed.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/probe-no-doc-order-sort-2012-09-13T23-14-40.218Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job probe-no-doc-order-sort-2012-09-13T23-14-40.218Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/probe-no-doc-order-sort-2012-09-14T00-37-39.869Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job probe-no-doc-order-sort-2012-09-14T00-37-39.869Z 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 'ChangeLog'
2--- ChangeLog 2012-09-13 08:28:50 +0000
3+++ ChangeLog 2012-09-13 23:13:22 +0000
4@@ -17,6 +17,7 @@
5 * New memory management for compiler expressions (no more ref counting)
6 * Exteneded some optimization rules (variable inlining/elimination and positional
7 predicate rewrite) to general flwor expressions.
8+ * Removed document-order sorting after the index value probe functions.
9
10 Bug Fixes/Other Changes:
11 * Fixed bug #867227 (Improved error message for missing commas)
12
13=== modified file 'src/compiler/translator/translator.cpp'
14--- src/compiler/translator/translator.cpp 2012-09-11 22:55:05 +0000
15+++ src/compiler/translator/translator.cpp 2012-09-13 23:13:22 +0000
16@@ -10588,17 +10588,6 @@
17 FunctionConsts::FunctionKind lKind = f->getKind();
18 switch (lKind)
19 {
20- case FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_RANGE_VALUE_N:
21- case FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_POINT_VALUE_N:
22- {
23- FunctionConsts::FunctionKind fkind = FunctionConsts::OP_SORT_NODES_ASC_1;
24-
25- resultExpr = theExprManager->create_fo_expr(theRootSctx,
26- foExpr->get_loc(),
27- BuiltinFunctionLibrary::getFunction(fkind),
28- foExpr);
29- break;
30- }
31 case FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_POINT_GENERAL_N:
32 case FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_RANGE_GENERAL_N:
33 {
34
35=== modified file 'test/rbkt/Queries/zorba/index/auctions1.xq'
36--- test/rbkt/Queries/zorba/index/auctions1.xq 2012-09-11 22:55:05 +0000
37+++ test/rbkt/Queries/zorba/index/auctions1.xq 2012-09-13 23:13:22 +0000
38@@ -77,7 +77,7 @@
39
40 try
41 {
42- index_dml:probe-index-point-value($auctions:AuctionDates, xs:date("2000-12-04"))
43+ index_dml:probe-index-point-value($auctions:AuctionDates, xs:date("2000-12-04"))/.
44 }
45 catch *
46 {
47@@ -91,7 +91,7 @@
48
49 try
50 {
51- index_dml:probe-index-point-value($auctions:AuctionDates, 10)
52+ index_dml:probe-index-point-value($auctions:AuctionDates, 10)/.
53 }
54 catch *
55 {
56@@ -273,7 +273,7 @@
57
58 try
59 {
60- index_dml:probe-index-point-value($auctions:AuctionDates2, xs:date("2000-12-04"))
61+ index_dml:probe-index-point-value($auctions:AuctionDates2, xs:date("2000-12-04"))/.
62 }
63 catch *
64 {
65@@ -287,7 +287,7 @@
66
67 try
68 {
69- index_dml:probe-index-point-value($auctions:AuctionDates2, 10)
70+ index_dml:probe-index-point-value($auctions:AuctionDates2, 10)/.
71 }
72 catch *
73 {
74@@ -394,7 +394,7 @@
75 fn:true(),
76 fn:false(),
77 fn:true(),
78- fn:true())
79+ fn:true())/.
80 return <person>{$person/@id, $person//@income}</person>
81 }
82 catch *
83@@ -414,7 +414,7 @@
84 fn:true(),
85 fn:true(),
86 fn:true(),
87- fn:true())
88+ fn:true())/.
89 return <person>{$person/@id, $person//@income}</person>,
90
91 "
92@@ -429,7 +429,7 @@
93 fn:true(),
94 fn:false(),
95 fn:true(),
96- fn:true())
97+ fn:true())/.
98 return <person>{$person/@id, $person//@income}</person>,
99
100 "
101@@ -444,7 +444,7 @@
102 fn:true(),
103 fn:true(),
104 fn:true(),
105- fn:true())
106+ fn:true())/.
107 return <person>{$person/@id, $person//@income}</person>,
108
109 "
110@@ -474,7 +474,7 @@
111 fn:false(),
112 fn:false(),
113 fn:true(),
114- fn:false())
115+ fn:false())/.
116 return <person>{$person/@id, $person//@income}</person>,
117
118
119
120=== modified file 'test/rbkt/Queries/zorba/index/auctions_module1.xqlib'
121--- test/rbkt/Queries/zorba/index/auctions_module1.xqlib 2012-09-11 22:55:05 +0000
122+++ test/rbkt/Queries/zorba/index/auctions_module1.xqlib 2012-09-13 23:13:22 +0000
123@@ -116,7 +116,7 @@
124
125 declare function auctions:probe-point-id($indexName as xs:QName, $id as xs:string)
126 {
127- index_dml:probe-index-point-value($indexName, $id)
128+ index_dml:probe-index-point-value($indexName, $id)/.
129 };
130
131
132@@ -132,13 +132,13 @@
133 xs:boolean("true"),
134 xs:boolean("false"),
135 xs:boolean("true"),
136- xs:boolean("false"))
137+ xs:boolean("false"))/.
138 };
139
140
141 declare function auctions:probe-point-city($indexName as xs:QName, $city as xs:string?)
142 {
143- index_dml:probe-index-point-value($indexName, $city)
144+ index_dml:probe-index-point-value($indexName, $city)/.
145 };
146
147
148@@ -154,7 +154,7 @@
149 xs:boolean("true"),
150 xs:boolean("false"),
151 xs:boolean("true"),
152- xs:boolean("false"))
153+ xs:boolean("false"))/.
154 };
155
156
157
158=== modified file 'test/rbkt/Queries/zorba/index/undo2.xq'
159--- test/rbkt/Queries/zorba/index/undo2.xq 2012-09-11 22:55:05 +0000
160+++ test/rbkt/Queries/zorba/index/undo2.xq 2012-09-13 23:13:22 +0000
161@@ -34,10 +34,10 @@
162
163 dml:collection($u:auctions1)
164 ,
165-idml:probe-index-point-value($u:PersonId1, "1")
166-,
167-idml:probe-index-point-value($u:PersonId1, "3")
168-,
169-idml:probe-index-point-value($u:PersonId1, "5")
170+idml:probe-index-point-value($u:PersonId1, "1")/.
171+,
172+idml:probe-index-point-value($u:PersonId1, "3")/.
173+,
174+idml:probe-index-point-value($u:PersonId1, "5")/.
175 ,
176 dml:collection($u:auctions2)
177
178=== modified file 'test/rbkt/Queries/zorba/index/undo3.xq'
179--- test/rbkt/Queries/zorba/index/undo3.xq 2012-04-26 22:18:45 +0000
180+++ test/rbkt/Queries/zorba/index/undo3.xq 2012-09-13 23:13:22 +0000
181@@ -41,17 +41,17 @@
182 "
183 "
184 ,
185-idml:probe-index-point-value($u:PersonId1, "1")
186-,
187-"
188-"
189-,
190-idml:probe-index-point-value($u:PersonId1, "3")
191-,
192-"
193-"
194-,
195-idml:probe-index-point-value($u:PersonId1, "5")
196+idml:probe-index-point-value($u:PersonId1, "1")/.
197+,
198+"
199+"
200+,
201+idml:probe-index-point-value($u:PersonId1, "3")/.
202+,
203+"
204+"
205+,
206+idml:probe-index-point-value($u:PersonId1, "5")/.
207 ,
208 "
209 "
210
211=== modified file 'test/rbkt/Queries/zorba/index/undo4.xq'
212--- test/rbkt/Queries/zorba/index/undo4.xq 2012-07-09 05:44:06 +0000
213+++ test/rbkt/Queries/zorba/index/undo4.xq 2012-09-13 23:13:22 +0000
214@@ -37,7 +37,7 @@
215 ,
216 try
217 {
218- idml:probe-index-point-value($u:PersonCars, "vw")
219+ idml:probe-index-point-value($u:PersonCars, "vw")/.
220 }
221 catch *
222 {
223@@ -136,7 +136,7 @@
224 {
225 delete nodes dml:collection($u:c1)[1]/car[1];
226
227-idml:probe-index-point-value($u:PersonCars, "vw")
228+idml:probe-index-point-value($u:PersonCars, "vw")/.
229 }
230 ,
231 "

Subscribers

People subscribed via source and target branches