Revert "cqlsh: add thrift transport factory"

This reverts commit 3f31642c39.

bin/cqlsh

@@ -32,7 +32,7 @@ exit 1
 from __future__ import with_statement
 
 description = "CQL Shell for Apache Cassandra"
-version = "2.3.0"
+version = "2.2.0"
 
 from StringIO import StringIO
 from itertools import groupby
@@ -112,7 +112,6 @@ HISTORY = os.path.expanduser(os.path.join('~', '.cqlsh_history'))
 DEFAULT_HOST = 'localhost'
 DEFAULT_PORT = 9160
 DEFAULT_CQLVER = '2'
-DEFAULT_TRANSPORT_FACTORY = 'cqlshlib.tfactory.regular_transport_factory'
 
 epilog = """Connects to %(DEFAULT_HOST)s:%(DEFAULT_PORT)d by default. These
 defaults can be changed by setting $CQLSH_HOST and/or $CQLSH_PORT. When a
@@ -129,9 +128,8 @@ parser.add_option("--no-color", action='store_false', dest='color',
 parser.add_option("-u", "--username", help="Authenticate as user.")
 parser.add_option("-p", "--password", help="Authenticate using password.")
 parser.add_option('-k', '--keyspace', help='Authenticate to the given keyspace.')
-parser.add_option("-f", "--file", help="Execute commands from FILE, then exit")
+parser.add_option("-f", "--file",
-parser.add_option("-t", "--transport-factory",
+                  help="Execute commands from FILE, then exit")
-                  help="Use the provided Thrift transport factory function.")
 parser.add_option('--debug', action='store_true',
                   help='Show additional debugging information')
 parser.add_option('--cqlversion', default=DEFAULT_CQLVER,
@@ -559,22 +557,19 @@ class Shell(cmd.Cmd):
     csv_dialect_defaults = dict(delimiter=',', doublequote=False,
                                 escapechar='\\', quotechar='"')
 
-    def __init__(self, hostname, port, transport_factory, color=False,
+    def __init__(self, hostname, port, color=False, username=None,
-                 username=None, password=None, encoding=None, stdin=None, tty=True,
+                 password=None, encoding=None, stdin=None, tty=True,
                  completekey='tab', use_conn=None, cqlver=None, keyspace=None):
         cmd.Cmd.__init__(self, completekey=completekey)
         self.hostname = hostname
         self.port = port
-        self.transport_factory = transport_factory
         self.username = username
         self.password = password
         self.keyspace = keyspace
         if use_conn is not None:
             self.conn = use_conn
         else:
-            transport = transport_factory(hostname, port, os.environ, CONFIG_FILE)
+            self.conn = cql.connect(hostname, port, user=username, password=password)
-            self.conn = cql.connect(hostname, port, user=username, password=password,
-                                    transport=transport)
             self.set_expanded_cql_version(cqlver)
             # we could set the keyspace through cql.connect(), but as of 1.0.10,
             # it doesn't quote the keyspace for USE :(
@@ -1799,9 +1794,9 @@ class Shell(cmd.Cmd):
         except IOError, e:
             self.printerr('Could not open %r: %s' % (fname, e))
             return
-        subshell = Shell(self.hostname, self.port, self.transport_factory,
+        subshell = Shell(self.hostname, self.port, color=self.color,
-                         color=self.color, encoding=self.encoding, stdin=f,
+                         encoding=self.encoding, stdin=f, tty=False,
-                         tty=False, use_conn=self.conn, cqlver=self.cql_version)
+                         use_conn=self.conn, cqlver=self.cql_version)
         subshell.cmdloop()
         f.close()
 
@@ -2632,21 +2627,6 @@ def should_use_color():
         pass
     return True
 
-def load_factory(name):
-    """
-    Attempts to load a transport factory function given its fully qualified
-    name, e.g. "cqlshlib.tfactory.regular_transport_factory"
-    """
-    parts = name.split('.')
-    module = ".".join(parts[:-1])
-    try:
-        t = __import__(module)
-        for part in parts[1:]:
-            t = getattr(t, part)
-        return t
-    except (ImportError, AttributeError):
-        sys.exit("Can't locate transport factory function %s" % name)
-
 def read_options(cmdlineargs, environment):
     configs = ConfigParser.SafeConfigParser()
     configs.read(CONFIG_FILE)
@@ -2655,8 +2635,6 @@ def read_options(cmdlineargs, environment):
     optvalues.username = option_with_default(configs.get, 'authentication', 'username')
     optvalues.password = option_with_default(configs.get, 'authentication', 'password')
     optvalues.keyspace = option_with_default(configs.get, 'authentication', 'keyspace')
-    optvalues.transport_factory = option_with_default(configs.get, 'connection', 'factory',
-                                                      DEFAULT_TRANSPORT_FACTORY)
     optvalues.completekey = option_with_default(configs.get, 'ui', 'completekey', 'tab')
     optvalues.color = option_with_default(configs.getboolean, 'ui', 'color')
     optvalues.debug = False
@@ -2680,8 +2658,6 @@ def read_options(cmdlineargs, environment):
     if options.file is not None:
         options.tty = False
 
-    options.transport_factory = load_factory(options.transport_factory)
-
     if optvalues.color in (True, False):
         options.color = optvalues.color
     else:
@@ -2749,7 +2725,6 @@ def main(options, hostname, port):
     try:
         shell = Shell(hostname,
                       port,
-                      options.transport_factory,
                       color=options.color,
                       username=options.username,
                       password=options.password,

pylib/cqlshlib/tfactory.py

@@ -1,32 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from thrift.transport import TSocket, TTransport
-
-def regular_transport_factory(host, port, env, config_file):
-    """
-    Basic unencrypted Thrift transport factory function.
-    Returns instantiated Thrift transport for use with cql.Connection.
-
-    Params:
-    * host .........: hostname of Cassandra node.
-    * port .........: port number to connect to.
-    * env ..........: environment variables (os.environ) - not used by this implementation.
-    * config_file ..: path to cqlsh config file - not used by this implementation.
-    """
-    socket = TSocket.TSocket(host, port)
-    socket.open()
-    return TTransport.TFramedTransport(socket)