[Zorba-coders] [Bug 882002] [NEW] fix fn-collection-2 test
Public bug reported: fn:collection spec has change the error condition from err:FODC0004 to err:FODC0002: An error is raised [err:FODC0002] if available collections provides no mapping for the absolutized URI. Please see http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542 As a result: - Zorba has to change the error condition in this case - should not mark the test as a known failure due to a W3C bug - should remove the exception from the W3C conformance report that marks fn-collection-2 as passing ** Affects: zorba Importance: Medium Assignee: Sorin Marian Nasoi (sorin.marian.nasoi) Status: New ** Changed in: zorba Assignee: (unassigned) = Sorin Marian Nasoi (sorin.marian.nasoi) ** Changed in: zorba Importance: Undecided = Medium -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/882002 Title: fix fn-collection-2 test Status in Zorba - The XQuery Processor: New Bug description: fn:collection spec has change the error condition from err:FODC0004 to err:FODC0002: An error is raised [err:FODC0002] if available collections provides no mapping for the absolutized URI. Please see http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542 As a result: - Zorba has to change the error condition in this case - should not mark the test as a known failure due to a W3C bug - should remove the exception from the W3C conformance report that marks fn-collection-2 as passing To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/882002/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug_882002 into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bug_882002 into lp:zorba. Requested reviews: Daniel Turcanu (danielturcanu) Related bugs: Bug #882002 in Zorba: fix fn-collection-2 test https://bugs.launchpad.net/zorba/+bug/882002 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug_882002/+merge/80454 Fix for bug lp:882002: - changed the error thrown for W3C test fn-collection-2 according to the decision took by the W3C in http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542 that is reflected in the latest XQuery 3.0 FO spec for fn:collection: An error is raised [err:FODC0002] if available collections provides no mapping for the absolutized URI. - added a new expected result for the RQ because it uses XQTS_1_0_3 where the expected error for this test is [err:FODC0004]. - removed the exception added for fn-collection-2 in the script that generates the conformance results for W3C -- https://code.launchpad.net/~zorba-coders/zorba/bug_882002/+merge/80454 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/runtime/collections/collections_impl.cpp' --- src/runtime/collections/collections_impl.cpp 2011-10-19 15:28:51 + +++ src/runtime/collections/collections_impl.cpp 2011-10-26 13:51:11 + @@ -161,7 +161,7 @@ if ( lCollResource == 0 || !(coll = lCollResource-getCollection()) ) { throw XQUERY_EXCEPTION( - err::FODC0004, + err::FODC0002, ERROR_PARAMS( resolvedURIString, lErrorMessage ), ERROR_LOC( loc ) ); === modified file 'test/rbkt/Queries/CMakeLists.txt' --- test/rbkt/Queries/CMakeLists.txt 2011-10-13 12:46:50 + +++ test/rbkt/Queries/CMakeLists.txt 2011-10-26 13:51:11 + @@ -201,7 +201,7 @@ ENDIF (ZORBATEST_TESTDRIVER_MT_AVAILABLE AND ZORBATEST_USE_MT_XQTS AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/w3c_testsuite) -SET(ZORBA_TEST_W3C_TO_SUBMIT_RESULTS OFF CACHE BOOL Bool var that says if w3c testing results are to be submited to w3c, or just for internal testing. If they are for internal testing then we can mark some failing tests as expected results.) +SET(ZORBA_TEST_W3C_TO_SUBMIT_RESULTS OFF CACHE BOOL Bool var that says if w3c testing results are to be submitted to w3c, or just for internal testing. If they are for internal testing then we can mark some failing tests as expected results.) MARK_AS_ADVANCED(ZORBA_TEST_W3C_TO_SUBMIT_RESULTS) @@ -230,6 +230,10 @@ EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes014 3355019) EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQueryX/StaticTyping/STPathExpr/STSteps/STAxes/ST-Axes015 3355019) ENDIF(ZORBA_TEST_XQUERYX) + + #this is marked as expected failure because the RQ uses XQTS_1_0_3. In that version the expected result is err:FODC0004 instead of err:FODC0002. + #W3C has changed the expected result for this test in the meantime: please see http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542 + EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQuery/Functions/NodeSeqFunc/SeqCollectionFunc/fn-collection-2 882002) ENDIF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS) === modified file 'test/rbkt/Queries/w3c_known_failures.txt' --- test/rbkt/Queries/w3c_known_failures.txt 2011-10-13 12:46:50 + +++ test/rbkt/Queries/w3c_known_failures.txt 2011-10-26 13:51:11 + @@ -69,6 +69,7 @@ test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch10 test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-6 test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/caselessmatch09 +test/rbkt/w3c_testsuite/XQuery/Functions/NodeSeqFunc/SeqCollectionFunc/fn-collection-2 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-004 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-903 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-007 === modified file 'test/rbkt/Scripts/w3c/generate-submission-xqts.xq' --- test/rbkt/Scripts/w3c/generate-submission-xqts.xq 2011-10-07 08:28:43 + +++ test/rbkt/Scripts/w3c/generate-submission-xqts.xq 2011-10-26 13:51:11 + @@ -83,12 +83,6 @@ result=pass comment=Opened W3C bug #11584. / - else if($testname = 'fn-collection-2')then - test-case - name={$testname} - result=pass - comment=Opened W3C bug #12542. -/ else test-case name={$testname} -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug_872502 into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bug_872502 into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Related bugs: Bug #872502 in Zorba: validation of the JSON module xqdoc fails https://bugs.launchpad.net/zorba/+bug/872502 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug_872502/+merge/80463 Fix for bug lp:872502: - in the case where library modules were using external C++ library dependencies (like it was the case with the reported Json module) the XQDoc XML generated by Zorba was not valid according to the XQDoc schema: this was fixed. - also the XQDoc2XHTML generator was updated to reflect this change - added 2 tests but I used a module part of the Zorba core (http://www.zorba-xquery.com/modules/http-client) that has an external C++ library dependency on Curl -- https://code.launchpad.net/~zorba-coders/zorba/bug_872502/+merge/80463 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq' --- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2011-10-19 05:09:31 + +++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2011-10-26 15:15:29 + @@ -1154,7 +1154,7 @@ : @return the XHTML for the module annotations. :) declare %private function xqdoc2html:annotations-module($comment) { - let $annotations := $comment/xqdoc:*[not((local-name(.) = (description, param, return, error, deprecated, see, library, project, custom)))] + let $annotations := $comment/xqdoc:*[not((local-name(.) = (description, param, return, error, deprecated, see, project, custom)))] return for $annotation in $annotations let $annName := local-name($annotation) @@ -1195,7 +1195,7 @@ declare %private function xqdoc2html:module-dependencies( $xqdoc) { if (fn:count($xqdoc/xqdoc:imports/xqdoc:import) 0 or - fn:count($xqdoc/xqdoc:module/xqdoc:comment/xqdoc:*[(local-name(.) = (library))]) 0) then + fn:count($xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag=library]) 0) then (div class=sectionspan id=module_dependenciesModule Dependencies/span/div, xqdoc2html:imports($xqdoc)) else @@ -1238,10 +1238,10 @@ } /ul/p else (), - if (fn:count($xqdoc/xqdoc:module/xqdoc:comment/xqdoc:*[(local-name(.) = (library))]) 0) then + if (fn:count($xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag=library]) 0) then pExternal C++ library dependencies:ul { - for $library in $xqdoc/xqdoc:module/xqdoc:comment/xqdoc:*[(local-name(.) = (library))] + for $library in $xqdoc/xqdoc:module/xqdoc:comment/xqdoc:custom[@tag=library] return li{$library/node()}/li } === modified file 'src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp' --- src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2011-08-11 19:09:24 + +++ src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2011-10-26 15:15:29 + @@ -338,7 +338,7 @@ // library for (lIt = lLibraryAnn.begin(); lIt != lLibraryAnn.end(); ++lIt) { const XQDocAnnotation lAnnotation = *lIt; - printCommentFragment(lCommentElem, lAnnotation.getValue().str(), library); + printCommentFragment(lCommentElem, lAnnotation.getValue().str(), library, true); } // example === added file 'test/rbkt/ExpQueryResults/zorba/schemas/validate_xqdoc_01.xml.res' --- test/rbkt/ExpQueryResults/zorba/schemas/validate_xqdoc_01.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/schemas/validate_xqdoc_01.xml.res 2011-10-26 15:15:29 + @@ -0,0 +1,1 @@ +true === added file 'test/rbkt/ExpQueryResults/zorba/schemas/validate_xqdoc_02.xml.res' --- test/rbkt/ExpQueryResults/zorba/schemas/validate_xqdoc_02.xml.res 1970-01-01 00:00:00 + +++ test/rbkt/ExpQueryResults/zorba/schemas/validate_xqdoc_02.xml.res 2011-10-26 15:15:29 + @@ -0,0 +1,1 @@ +true === added file 'test/rbkt/Queries/zorba/schemas/validate_xqdoc_01.xq' --- test/rbkt/Queries/zorba/schemas/validate_xqdoc_01.xq 1970-01-01 00:00:00 + +++ test/rbkt/Queries/zorba/schemas/validate_xqdoc_01.xq 2011-10-26 15:15:29 + @@ -0,0 +1,4 @@ +import module namespace x = http://www.zorba-xquery.com/modules/xqdoc;; +import schema namespace xqds = http://www.xqdoc.org/1.0;; + +exists(validate lax { x:xqdoc(http://www.zorba-xquery.com/modules/http-client;) }) === added file 'test/rbkt/Queries/zorba/schemas/validate_xqdoc_02.xq' --- test/rbkt/Queries/zorba/schemas/validate_xqdoc_02.xq 1970-01-01 00:00:00 + +++ test/rbkt/Queries/zorba/schemas/validate_xqdoc_02.xq 2011-10-26 15:15:29 + @@ -0,0 +1,4 @@ +import module namespace x = http://www.zorba-xquery.com/modules/xqdoc;; +import schema namespace xqds = http://www.xqdoc.org/1.0;; + +exists(validate { x:xqdoc(http://www.zorba-xquery.com/modules/http-client;) }) -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe :
[Zorba-coders] [Bug 872502] Re: validation of the JSON module xqdoc fails
** Branch linked: lp:~zorba-coders/zorba/bug_872502 -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/872502 Title: validation of the JSON module xqdoc fails Status in Zorba - The XQuery Processor: New Bug description: The result of the following two queries don't validate against the xqdoc schema. Query 1: import module namespace x = http://www.zorba-xquery.com/modules/xqdoc;; import schema namespace xqds = http://www.xqdoc.org/1.0;; validate lax { x:xqdoc(http://www.zorba- xquery.com/modules/converters/json) } Error: Schema validation failed: no declaration found for element 'xqdoc:library' Query 2: import module namespace x = http://www.zorba-xquery.com/modules/xqdoc;; import schema namespace xqds = http://www.xqdoc.org/1.0;; validate { x:xqdoc(http://www.zorba- xquery.com/modules/converters/json) } Error: Schema validation failed: element 'description' is not allowed for content model '(description?,author*,version?,param*,return?,error*,deprecated?,see*,since*,custom*)' To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/872502/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 882002] Re: fix fn-collection-2 test
** Changed in: zorba Status: New = Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/882002 Title: fix fn-collection-2 test Status in Zorba - The XQuery Processor: Fix Committed Bug description: fn:collection spec has change the error condition from err:FODC0004 to err:FODC0002: An error is raised [err:FODC0002] if available collections provides no mapping for the absolutized URI. Please see http://www.w3.org/Bugs/Public/show_bug.cgi?id=12542 As a result: - Zorba has to change the error condition in this case - should not mark the test as a known failure due to a W3C bug - should remove the exception from the W3C conformance report that marks fn-collection-2 as passing To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/882002/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 872502] Re: validation of the JSON module xqdoc fails
** Changed in: zorba Status: New = Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/872502 Title: validation of the JSON module xqdoc fails Status in Zorba - The XQuery Processor: Fix Committed Bug description: The result of the following two queries don't validate against the xqdoc schema. Query 1: import module namespace x = http://www.zorba-xquery.com/modules/xqdoc;; import schema namespace xqds = http://www.xqdoc.org/1.0;; validate lax { x:xqdoc(http://www.zorba- xquery.com/modules/converters/json) } Error: Schema validation failed: no declaration found for element 'xqdoc:library' Query 2: import module namespace x = http://www.zorba-xquery.com/modules/xqdoc;; import schema namespace xqds = http://www.xqdoc.org/1.0;; validate { x:xqdoc(http://www.zorba- xquery.com/modules/converters/json) } Error: Schema validation failed: element 'description' is not allowed for content model '(description?,author*,version?,param*,return?,error*,deprecated?,see*,since*,custom*)' To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/872502/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 872732] Re: K2-NamespaceURIForPrefixFunc-2 test fails
** Changed in: zorba Status: Fix Committed = Fix Released -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/872732 Title: K2-NamespaceURIForPrefixFunc-2 test fails Status in Zorba - The XQuery Processor: Fix Released Bug description: this is the ctest output: test w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 === Query: === (:***:) (: Test: K2-NamespaceURIForPrefixFunc-2 :) (: Written by: Frans Englich :) (: Date: 2007-11-22T11:31:21+01:00 :) (: Purpose: Test that the correct default namespace is picked up(#2). :) (:***:) namespace-uri-for-prefix(, exactly-one(e xmlns=http://www.example.com/A; xmlns:A=http://www.example.com/C; b xmlns:B=http://www.example.com/C; xmlns=/ /e/b)) eq === end of Query === === Result: === true === end of result === testdriver: non-canonical result for reference result # 1 doesn't match. Actual and Reference canonical results are not identical Actual Canonical Result: roottrue/root Reference Canonical Result: root/root See line 1, col 6 of expected result. Actual: roottrue/root Expected: root/root testdriver: canonical result for reference result # 1 doesn't match. testdriver: none of the reference results matched To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/872732/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
Review: Approve good -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~diogo-simoes89/zorba/data-cleaning into lp:zorba/data-cleaning-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/data-cleaning-2011-10-26T16-18-38.76Z/log.html -- https://code.launchpad.net/~diogo-simoes89/zorba/data-cleaning/+merge/79530 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~diogo-simoes89/zorba/data-cleaning into lp:zorba/data-cleaning-module
The proposal to merge lp:~diogo-simoes89/zorba/data-cleaning into lp:zorba/data-cleaning-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~diogo-simoes89/zorba/data-cleaning/+merge/79530 -- https://code.launchpad.net/~diogo-simoes89/zorba/data-cleaning/+merge/79530 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~diogo-simoes89/zorba/data-cleaning into lp:zorba/data-cleaning-module
Validation queue job data-cleaning-2011-10-26T16-18-38.76Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~diogo-simoes89/zorba/data-cleaning/+merge/79530 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~diogo-simoes89/zorba/data-cleaning into lp:zorba/data-cleaning-module
The proposal to merge lp:~diogo-simoes89/zorba/data-cleaning into lp:zorba/data-cleaning-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~diogo-simoes89/zorba/data-cleaning/+merge/79530 -- https://code.launchpad.net/~diogo-simoes89/zorba/data-cleaning/+merge/79530 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~fcavalieri/zorba/bugs into lp:zorba
Review: Approve -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/80487 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The attempt to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental failed. Below is the output from the failed tests. experimental build started for lp:zorba. Check out http://trunk.zorba-xquery.com/ in half an hour or so. Logfile at http://zorbatest.lambda.nu:8080/remotequeue/experimental/trunk.log . -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/80410 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/80410 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/80410 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~fcavalieri/zorba/bugs into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-10-26T18-23-21.59Z/log.html -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/80487 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:zorba into lp:~zorba-coders/zorba/zorba-experimental
The proposal to merge lp:zorba into lp:~zorba-coders/zorba/zorba-experimental has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/80494 -- https://code.launchpad.net/~zorba-coders/zorba/trunk/+merge/80494 Your team Zorba Coders is requested to review the proposed merge of lp:zorba into lp:~zorba-coders/zorba/zorba-experimental. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~fcavalieri/zorba/bugs into lp:zorba
The proposal to merge lp:~fcavalieri/zorba/bugs into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/80487 -- https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/80487 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80508 improved error message -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80508 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2011-10-18 21:29:50 + +++ src/compiler/translator/translator.cpp 2011-10-26 21:19:06 + @@ -1305,11 +1305,25 @@ if (qname != NULL) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname-getStringValue())); + ERROR_PARAMS( +qname-getStringValue(), +index, +n-1, +multiple of 6 + ) + ); } else { - RAISE_ERROR_NO_PARAMS(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc); + RAISE_ERROR( + zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, + ERROR_PARAMS( +anonymous, +index, +n-1, +multiple of 6 + ) + ); } } === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2011-10-17 21:17:05 + +++ src/diagnostics/diagnostic_en.xml 2011-10-26 21:19:06 + @@ -1966,7 +1966,7 @@ /diagnostic diagnostic code=ZDDY0025 name=INDEX_WRONG_NUMBER_OF_PROBE_ARGS - value${1: }invalid number of arguments in probe/value + value$1: invalid number of arguments to $2 operation; given $3 expected $4/value /diagnostic diagnostic code=ZDDY0026 name=INDEX_RANGE_PROBE_NOT_ALLOWED === modified file 'src/diagnostics/pregenerated/dict_en.cpp' --- src/diagnostics/pregenerated/dict_en.cpp 2011-10-20 23:05:55 + +++ src/diagnostics/pregenerated/dict_en.cpp 2011-10-26 21:19:06 + @@ -286,7 +286,7 @@ { ZDDY0022, \$1\: index already exists }, { ZDDY0023, \$1\: index does not exist }, { ZDDY0024, \$1\: index uniqueness violation }, - { ZDDY0025, ${\1\: }invalid number of arguments in probe }, + { ZDDY0025, $1: invalid number of arguments to $2 operation; given $3 expected $4 }, { ZDDY0026, \$1\: index range probe not allowed }, { ZDDY0027, \$1\: index multiple creates }, { ZDDY0028, \$1\: index domain has duplicate nodes }, === modified file 'src/runtime/indexing/index_ddl.cpp' --- src/runtime/indexing/index_ddl.cpp 2011-10-05 17:49:48 + +++ src/runtime/indexing/index_ddl.cpp 2011-10-26 21:19:06 + @@ -634,7 +634,12 @@ if (state-theIndexDecl-getKeyExpressions().size() != numChildren-1) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, -ERROR_PARAMS(qnameItem-getStringValue())); +ERROR_PARAMS( + qnameItem-getStringValue(), + index, + numChildren-1, + state-theIndexDecl-getKeyExpressions().size()) +); } state-theIndex = (state-theIndexDecl-isTemp() ? @@ -800,7 +805,12 @@ numChildren != 2) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, -ERROR_PARAMS(qnameItem-getStringValue())); +ERROR_PARAMS( + qnameItem-getStringValue(), + index, + numChildren-1, + state-theIndexDecl-getKeyExpressions().size()) +); } state-theIndex = (state-theIndexDecl-isTemp() ? @@ -973,13 +983,23 @@ if ((numChildren-1) % 6 != 0) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname-getStringValue())); + ERROR_PARAMS( +qname-getStringValue(), +index, +numChildren-1, +multiple of 6 + )); } if (indexDecl-getKeyExpressions().size() * 6 numChildren-1) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname-getStringValue())); + ERROR_PARAMS( +qname-getStringValue(), +index, +numChildren-1, +indexDecl-getKeyExpressions().size() * 6 + )); } state-theIndex = (indexDecl-isTemp() ? === modified file 'src/runtime/store/maps_impl.cpp' --- src/runtime/store/maps_impl.cpp 2011-08-17 23:04:48 + +++ src/runtime/store/maps_impl.cpp 2011-10-26 21:19:06 + @@ -241,7 +241,11 @@ { throw XQUERY_EXCEPTION( zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, - ERROR_PARAMS( lQName-getStringValue() ), + ERROR_PARAMS( +lQName-getStringValue(), +map, +theChildren.size() - 1, +lSpec.getNumColumns() ), ERROR_LOC( loc ) ); } @@ -316,7 +320,11 @@ { throw XQUERY_EXCEPTION( zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, - ERROR_PARAMS( lQName-getStringValue() ), + ERROR_PARAMS( +
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Commit Message changed to: Item Factory class added for SWIG API, many methods included, need to be tested on linux. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job itemfactory-2011-10-26T21-50-14.651Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~juan457/zorba/xqxq-api-changes into lp:zorba
The implementation of getExternalVariables in the xqueryimpl level is done. -- https://code.launchpad.net/~juan457/zorba/xqxq-api-changes/+merge/79589 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
Rodolfo, you need to fix the following errors from the log: [ 73%] Building CXX object swig/java/CMakeFiles/libzorba_api.dir/zorba_apiJAVA_wrap.cxx.o In file included from zorba_apiPYTHON_wrap.cxx:3472: StaticContext.h:13: error: extra qualification 'StaticContext::' on member 'StaticContext' make[2]: *** [swig/python/CMakeFiles/_zorba_api_python.dir/zorba_apiPYTHON_wrap.cxx.o] Error 1 make[1]: *** [swig/python/CMakeFiles/_zorba_api_python.dir/all] Error 2 In fil.e included from zorba_apiJAVA_wrap.cxx:301: StaticContext.h:13: error: extra qualification 'StaticContext::' on member 'StaticContext' make[2]: *** [swig/java/CMakeFiles/libzorba_api.dir/zorba_apiJAVA_wrap.cxx.o] Error 1 make[1]: *** [swig/java/CMakeFiles/libzorba_api.dir/all] Error 2 make: *** [all] Error 2 -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
Review: Needs Fixing Build broken, needs fixing. -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Bug 882320] [NEW] functx namespace is wrong, it should not end with slash '/'
Public bug reported: Out current functx module is defined with an URI that ends with slash '/' : http://www.zorba- xquery.com/site2/doc/latest/zorba/xqdoc/xhtml/www.functx.com_index.html But the Functx website defines it with a slightly diferent URI: http://www.xqueryfunctions.com/xq/download.html ** Affects: zorba Importance: Undecided Status: New -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/882320 Title: functx namespace is wrong, it should not end with slash '/' Status in Zorba - The XQuery Processor: New Bug description: Out current functx module is defined with an URI that ends with slash '/' : http://www.zorba- xquery.com/site2/doc/latest/zorba/xqdoc/xhtml/www.functx.com_index.html But the Functx website defines it with a slightly diferent URI: http://www.xqueryfunctions.com/xq/download.html To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/882320/+subscriptions -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-10-26T23-30-08.102Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-10-26T23-30-08.102Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:~zorba-coders/zorba/zorba-experimental
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:~zorba-coders/zorba/zorba-experimental. Requested reviews: Zorba Coders (zorba-coders) For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80520 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80520 Your team Zorba Coders is requested to review the proposed merge of lp:~matthias-brantner/zorba/bug-fixing into lp:~zorba-coders/zorba/zorba-experimental. === modified file 'src/compiler/codegen/plan_visitor.cpp' --- src/compiler/codegen/plan_visitor.cpp 2011-09-16 19:36:18 + +++ src/compiler/codegen/plan_visitor.cpp 2011-10-26 23:54:25 + @@ -199,7 +199,10 @@ /*** - + A FlworClauseVarMap is created for each flwor clause that defines variables. + If M is such a clause, then for each variable Vi defined by M, theVarExprs[i] + and theVarRebinds[i] contain an entry for Vi. theVarExprs[i] contains the + var_expr representing the Vi definition. / class FlworClauseVarMap : public SimpleRCObject { @@ -207,7 +210,7 @@ bool theIsGeneral; const flwor_clause * theClause; - std::vectorconst var_expr* theVarExprs; + std::vectorvar_expr*theVarExprs; std::vectorVarRebind_t theVarRebinds; public: @@ -222,8 +225,8 @@ long find_var(const var_expr* var) const { -ulong numVars = (ulong)theVarExprs.size(); -for (ulong i = 0; i numVars; ++i) +csize numVars = theVarExprs.size(); +for (csize i = 0; i numVars; ++i) { if (theVarExprs[i] == var) return i; @@ -759,7 +762,7 @@ { varRebind = new VarRebind; - clauseVarMap-theVarExprs.push_back(var); + clauseVarMap-theVarExprs.push_back(const_castvar_expr*(var)); clauseVarMap-theVarRebinds.push_back(varRebind); varRebind-theInputVar = varIter; @@ -1189,14 +1192,14 @@ const group_clause::rebind_list_t grouping_vars = gbc-get_grouping_vars(); const group_clause::rebind_list_t nongrouping_vars = gbc-get_nongrouping_vars(); -for (unsigned i = 0; i grouping_vars.size(); i++) +for (unsigned i = 0; i grouping_vars.size(); ++i) { VarRebind_t varRebind = new VarRebind; clauseVarMap-theVarExprs.push_back(grouping_vars[i].second.getp()); clauseVarMap-theVarRebinds.push_back(varRebind); } -for (unsigned i = 0; i nongrouping_vars.size(); i++) +for (unsigned i = 0; i nongrouping_vars.size(); ++i) { VarRebind_t varRebind = new VarRebind; clauseVarMap-theVarExprs.push_back(nongrouping_vars[i].second.getp()); @@ -1363,22 +1366,17 @@ xqtref_t colType = colExpr-get_return_type(); - if (TypeOps::is_subtype(tm, *colType, *rtm.STRING_TYPE_STAR, loc) || - TypeOps::is_subtype(tm, *colType, *rtm.DOUBLE_TYPE_STAR, loc) || - TypeOps::is_subtype(tm, *colType, *rtm.FLOAT_TYPE_STAR, loc) || - TypeOps::is_subtype(tm, *colType, *rtm.LONG_TYPE_STAR, loc) || - TypeOps::is_subtype(tm, *colType, *rtm.UNSIGNED_LONG_TYPE_STAR, loc) || - TypeOps::is_equal(tm, -*TypeOps::prime_type(tm, *colType), -*rtm.DECIMAL_TYPE_ONE, -loc) || - TypeOps::is_equal(tm, -*TypeOps::prime_type(tm, *colType), -*rtm.INTEGER_TYPE_ONE, -loc) || - TypeOps::is_subtype(tm, *colType, *rtm.DATE_TYPE_STAR, loc) || - TypeOps::is_subtype(tm, *colType, *rtm.TIME_TYPE_STAR, loc) || - TypeOps::is_subtype(tm, *colType, *rtm.DATETIME_TYPE_STAR, loc)) + if (colType-type_kind() == XQType::NODE_TYPE_KIND) + { +colType = static_castconst NodeXQType*(colType.getp())-get_content_type(); + } + + if (colType != NULL + TypeOps::is_subtype(tm, *colType, *rtm.ANY_ATOMIC_TYPE_STAR, loc) + !TypeOps::is_equal(tm, + *TypeOps::prime_type(tm, *colType), + *rtm.ANY_ATOMIC_TYPE_ONE, + loc)) { return true; } @@ -1669,7 +1667,7 @@ if (c.get_kind() != flwor_clause::where_clause) { ZORBA_ASSERT(!theClauseStack.empty()); - ulong stackSize = (ulong)theClauseStack.size(); + csize stackSize = theClauseStack.size(); clauseVarMap = theClauseStack[stackSize-1]; theClauseStack.resize(stackSize - 1); @@ -1878,9 +1876,12 @@ std::vectorflwor::NonGroupingSpec ngspecs) { const group_clause* gbc = static_castconst group_clause*(clauseVarMap-theClause); + const group_clause::rebind_list_t gvars = gbc-get_grouping_vars(); const group_clause::rebind_list_t ngvars = gbc-get_nongrouping_vars(); + const std::vectorstd::string collations = gbc-get_collations(); + long
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp