cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [2/3] git commit: cqlsh: add thrift transport factory imeplementation Patch by Aleksey Yeschenko, reviewed brandonwilliams
Date Thu, 04 Oct 2012 15:08:09 GMT
cqlsh: add thrift transport factory imeplementation
Patch by Aleksey Yeschenko, reviewed brandonwilliams


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c2922c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c2922c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c2922c2

Branch: refs/heads/trunk
Commit: 1c2922c22366e08a01b0c3852c10bd4260c09de0
Parents: 038aa6b
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Oct 4 09:50:05 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Oct 4 10:04:43 2012 -0500

----------------------------------------------------------------------
 bin/cqlsh                       |   43 ++++++++++++++++++++++++++-------
 lib/cql-internal-only-1.2.0.zip |  Bin 83243 -> 0 bytes
 lib/cql-internal-only-1.3.0.zip |  Bin 0 -> 90260 bytes
 pylib/cqlshlib/tfactory.py      |   32 +++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c2922c2/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 2ac95b2..0cc50c2 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -32,7 +32,7 @@ exit 1
 from __future__ import with_statement
 
 description = "CQL Shell for Apache Cassandra"
-version = "2.2.0"
+version = "2.3.0"
 
 from StringIO import StringIO
 from itertools import groupby
@@ -115,6 +115,7 @@ HISTORY = os.path.expanduser(os.path.join('~', '.cqlsh_history'))
 DEFAULT_HOST = 'localhost'
 DEFAULT_PORT = 9160
 DEFAULT_CQLVER = '3'
+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
@@ -131,8 +132,9 @@ 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", help="Execute commands from FILE, then exit")
+parser.add_option("-t", "--transport-factory",
+                  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,
@@ -413,19 +415,22 @@ class Shell(cmd.Cmd):
     csv_dialect_defaults = dict(delimiter=',', doublequote=False,
                                 escapechar='\\', quotechar='"')
 
-    def __init__(self, hostname, port, color=False, username=None,
-                 password=None, encoding=None, stdin=None, tty=True,
+    def __init__(self, hostname, port, transport_factory, color=False,
+                 username=None, 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:
-            self.conn = cql.connect(hostname, port, user=username, password=password)
+            transport = transport_factory(hostname, port, os.environ, CONFIG_FILE)
+            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 :(
@@ -1680,9 +1685,9 @@ class Shell(cmd.Cmd):
         except IOError, e:
             self.printerr('Could not open %r: %s' % (fname, e))
             return
-        subshell = Shell(self.hostname, self.port, color=self.color,
-                         encoding=self.encoding, stdin=f, tty=False,
-                         use_conn=self.conn, cqlver=self.cql_version)
+        subshell = Shell(self.hostname, self.port, self.transport_factory,
+                         color=self.color, encoding=self.encoding, stdin=f,
+                         tty=False, use_conn=self.conn, cqlver=self.cql_version)
         subshell.cmdloop()
         f.close()
 
@@ -2513,6 +2518,21 @@ 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)
@@ -2521,6 +2541,8 @@ 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
@@ -2544,6 +2566,8 @@ 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:
@@ -2611,6 +2635,7 @@ def main(options, hostname, port):
     try:
         shell = Shell(hostname,
                       port,
+                      options.transport_factory,
                       color=options.color,
                       username=options.username,
                       password=options.password,

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c2922c2/lib/cql-internal-only-1.2.0.zip
----------------------------------------------------------------------
diff --git a/lib/cql-internal-only-1.2.0.zip b/lib/cql-internal-only-1.2.0.zip
deleted file mode 100644
index a1c193e..0000000
Binary files a/lib/cql-internal-only-1.2.0.zip and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c2922c2/lib/cql-internal-only-1.3.0.zip
----------------------------------------------------------------------
diff --git a/lib/cql-internal-only-1.3.0.zip b/lib/cql-internal-only-1.3.0.zip
new file mode 100644
index 0000000..1fde059
Binary files /dev/null and b/lib/cql-internal-only-1.3.0.zip differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c2922c2/pylib/cqlshlib/tfactory.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/tfactory.py b/pylib/cqlshlib/tfactory.py
new file mode 100644
index 0000000..d16c8e7
--- /dev/null
+++ b/pylib/cqlshlib/tfactory.py
@@ -0,0 +1,32 @@
+# 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)


Mime
View raw message