Zorba

Merge lp:~matthias-brantner/zorba/bug-863730 into lp:zorba

  1. bug-863730
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Superseded
Proposed branch: lp:~matthias-brantner/zorba/bug-863730
Merge into: lp:zorba
Diff against target: 187 lines (+38/-14)
14 files modified
ChangeLog (+1/-0)
include/zorba/pregenerated/diagnostic_list.h (+1/-1)
src/diagnostics/diagnostic_en.xml (+2/-2)
src/diagnostics/pregenerated/diagnostic_list.cpp (+1/-1)
src/diagnostics/pregenerated/dict_en.cpp (+1/-1)
src/runtime/collections/collections_impl.cpp (+24/-6)
test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t4.xml.res (+0/-2)
test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t5.xml.res (+0/-1)
test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec (+1/-0)
test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec (+2/-0)
test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec (+1/-0)
test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec (+2/-0)
test/rbkt/Queries/zorba/xqddf/daniel/t4.spec (+1/-0)
test/rbkt/Queries/zorba/xqddf/daniel/t5.spec (+1/-0)
To merge this branch: bzr merge lp:~matthias-brantner/zorba/bug-863730
Reviewer Review Type Date Requested Status
Zorba Coders Pending
Review via email: mp+77769@code.launchpad.net

This proposal has been superseded by a proposal from 2011-10-01.

Commit message

Fix for bug #863730 (static delete-node* functions don't raise ZDDY0012).

Description of the change

Fix for bug #863730 (static delete-node* functions don't raise ZDDY0012).

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/bug-863730-2011-09-30T23-47-05.623Z/log.html

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

The attempt to merge lp:~matthias-brantner/zorba/bug-863730 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:231 (message):
  Validation queue job bug-863730-2011-09-30T23-47-05.623Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

lp:~matthias-brantner/zorba/bug-863730 updated
10483. By Matthias Brantner

fix for bug #863730 (static delete-node* functions don't raise ZDDY0012)

This fix required to change the expected results of the following tests (documentation was already correct):

test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003
test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007
test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003
test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007
test/rbkt/Queries/zorba/xqddf/daniel/t4
test/rbkt/Queries/zorba/xqddf/daniel/t5

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-09-30 16:08:19 +0000
3+++ ChangeLog 2011-10-01 00:19:19 +0000
4@@ -38,6 +38,7 @@
5 * Fixed bug #855314 (should not fold a constant expr that returns an error item)
6 * Added ExternalFunctionParameter class to be registered in the DynamicContext
7 * Fixed bug #863320 (Sentence is incorrectly incremented when token characters end without sentence terminator)
8+ * Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012)
9
10 version 2.0.1
11
12
13=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
14--- include/zorba/pregenerated/diagnostic_list.h 2011-08-17 23:04:48 +0000
15+++ include/zorba/pregenerated/diagnostic_list.h 2011-10-01 00:19:19 +0000
16@@ -556,7 +556,7 @@
17
18 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0011_COLLECTION_NODE_NOT_FOUND;
19
20-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT;
21+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION;
22
23 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0013_COLLECTION_BAD_DESTROY_INDEXES;
24
25
26=== modified file 'src/diagnostics/diagnostic_en.xml'
27--- src/diagnostics/diagnostic_en.xml 2011-09-16 21:58:20 +0000
28+++ src/diagnostics/diagnostic_en.xml 2011-10-01 00:19:19 +0000
29@@ -1909,8 +1909,8 @@
30 <value>"$1": collection does not contain node</value>
31 </diagnostic>
32
33- <diagnostic code="ZDDY0012" name="COLLECTION_UNORDERED_BAD_INSERT">
34- <value>"$1": illegal insert into unordered collection</value>
35+ <diagnostic code="ZDDY0012" name="COLLECTION_UNORDERED_BAD_OPERATION">
36+ <value>"$1": illegal $2 into unordered collection</value>
37 </diagnostic>
38
39 <diagnostic code="ZDDY0013" name="COLLECTION_BAD_DESTROY_INDEXES">
40
41=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
42--- src/diagnostics/pregenerated/diagnostic_list.cpp 2011-08-17 23:04:48 +0000
43+++ src/diagnostics/pregenerated/diagnostic_list.cpp 2011-10-01 00:19:19 +0000
44@@ -813,7 +813,7 @@
45 ZorbaErrorCode ZDDY0011_COLLECTION_NODE_NOT_FOUND( "ZDDY0011" );
46
47
48-ZorbaErrorCode ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT( "ZDDY0012" );
49+ZorbaErrorCode ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION( "ZDDY0012" );
50
51
52 ZorbaErrorCode ZDDY0013_COLLECTION_BAD_DESTROY_INDEXES( "ZDDY0013" );
53
54=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
55--- src/diagnostics/pregenerated/dict_en.cpp 2011-09-16 21:58:20 +0000
56+++ src/diagnostics/pregenerated/dict_en.cpp 2011-10-01 00:19:19 +0000
57@@ -272,7 +272,7 @@
58 { "ZDDY0009", "\"$1\": not all nodes to delete are at the beginning of this queue collection" },
59 { "ZDDY0010", "\"$1\": illegal update of read-only nodes" },
60 { "ZDDY0011", "\"$1\": collection does not contain node" },
61- { "ZDDY0012", "\"$1\": illegal insert into unordered collection" },
62+ { "ZDDY0012", "\"$1\": illegal $2 into unordered collection" },
63 { "ZDDY0013", "\"$1\": can not delete collection because indexes reference it" },
64 { "ZDDY0014", "\"$1\": can not delete collection because integrity constraints reference it" },
65 { "ZDDY0015", "\"$1\": can not delete collection because there are references to its nodes" },
66
67=== modified file 'src/runtime/collections/collections_impl.cpp'
68--- src/runtime/collections/collections_impl.cpp 2011-09-16 13:26:06 +0000
69+++ src/runtime/collections/collections_impl.cpp 2011-10-01 00:19:19 +0000
70@@ -716,8 +716,8 @@
71 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
72 {
73 throw XQUERY_EXCEPTION(
74- zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT,
75- ERROR_PARAMS( aName->getStringValue() ),
76+ zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
77+ ERROR_PARAMS( aName->getStringValue(), "insert" ),
78 ERROR_LOC( loc )
79 );
80 }
81@@ -803,8 +803,8 @@
82 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
83 {
84 throw XQUERY_EXCEPTION(
85- zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT,
86- ERROR_PARAMS( aName->getStringValue() ),
87+ zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
88+ ERROR_PARAMS( aName->getStringValue(), "insert" ),
89 ERROR_LOC( loc )
90 );
91 }
92@@ -900,8 +900,8 @@
93 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
94 {
95 throw XQUERY_EXCEPTION(
96- zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT,
97- ERROR_PARAMS( aName->getStringValue() ),
98+ zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
99+ ERROR_PARAMS( aName->getStringValue(), "insert" ),
100 ERROR_LOC( loc )
101 );
102 }
103@@ -1574,6 +1574,15 @@
104 ERROR_LOC( aLoc )
105 );
106 }
107+ if (collectionDecl &&
108+ collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
109+ {
110+ throw XQUERY_EXCEPTION(
111+ zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
112+ ERROR_PARAMS( aName->getStringValue(), "delete" ),
113+ ERROR_LOC(loc)
114+ );
115+ }
116
117 return collectionDecl;
118 }
119@@ -1722,6 +1731,15 @@
120 ERROR_LOC( aLoc )
121 );
122 }
123+ if (collectionDecl &&
124+ collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
125+ {
126+ throw XQUERY_EXCEPTION(
127+ zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
128+ ERROR_PARAMS( aName->getStringValue(), "delete" ),
129+ ERROR_LOC(loc)
130+ );
131+ }
132 return collectionDecl;
133 }
134
135
136=== removed file 'test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t4.xml.res'
137--- test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t4.xml.res 2011-06-24 19:58:33 +0000
138+++ test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t4.xml.res 1970-01-01 00:00:00 +0000
139@@ -1,2 +0,0 @@
140-<?xml version="1.0" encoding="UTF-8"?>
141-<wb>2</wb><wb>3</wb><wb>4</wb><wb>5</wb><wb>6</wb><wb>7</wb><wb>8</wb><wb>9</wb><wb>10</wb>
142\ No newline at end of file
143
144=== removed file 'test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t5.xml.res'
145--- test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t5.xml.res 2011-06-24 19:58:33 +0000
146+++ test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t5.xml.res 1970-01-01 00:00:00 +0000
147@@ -1,1 +0,0 @@
148-<?xml version="1.0" encoding="UTF-8"?>
149\ No newline at end of file
150
151=== added file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec'
152--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec 1970-01-01 00:00:00 +0000
153+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec 2011-10-01 00:19:19 +0000
154@@ -0,0 +1,1 @@
155+Error: http://www.zorba-xquery.com/errors:ZDDY0012
156
157=== added file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec'
158--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec 1970-01-01 00:00:00 +0000
159+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec 2011-10-01 00:19:19 +0000
160@@ -0,0 +1,2 @@
161+Error: http://www.zorba-xquery.com/errors:ZDDY0012
162+
163
164=== added file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec'
165--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec 1970-01-01 00:00:00 +0000
166+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec 2011-10-01 00:19:19 +0000
167@@ -0,0 +1,1 @@
168+Error: http://www.zorba-xquery.com/errors:ZDDY0012
169
170=== added file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec'
171--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec 1970-01-01 00:00:00 +0000
172+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec 2011-10-01 00:19:19 +0000
173@@ -0,0 +1,2 @@
174+Error: http://www.zorba-xquery.com/errors:ZDDY0012
175+
176
177=== added file 'test/rbkt/Queries/zorba/xqddf/daniel/t4.spec'
178--- test/rbkt/Queries/zorba/xqddf/daniel/t4.spec 1970-01-01 00:00:00 +0000
179+++ test/rbkt/Queries/zorba/xqddf/daniel/t4.spec 2011-10-01 00:19:19 +0000
180@@ -0,0 +1,1 @@
181+Error: http://www.zorba-xquery.com/errors:ZDDY0012
182
183=== added file 'test/rbkt/Queries/zorba/xqddf/daniel/t5.spec'
184--- test/rbkt/Queries/zorba/xqddf/daniel/t5.spec 1970-01-01 00:00:00 +0000
185+++ test/rbkt/Queries/zorba/xqddf/daniel/t5.spec 2011-10-01 00:19:19 +0000
186@@ -0,0 +1,1 @@
187+Error: http://www.zorba-xquery.com/errors:ZDDY0012

Subscribers

People subscribed via source and target branches