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
=== modified file 'ChangeLog'
--- ChangeLog 2011-09-30 16:08:19 +0000
+++ ChangeLog 2011-10-01 00:19:19 +0000
@@ -38,6 +38,7 @@
38 * Fixed bug #855314 (should not fold a constant expr that returns an error item)38 * Fixed bug #855314 (should not fold a constant expr that returns an error item)
39 * Added ExternalFunctionParameter class to be registered in the DynamicContext39 * Added ExternalFunctionParameter class to be registered in the DynamicContext
40 * Fixed bug #863320 (Sentence is incorrectly incremented when token characters end without sentence terminator)40 * Fixed bug #863320 (Sentence is incorrectly incremented when token characters end without sentence terminator)
41 * Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012)
4142
42version 2.0.143version 2.0.1
4344
4445
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2011-08-17 23:04:48 +0000
+++ include/zorba/pregenerated/diagnostic_list.h 2011-10-01 00:19:19 +0000
@@ -556,7 +556,7 @@
556556
557extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0011_COLLECTION_NODE_NOT_FOUND;557extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0011_COLLECTION_NODE_NOT_FOUND;
558558
559extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT;559extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION;
560560
561extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0013_COLLECTION_BAD_DESTROY_INDEXES;561extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0013_COLLECTION_BAD_DESTROY_INDEXES;
562562
563563
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2011-09-16 21:58:20 +0000
+++ src/diagnostics/diagnostic_en.xml 2011-10-01 00:19:19 +0000
@@ -1909,8 +1909,8 @@
1909 <value>"$1": collection does not contain node</value>1909 <value>"$1": collection does not contain node</value>
1910 </diagnostic>1910 </diagnostic>
19111911
1912 <diagnostic code="ZDDY0012" name="COLLECTION_UNORDERED_BAD_INSERT">1912 <diagnostic code="ZDDY0012" name="COLLECTION_UNORDERED_BAD_OPERATION">
1913 <value>"$1": illegal insert into unordered collection</value>1913 <value>"$1": illegal $2 into unordered collection</value>
1914 </diagnostic>1914 </diagnostic>
19151915
1916 <diagnostic code="ZDDY0013" name="COLLECTION_BAD_DESTROY_INDEXES">1916 <diagnostic code="ZDDY0013" name="COLLECTION_BAD_DESTROY_INDEXES">
19171917
=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp 2011-08-17 23:04:48 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp 2011-10-01 00:19:19 +0000
@@ -813,7 +813,7 @@
813ZorbaErrorCode ZDDY0011_COLLECTION_NODE_NOT_FOUND( "ZDDY0011" );813ZorbaErrorCode ZDDY0011_COLLECTION_NODE_NOT_FOUND( "ZDDY0011" );
814814
815815
816ZorbaErrorCode ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT( "ZDDY0012" );816ZorbaErrorCode ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION( "ZDDY0012" );
817817
818818
819ZorbaErrorCode ZDDY0013_COLLECTION_BAD_DESTROY_INDEXES( "ZDDY0013" );819ZorbaErrorCode ZDDY0013_COLLECTION_BAD_DESTROY_INDEXES( "ZDDY0013" );
820820
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2011-09-16 21:58:20 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp 2011-10-01 00:19:19 +0000
@@ -272,7 +272,7 @@
272 { "ZDDY0009", "\"$1\": not all nodes to delete are at the beginning of this queue collection" },272 { "ZDDY0009", "\"$1\": not all nodes to delete are at the beginning of this queue collection" },
273 { "ZDDY0010", "\"$1\": illegal update of read-only nodes" },273 { "ZDDY0010", "\"$1\": illegal update of read-only nodes" },
274 { "ZDDY0011", "\"$1\": collection does not contain node" },274 { "ZDDY0011", "\"$1\": collection does not contain node" },
275 { "ZDDY0012", "\"$1\": illegal insert into unordered collection" },275 { "ZDDY0012", "\"$1\": illegal $2 into unordered collection" },
276 { "ZDDY0013", "\"$1\": can not delete collection because indexes reference it" },276 { "ZDDY0013", "\"$1\": can not delete collection because indexes reference it" },
277 { "ZDDY0014", "\"$1\": can not delete collection because integrity constraints reference it" },277 { "ZDDY0014", "\"$1\": can not delete collection because integrity constraints reference it" },
278 { "ZDDY0015", "\"$1\": can not delete collection because there are references to its nodes" },278 { "ZDDY0015", "\"$1\": can not delete collection because there are references to its nodes" },
279279
=== modified file 'src/runtime/collections/collections_impl.cpp'
--- src/runtime/collections/collections_impl.cpp 2011-09-16 13:26:06 +0000
+++ src/runtime/collections/collections_impl.cpp 2011-10-01 00:19:19 +0000
@@ -716,8 +716,8 @@
716 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)716 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
717 {717 {
718 throw XQUERY_EXCEPTION(718 throw XQUERY_EXCEPTION(
719 zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT,719 zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
720 ERROR_PARAMS( aName->getStringValue() ),720 ERROR_PARAMS( aName->getStringValue(), "insert" ),
721 ERROR_LOC( loc )721 ERROR_LOC( loc )
722 );722 );
723 }723 }
@@ -803,8 +803,8 @@
803 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)803 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
804 {804 {
805 throw XQUERY_EXCEPTION(805 throw XQUERY_EXCEPTION(
806 zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT,806 zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
807 ERROR_PARAMS( aName->getStringValue() ),807 ERROR_PARAMS( aName->getStringValue(), "insert" ),
808 ERROR_LOC( loc )808 ERROR_LOC( loc )
809 );809 );
810 }810 }
@@ -900,8 +900,8 @@
900 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)900 if (collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
901 {901 {
902 throw XQUERY_EXCEPTION(902 throw XQUERY_EXCEPTION(
903 zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_INSERT,903 zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
904 ERROR_PARAMS( aName->getStringValue() ),904 ERROR_PARAMS( aName->getStringValue(), "insert" ),
905 ERROR_LOC( loc )905 ERROR_LOC( loc )
906 );906 );
907 }907 }
@@ -1574,6 +1574,15 @@
1574 ERROR_LOC( aLoc )1574 ERROR_LOC( aLoc )
1575 );1575 );
1576 }1576 }
1577 if (collectionDecl &&
1578 collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
1579 {
1580 throw XQUERY_EXCEPTION(
1581 zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
1582 ERROR_PARAMS( aName->getStringValue(), "delete" ),
1583 ERROR_LOC(loc)
1584 );
1585 }
15771586
1578 return collectionDecl;1587 return collectionDecl;
1579}1588}
@@ -1722,6 +1731,15 @@
1722 ERROR_LOC( aLoc )1731 ERROR_LOC( aLoc )
1723 );1732 );
1724 }1733 }
1734 if (collectionDecl &&
1735 collectionDecl->getOrderProperty() == StaticContextConsts::decl_unordered)
1736 {
1737 throw XQUERY_EXCEPTION(
1738 zerr::ZDDY0012_COLLECTION_UNORDERED_BAD_OPERATION,
1739 ERROR_PARAMS( aName->getStringValue(), "delete" ),
1740 ERROR_LOC(loc)
1741 );
1742 }
1725 return collectionDecl;1743 return collectionDecl;
1726}1744}
17271745
17281746
=== removed file 'test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t4.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t4.xml.res 2011-06-24 19:58:33 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t4.xml.res 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<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>
3\ No newline at end of file0\ No newline at end of file
41
=== removed file 'test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t5.xml.res'
--- test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t5.xml.res 2011-06-24 19:58:33 +0000
+++ test/rbkt/ExpQueryResults/zorba/xqddf/daniel/t5.xml.res 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2\ No newline at end of file0\ No newline at end of file
31
=== added file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_003.spec 2011-10-01 00:19:19 +0000
@@ -0,0 +1,1 @@
1Error: http://www.zorba-xquery.com/errors:ZDDY0012
02
=== added file 'test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_first/delete_nodes_collection_007.spec 2011-10-01 00:19:19 +0000
@@ -0,0 +1,2 @@
1Error: http://www.zorba-xquery.com/errors:ZDDY0012
2
03
=== added file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_003.spec 2011-10-01 00:19:19 +0000
@@ -0,0 +1,1 @@
1Error: http://www.zorba-xquery.com/errors:ZDDY0012
02
=== added file 'test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec'
--- test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/collections/delete_nodes_last/delete_nodes_collection_007.spec 2011-10-01 00:19:19 +0000
@@ -0,0 +1,2 @@
1Error: http://www.zorba-xquery.com/errors:ZDDY0012
2
03
=== added file 'test/rbkt/Queries/zorba/xqddf/daniel/t4.spec'
--- test/rbkt/Queries/zorba/xqddf/daniel/t4.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/t4.spec 2011-10-01 00:19:19 +0000
@@ -0,0 +1,1 @@
1Error: http://www.zorba-xquery.com/errors:ZDDY0012
02
=== added file 'test/rbkt/Queries/zorba/xqddf/daniel/t5.spec'
--- test/rbkt/Queries/zorba/xqddf/daniel/t5.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/daniel/t5.spec 2011-10-01 00:19:19 +0000
@@ -0,0 +1,1 @@
1Error: http://www.zorba-xquery.com/errors:ZDDY0012

Subscribers

People subscribed via source and target branches