Merge lp:~zorba-coders/zorba/compile_queryplan into lp:zorba

Proposed by William Candillon on 2012-02-27
Status: Merged
Approved by: William Candillon on 2012-02-27
Approved revision: 10675
Merged at revision: 10680
Proposed branch: lp:~zorba-coders/zorba/compile_queryplan
Merge into: lp:zorba
Diff against target: 30 lines (+3/-3)
2 files modified
bin/zorbacmdproperties.txt (+1/-1)
bin/zorbacmdproperties_base.h (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/compile_queryplan
Reviewer Review Type Date Requested Status
Matthias Brantner 2012-02-27 Approve on 2012-02-27
William Candillon Approve on 2012-02-27
Review via email: mp+94733@code.launchpad.net

Commit message

Remove conflicting shortcut -e for --execute-plan option.

Description of the change

Remove conflicting shortcut -e for --execute-plan option.

To post a comment you must log in.
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job compile_queryplan-2012-02-27T11-50-03.177Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 1 Pending.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

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

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job compile_queryplan-2012-02-27T18-40-06.124Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/zorbacmdproperties.txt'
2--- bin/zorbacmdproperties.txt 2012-02-20 10:10:44 +0000
3+++ bin/zorbacmdproperties.txt 2012-02-27 09:10:24 +0000
4@@ -36,4 +36,4 @@
5 ("stop-words", po::value<std::vector<std::string> >(), "Mapping specifying a stop-words URI to another.")
6 ("thesaurus", po::value<std::vector<std::string> >(), "Mapping specifying a thesaurus URI to another.")
7 ("compile-plan,c", "Output the query plan as binary.")
8-("execute-plan,e", "Take a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.")
9+("execute-plan", "Take a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.")
10
11=== modified file 'bin/zorbacmdproperties_base.h'
12--- bin/zorbacmdproperties_base.h 2012-02-20 10:10:44 +0000
13+++ bin/zorbacmdproperties_base.h 2012-02-27 09:10:24 +0000
14@@ -308,7 +308,7 @@
15 else if (strcmp (*argv, "--compile-plan") == 0 || strncmp (*argv, "-c", 2) == 0) {
16 theCompilePlan = true;
17 }
18- else if (strcmp (*argv, "--execute-plan") == 0 || strncmp (*argv, "-e", 2) == 0) {
19+ else if (strcmp (*argv, "--execute-plan") == 0) {
20 theExecutePlan = true;
21 }
22 else if (strcmp (*argv, "--") == 0) {
23@@ -365,7 +365,7 @@
24 "--stop-words\nMapping specifying a stop-words URI to another.\n\n"
25 "--thesaurus\nMapping specifying a thesaurus URI to another.\n\n"
26 "--compile-plan, -c\nOutput the query plan as binary.\n\n"
27-"--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"
28+"--execute-plan\nTake a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.\n\n"
29 ;
30 }
31

Subscribers

People subscribed via source and target branches