You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/10/04 07:25:16 UTC
[1/2] git commit: merge from 1.1
Updated Branches:
refs/heads/trunk 5df99327e -> 51e6c7c0a
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51e6c7c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51e6c7c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51e6c7c0
Branch: refs/heads/trunk
Commit: 51e6c7c0a840fc039cb847937f55ab58c26a79f7
Parents: 5df9932 59a6a5d
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Wed Oct 3 22:24:54 2012 -0700
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Wed Oct 3 22:24:54 2012 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cli/CliMain.java | 7 +--
src/java/org/apache/cassandra/cli/CliOptions.java | 23 ++++++++++
.../org/apache/cassandra/cli/CliSessionState.java | 8 +++-
.../cli/transport/FramedTransportFactory.java | 30 ++++++++++++++
.../cli/transport/SimpleTransportFactory.java | 32 +++++++++++++++
6 files changed, 95 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e6c7c0/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e6c7c0/src/java/org/apache/cassandra/cli/CliMain.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e6c7c0/src/java/org/apache/cassandra/cli/CliOptions.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cli/CliOptions.java
index b32833e,982daf5..b905336
--- a/src/java/org/apache/cassandra/cli/CliOptions.java
+++ b/src/java/org/apache/cassandra/cli/CliOptions.java
@@@ -17,7 -17,9 +17,8 @@@
*/
package org.apache.cassandra.cli;
-import org.apache.cassandra.cli.transport.SimpleTransportFactory;
import org.apache.commons.cli.*;
+ import org.apache.thrift.transport.TTransportFactory;
/**
*
@@@ -34,6 -36,8 +35,7 @@@ public class CliOption
// Command line options
private static final String HOST_OPTION = "host";
private static final String PORT_OPTION = "port";
- private static final String UNFRAME_OPTION = "unframed";
+ private static final String TRANSPORT_FACTORY = "transport-factory";
private static final String DEBUG_OPTION = "debug";
private static final String USERNAME_OPTION = "username";
private static final String PASSWORD_OPTION = "password";
@@@ -93,6 -99,20 +96,9 @@@
css.hostName = DEFAULT_HOST;
}
- // Look to see if frame has been specified
- if (cmd.hasOption(UNFRAME_OPTION))
- {
- if (cmd.hasOption(TRANSPORT_FACTORY))
- throw new IllegalArgumentException("--unframed and --transport-factory options should not be fixed.");
-
- css.framed = false;
- css.transportFactory = new SimpleTransportFactory();
- }
-
+ if (cmd.hasOption(TRANSPORT_FACTORY))
+ css.transportFactory = validateAndSetTransportFactory(cmd.getOptionValue(TRANSPORT_FACTORY));
+
- // Look to see if frame has been specified
if (cmd.hasOption(DEBUG_OPTION))
{
css.debug = true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e6c7c0/src/java/org/apache/cassandra/cli/CliSessionState.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cli/CliSessionState.java
index a0ef4e2,0284239..5f29186
--- a/src/java/org/apache/cassandra/cli/CliSessionState.java
+++ b/src/java/org/apache/cassandra/cli/CliSessionState.java
@@@ -15,10 -15,9 +15,8 @@@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.cassandra.cli;
- import org.apache.cassandra.tools.NodeProbe;
-
import java.io.InputStream;
import java.io.PrintStream;