[Zorba-coders] [Merge] lp:~zorba-coders/zorba/compile_queryplan into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/compile_queryplan
into lp:zorba.
Requested reviews:
William Candillon (wcandillon)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733
Remove conflicting shortcut -e for --execute-plan option.
--
https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmdproperties.txt'
--- bin/zorbacmdproperties.txt 2012-02-20 10:10:44 +
+++ bin/zorbacmdproperties.txt 2012-02-27 09:10:24 +
@@ -36,4 +36,4 @@
(stop-words, po::valuestd::vectorstd::string (), Mapping specifying a stop-words URI to another.)
(thesaurus, po::valuestd::vectorstd::string (), Mapping specifying a thesaurus URI to another.)
(compile-plan,c, Output the query plan as binary.)
-(execute-plan,e, Take a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.)
+(execute-plan, Take a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.)
=== modified file 'bin/zorbacmdproperties_base.h'
--- bin/zorbacmdproperties_base.h 2012-02-20 10:10:44 +
+++ bin/zorbacmdproperties_base.h 2012-02-27 09:10:24 +
@@ -308,7 +308,7 @@
else if (strcmp (*argv, --compile-plan) == 0 || strncmp (*argv, -c, 2) == 0) {
theCompilePlan = true;
}
- else if (strcmp (*argv, --execute-plan) == 0 || strncmp (*argv, -e, 2) == 0) {
+ else if (strcmp (*argv, --execute-plan) == 0) {
theExecutePlan = true;
}
else if (strcmp (*argv, --) == 0) {
@@ -365,7 +365,7 @@
--stop-words\nMapping specifying a stop-words URI to another.\n\n
--thesaurus\nMapping specifying a thesaurus URI to another.\n\n
--compile-plan, -c\nOutput the query plan as binary.\n\n
---execute-plan, -e\nTake a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.\n\n
+--execute-plan\nTake a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.\n\n
;
}
--
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/compile_queryplan into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Commit Message changed to: Remove conflicting shortcut -e for --execute-plan option. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/compile_queryplan-2012-02-27T15-23-58.529Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job compile_queryplan-2012-02-27T15-23-58.529Z is finished. The final status was: 1 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/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/compile_queryplan-2012-02-27T18-40-06.124Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
Validation queue job compile_queryplan-2012-02-27T18-40-06.124Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Commit Message changed to: Add --compile-plan and --execute-plan option to zorba command line. Example: zorba -q 1+1 --compile-plan test.xqc zorba -q test.xqc -f --execute-plan For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/compile_queryplan-2012-02-23T16-47-04.204Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job compile_queryplan-2012-02-23T16-47-04.204Z 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/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/compile_queryplan-2012-02-24T01-19-07.751Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
Validation queue job compile_queryplan-2012-02-24T01-19-07.751Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
Could you point me to an example of such change in a file that is not generated? -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
Could you point me to an example of such change in a file that is not generated? OK, my mistake. But why do they show up in your diff and not in the diff of the change that modified the generator? -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780 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/compile_queryplan into lp:zorba
Review: Needs Fixing
Why all those line changes regarding '{' and '}'? They should be left untouched.
--
https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/93780
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
