[Zorba-coders] [Merge] lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba
David Graf has proposed merging lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba. Commit message: Init ZorbaCollectionIteratorState::theIteratorOpened properly. Requested reviews: David Graf (davidagraf) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130040 Init ZorbaCollectionIteratorState::theIteratorOpened properly. I made this fix because it caused a failure in 28msec's persistent store. Unfortunately, I am not able to reproduce a similar problem in Zorba's simplestore. Although I moved the failing code into a test (see diff). -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130040 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/coll-iter-state-init into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba has been updated. Commit Message changed to: Init ZorbaCollectionIteratorState::theIteratorOpened properly. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130040 -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130040 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/coll-iter-state-init into lp:zorba
David Graf has proposed merging lp:~zorba-coders/zorba/coll-iter-state-init
into lp:zorba.
Commit message:
Init ZorbaCollectionIteratorState::theIteratorOpened properly.
Requested reviews:
David Graf (davidagraf)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055
Init ZorbaCollectionIteratorState::theIteratorOpened properly.
I made this fix because it caused a failure in 28msec's persistent store.
Unfortunately, I am not able to reproduce a similar problem in Zorba's
simplestore. Although I moved the failing code into a test (see diff).
--
https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/collections/collections_impl.cpp'
--- src/runtime/collections/collections_impl.cpp 2012-10-15 13:35:59 +
+++ src/runtime/collections/collections_impl.cpp 2012-10-17 09:16:48 +
@@ -346,6 +346,7 @@
void ZorbaCollectionIteratorState::init(PlanState planState)
{
PlanIteratorState::init(planState);
+ theIteratorOpened = false;
theIterator = NULL;
}
=== modified file 'test/rbkt/Queries/zorba/collections/paging_1.xq'
--- test/rbkt/Queries/zorba/collections/paging_1.xq 2012-09-19 21:16:15 +
+++ test/rbkt/Queries/zorba/collections/paging_1.xq 2012-10-17 09:16:48 +
@@ -4,6 +4,7 @@
import module namespace ref = http://www.zorba-xquery.com/modules/node-reference;;
declare namespace ann = http://www.zorba-xquery.com/annotations;;
+declare namespace zerr = http://www.zorba-xquery.com/errors;;
declare function local:order($items)
{
@@ -18,6 +19,18 @@
dml:insert-nodes(xs:QName(ns:test2), a/);
dml:insert-nodes(xs:QName(ns:test2), b/);
dml:insert-nodes(xs:QName(ns:test2), (c/, d/, e/));
+
+ try {
+ dml:collection(xs:QName(ns:test2),
+ xs:anyURI(urn:uuid:----),
+ 0);
+ fn:error(); (: has to fail :)
+ }
+ catch zerr:ZSTR0066
+ {
+(: all ok :)
+ }
+
(
local:order(dml:collection(xs:QName(ns:test2), 3)), delim/,
local:order(dml:collection(xs:QName(ns:test2), -1)), delim/,
--
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/coll-iter-state-init into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba has been updated. Commit Message changed to: Init ZorbaCollectionIteratorState::theIteratorOpened properly. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/bug1001474 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 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/coll-iter-state-init into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/coll-iter-state-init into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/coll-iter-state-init-2012-10-17T18-29-41.949Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/coll-iter-state-init into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/coll-iter-state-init into lp:zorba
Validation queue job coll-iter-state-init-2012-10-17T18-29-41.949Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/coll-iter-state-init into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/coll-iter-state-init into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/coll-iter-state-init into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/coll-iter-state-init into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/coll-iter-state-init/+merge/130055 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/bug867693 into lp:zorba/image-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-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:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-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:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867693-2012-10-17T23-00-39.162Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-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:~zorba-coders/zorba/bug1058231 into lp:zorba
Review: Needs Information I'm assuming that the main fix here works. However I'm a bit confused why it matters whether we find the path to zorba.exe or zorba_simplestore.dll, because as far as I know they should always be in the same directory. So to satisfy my curiosity, why is this change necessary? I also would like to know the use case for the two new environment variables. It seems to me that if we need those, we should need them on all platforms, not just Windows. Also, ZORBA_URI_PATH and ZORBA_LIB_PATH *are* already used by zorba.exe to do basically the same thing, so why is it necessary to handle them in root_static_context.cpp as well? -- https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531 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/bug1001474 into lp:zorba
Review: Approve I would prefer this to be two separate commits, because it contains two completely unrelated changes (the DownloadModules overwrite change and the python fix). However, they're both small, so if you set the commit message to clearly mention both of them I guess it's OK. -- https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 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/bug1001474 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1001474 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 -- https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 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/bug867693 into lp:zorba/image-module
Validation queue job bug867693-2012-10-17T23-00-39.162Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-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:~zorba-coders/zorba/bug867693 into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/bug867693 into lp:zorba/image-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 -- https://code.launchpad.net/~zorba-coders/zorba/bug867693/+merge/126578 Your team Zorba Coders is subscribed to branch lp:zorba/image-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:~zorba-coders/zorba/bug1001474 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1001474 into lp:zorba has been updated. Commit Message changed to: - Fix for PHP looking library - Also fix for python_d.lib error For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 -- https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 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/bug1001474 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1001474 into lp:zorba has been updated. Description changed to: - Fix for PHP looking library - Also fix for python_d.lib error For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 -- https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 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/bug1001474 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1001474-2012-10-17T23-38-54.575Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 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/zorba-xqxq-url-resolver into lp:zorba
Review: Approve It's an ugly hack, for sure, but I don't see a better alternative without backwards-incompatible API changes. I'll file a new bug for a better solution in 3.0. -- https://code.launchpad.net/~zorba-coders/zorba/zorba-xqxq-url-resolver/+merge/123602 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/bug1058231 into lp:zorba
1- Because Zorba Processor is not zorba.exe, is zorba_simplestore.dll, so, when you make a call from Java, the actual process is c:\...\java.exe calling zorba_simplestore among other dll's, so the paths come from java.exe. 2- Same principle will apply here, when Zorba is called from other languages or environments this variables will not be considered and Zorba will fail miserably trying to get the URI and LIB path. All this apply for windows, I think the same principle will apply for linux, but didn't added because this was a windows specific problem, do you think is better to add them for linux? -- https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531 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/bug1058231 into lp:zorba
Ah, OK, thanks for the explanation. As for whether this should be done cross-platform: 1. There is no way that we have discovered to determine the path to zorba_simplestore (or zorba itself) on Linux or Mac, so there is no equivalent problem to be solved there (yet?). 2. It would be best if the environment variables were handled cross-platform and in one place. If nothing else, with your change I believe that entries in ZORBA_URI_PATH will be on the URI path twice, since they're added to root_static_context as well as to the query context by zorba.exe. So yes, if you could merge the code you've added with the equivalent code in bin/path_util.cpp, I think that would be correct. -- https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531 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/bug1001474 into lp:zorba
Validation queue job bug1001474-2012-10-17T23-38-54.575Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 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/bug1001474 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1001474 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 -- https://code.launchpad.net/~zorba-coders/zorba/bug1001474/+merge/126116 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
