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

[William Candillon]

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

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

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/compile_queryplan-2012-02-27T11-50-03.177Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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)]

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

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/compile_queryplan-2012-02-27T15-23-58.529Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/compile_queryplan-2012-02-27T18-40-06.124Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

All tests succeeded!

=== modified file 'bin/zorbacmdproperties.txt'
--- bin/zorbacmdproperties.txt	2012-02-20 10:10:44 +0000
+++ bin/zorbacmdproperties.txt	2012-02-27 09:10:24 +0000
@@ -36,4 +36,4 @@
 ("stop-words", po::value<std::vector<std::string> >(), "Mapping specifying a stop-words URI to another.")
 ("thesaurus", po::value<std::vector<std::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 +0000
+++ bin/zorbacmdproperties_base.h	2012-02-27 09:10:24 +0000
@@ -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"
 ;
   }