[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1001463 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1001463 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
Validation queue job bug-1001463-2012-05-21T19-19-50.63Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1001463-2012-05-21T19-19-50.63Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1001463 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1001463 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
Validation queue job bug-1001463-2012-05-21T18-35-03.122Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1001463-2012-05-21T18-35-03.122Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1001463 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1001463 into lp:zorba has been updated. Commit Message changed to: fix for bug #1001463 (type not available during computation of function caching). For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686 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/bug-1001463 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-1001463 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #1001463 in Zorba: "type not available during computation of function
caching"
https://bugs.launchpad.net/zorba/+bug/1001463
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686
fix for bug #1001463 (type not available during computation of function
caching).
The problem is that the wrong TypeManager is used for checking the
subtype-relationship during the computation of the function-caching property.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106686
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-05-18 22:01:56 +
+++ ChangeLog 2012-05-21 18:33:24 +
@@ -4,6 +4,7 @@
version 2.x
* Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
+ * Fixed bug #1001463 (type not available during computation of function caching)
version 2.5
=== modified file 'src/functions/udf.cpp'
--- src/functions/udf.cpp 2012-05-03 12:31:51 +
+++ src/functions/udf.cpp 2012-05-21 18:33:24 +
@@ -492,7 +492,7 @@
// parameter and return types are subtype of xs:anyAtomicType?
const xqtref_t& lRes = theSignature.returnType();
- TypeManager* tm = lRes->get_manager();
+ TypeManager* tm = theBodyExpr->get_sctx()->get_typemanager();
if (!TypeOps::is_subtype(tm,
*lRes,
=== added file 'test/rbkt/ExpQueryResults/zorba/udf/udf-recursive-2.xml.res'
--- test/rbkt/ExpQueryResults/zorba/udf/udf-recursive-2.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/udf/udf-recursive-2.xml.res 2012-05-21 18:33:24 +
@@ -0,0 +1,1 @@
+false
=== added file 'test/rbkt/Queries/zorba/udf/schema.xsd'
--- test/rbkt/Queries/zorba/udf/schema.xsd 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/udf/schema.xsd 2012-05-21 18:33:24 +
@@ -0,0 +1,13 @@
+
+http://foo.com/schemas/schema";
+ xmlns = "http://foo.com/schemas/schema";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified">
+
+
+
+
+
+
+
+
+
=== added file 'test/rbkt/Queries/zorba/udf/udf-recursive-2.xq'
--- test/rbkt/Queries/zorba/udf/udf-recursive-2.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/udf/udf-recursive-2.xq 2012-05-21 18:33:24 +
@@ -0,0 +1,10 @@
+import schema namespace d = "http://foo.com/schemas/schema"; at "schema.xsd";
+
+declare function local:recursion($param as element(*, d:Content)?) as xs:boolean
+{
+ if ($param)
+ then local:recursion(())
+ else false()
+};
+
+local:recursion(validate { })
--
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/bug-1001463 into lp:zorba
Review: Needs Fixing I ran into this problem myself in the plan serializer branch. The correct fix is to get the sctx from theBodyExpr: TypeManager* tm = theBodyExpr->get_sctx()->get_typemanager(); -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 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/bug-1001463 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1001463 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 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/bug-1001463 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 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/bug-1001463 into lp:zorba
Validation queue job bug-1001463-2012-05-18T22-01-45.997Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 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/bug-1001463 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1001463-2012-05-18T22-01-45.997Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 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/bug-1001463 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1001463 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 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/bug-1001463 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475 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/bug-1001463 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-1001463 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #1001463 in Zorba: "type not available during computation of function
caching"
https://bugs.launchpad.net/zorba/+bug/1001463
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475
fix for bug #1001463 (type not available during computation of function
caching).
The problem is that the wrong TypeManager is used for checking the
subtype-relationship during the computation of the function-caching property.
I'm not 100% sure whether the suggested fix is the right one. Essentially, the
problem is that the udf doesn't have a static_context at the time
computeResultCaching is called (I'm not even sure if it will ever have it set).
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1001463/+merge/106475
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-05-16 06:45:13 +
+++ ChangeLog 2012-05-18 21:59:20 +
@@ -4,6 +4,7 @@
version 2.x
* Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query)
+ * Fixed bug #1001463 (type not available during computation of function caching)
version 2.5
=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp 2012-05-03 12:31:51 +
+++ src/compiler/codegen/plan_visitor.cpp 2012-05-18 21:59:20 +
@@ -2335,6 +2335,7 @@
{
// need to computeResultCaching here for iterprint to work
user_function* udf = static_cast(func);
+ udf->setStaticContext(v.get_sctx());
udf->computeResultCaching(theCCB->theXQueryDiagnostics);
}
}
=== modified file 'src/functions/udf.cpp'
--- src/functions/udf.cpp 2012-05-03 12:31:51 +
+++ src/functions/udf.cpp 2012-05-18 21:59:20 +
@@ -492,7 +492,7 @@
// parameter and return types are subtype of xs:anyAtomicType?
const xqtref_t& lRes = theSignature.returnType();
- TypeManager* tm = lRes->get_manager();
+ TypeManager* tm = getStaticContext()->get_typemanager();
if (!TypeOps::is_subtype(tm,
*lRes,
--
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
