Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/msb-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/msb-misc-2013-03-27T07-50-51.258Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
Validation queue job msb-misc-2013-03-27T07-50-51.258Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/msb-misc-2013-03-26T15-16-40.007Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
Validation queue job msb-misc-2013-03-26T15-16-40.007Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: missing parent in src/runtime/function_item unversioned parent in src/runtime/function_item contents conflict in src/runtime/function_item/dynamic_fncall_iterator.cpp -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job msb-misc-2013-03-27T04-13-46.374Z is finished. The final status was: 137 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job msb-misc-2013-03-27T04-40-48.831Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Commit Message changed to: - disallow single quotes - allow $$ as context item - deep equal for json items - json style escaping - empty object For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656 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/msb-misc into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/msb-misc into
lp:zorba.
Commit message:
fix crash on mac
Requested reviews:
Matthias Brantner (matthias-brantner)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267
--
https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/api/compiler_api.cpp'
--- src/compiler/api/compiler_api.cpp 2013-03-24 20:40:03 +
+++ src/compiler/api/compiler_api.cpp 2013-03-25 15:59:30 +
@@ -128,18 +128,19 @@
/
bool XQueryCompiler::getLanguageMode(std::stringstream s) const
{
- char lPeek[6];
- s.get(lPeek, 7, ' ');
+ const size_t lPeekSize = 7;
+ char lPeek[lPeekSize];
+ s.get(lPeek, lPeekSize, ' ');
s.clear();
s.seekg(0, s.beg);
bool lXQueryMode;
- if (strncmp(lPeek, jsoniq, 6) == 0)
+ if (strncmp(lPeek, jsoniq, lPeekSize - 1) == 0)
{
lXQueryMode = false;
}
- else if (strncmp(lPeek, xquery, 6) == 0)
+ else if (strncmp(lPeek, xquery, lPeekSize - 1) == 0)
{
lXQueryMode = true;
}
--
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/msb-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 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/msb-misc into lp:zorba
Review: Needs Fixing You should use the 2-argument form of get(). What if the whitespace is a tab? xquery\t is perfectly legal. -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 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/msb-misc into lp:zorba
Review: Approve Approve with objections. Patch does NOT account for leading whitespace or comments. -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 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/msb-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/msb-misc-2013-03-25T19-16-44.495Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 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/msb-misc into lp:zorba
Validation queue job msb-misc-2013-03-25T19-16-44.495Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155267 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/msb-misc into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/msb-misc into
lp:zorba.
Commit message:
expose setDefaultFunctionNamespaces in the C++ api
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370
--
https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h 2013-03-21 23:41:00 +
+++ include/zorba/static_context.h 2013-03-25 23:12:21 +
@@ -803,6 +803,16 @@
virtual void
clearBaseURI() = 0;
+ /** \brief Sets a list of default function namespaces that will be
+ * used in order during the lookup of functions.
+ *
+ * @param aURIs the list of default function namespaces.
+ * @return true if the said namespaces have been set, false otherwise
+ * if an DiagnosticHandler has been registered.
+ * @throw ZorbaException if an error occured.
+ */
+ virtual bool
+ setDefaultFunctionNamespaces( const std::vectorString aURIs ) = 0;
};
} /* namespace zorba */
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp 2013-03-21 23:41:00 +
+++ src/api/staticcontextimpl.cpp 2013-03-25 23:12:21 +
@@ -337,6 +337,35 @@
/***
/
+bool
+StaticContextImpl::setDefaultFunctionNamespaces(
+const std::vectorString aURIs)
+{
+ try
+ {
+for (std::vectorString::const_reverse_iterator lIter = aURIs.rbegin();
+ lIter != aURIs.rend(); ++lIter)
+{
+ const zstring lURI = Unmarshaller::getInternalString(*lIter);
+ QueryLoc loc;
+ theCtx-set_default_function_ns(lURI, false, loc);
+}
+ }
+ catch (ZorbaException const e)
+ {
+ZorbaImpl::notifyError(theDiagnosticHandler, e);
+ }
+ catch (std::exception const e)
+ {
+ZorbaImpl::notifyError(theDiagnosticHandler, e.what());
+ }
+ return ;
+}
+
+
+/***
+
+/
void
StaticContextImpl::addCollation( const String URI )
{
=== modified file 'src/api/staticcontextimpl.h'
--- src/api/staticcontextimpl.h 2013-03-21 23:41:00 +
+++ src/api/staticcontextimpl.h 2013-03-25 23:12:21 +
@@ -104,6 +104,9 @@
virtual String getDefaultFunctionNamespace() const;
+ virtual bool
+ setDefaultFunctionNamespaces( const std::vectorString aURIs );
+
virtual void
addCollation( const String URI );
=== modified file 'test/unit/test_static_context.cpp'
--- test/unit/test_static_context.cpp 2012-06-28 04:14:03 +
+++ test/unit/test_static_context.cpp 2013-03-25 23:12:21 +
@@ -357,27 +357,82 @@
}
+bool
+sctx_test_6(Zorba* zorba)
+{
+ std::stringstream queryString;
+
+ queryString
+ jsoniq version '1.0';\n
+ declare function local:concat() { fn:current-dateTime() };\n
+ trace(concat(), 'concat') instance of xs:dateTime;
+
+ StaticContext_t sctx = zorba-createStaticContext();
+
+ std::vectorString lNamespaces;
+ lNamespaces.push_back(http://www.w3.org/2005/xquery-local-functions;);
+ lNamespaces.push_back(http://www.w3.org/2005/xpath-functions;);
+ sctx-setDefaultFunctionNamespaces(lNamespaces);
+
+ {
+XQuery_t lQuery = zorba-compileQuery(queryString.str(), sctx);
+std::ofstream planFile(out.plan);
+assert(planFile.good());
+
+lQuery-saveExecutionPlan(planFile);
+ }
+ {
+std::ifstream planFile(out.plan);
+assert(planFile.good());
+
+XQuery_t query = zorba-createQuery();
+
+query-loadExecutionPlan(planFile);
+
+Iterator_t lIter = query-iterator();
+
+lIter-open();
+
+Item lItem;
+if (!lIter-next(lItem) || !lItem.getBooleanValue())
+{
+ return false;
+}
+ }
+ return true;
+}
+
+
int test_static_context( int argc, char *argv[] )
{
void* zstore = StoreManager::getStore();
Zorba* zorba = Zorba::getInstance(zstore);
+ std::cout executing sctx_test_1 std::endl;
if (!sctx_test_1(zorba))
return 1;
+ std::cout executing sctx_test_2 std::endl;
if (!sctx_test_2(zorba))
return 2;
+ std::cout executing sctx_test_3 std::endl;
if (!sctx_test_3(zorba))
return 3;
+ std::cout executing sctx_test_4 std::endl;
if (!sctx_test_4(zorba))
return 4;
+ std::cout executing sctx_test_5 std::endl;
if (!sctx_test_5(zorba))
return 5;
+ std::cout executing sctx_test_6 std::endl;
+ if (!sctx_test_6(zorba))
+return 5;
+
zorba-shutdown();
StoreManager::shutdownStore( zstore );
return 0;
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help :
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/msb-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/msb-misc-2013-03-25T23-51-44.843Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
Validation queue job msb-misc-2013-03-25T23-51-44.843Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155370 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/msb-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/msb-misc-2013-03-12T09-01-51.999Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc into lp:zorba
Validation queue job msb-misc-2013-03-12T09-01-51.999Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/msb-misc into
lp:zorba.
Commit message:
performance improvements for json array construction
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762
--
https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/json_items.h'
--- src/store/naive/json_items.h 2013-02-26 04:12:43 +
+++ src/store/naive/json_items.h 2013-03-11 19:47:36 +
@@ -407,6 +407,11 @@
SimpleJSONArray()
{}
+ SimpleJSONArray(size_t aReservedSize)
+ {
+theContent.reserve(aReservedSize);
+ }
+
virtual ~SimpleJSONArray();
// store API
=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp 2013-03-07 10:10:10 +
+++ src/store/naive/simple_item_factory.cpp 2013-03-11 19:47:36 +
@@ -2172,13 +2172,13 @@
const std::vectorstore::Iterator_t sources,
const std::vectorstore::CopyMode copyModes)
{
- result = new json::SimpleJSONArray();
+ csize numSources = sources.size();
+
+ result = new json::SimpleJSONArray(numSources);
json::JSONArray* array = static_castjson::JSONArray*(result.getp());
store::Item_t item;
-
- csize numSources = sources.size();
for (csize i = 0; i numSources; ++i)
{
store::Iterator* source = sources[i].getp();
@@ -2233,12 +2233,8 @@
json::JSONArray* array = static_castjson::JSONArray*(result.getp());
- std::vectorstore::Item_t::const_iterator ite = items.begin();
- std::vectorstore::Item_t::const_iterator end = items.end();
- for (; ite != end; ++ite)
- {
-array-push_back(*ite);
- }
+ array-push_back(items);
+
return true;
}
--
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/msb-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/msb-misc-2013-03-11T19-50-38.426Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc into lp:zorba
Validation queue job msb-misc-2013-03-11T19-50-38.426Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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/msb-misc 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/msb-misc/+merge/152762 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/msb-misc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/msb-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 -- https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/152762 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
