diff --git a/CHANGES.txt b/CHANGES.txt index c635e1829c..ac704e91dd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0-alpha4 + * Update to Python driver 3.21 for cqlsh (CASSANDRA-14872) * Added bulk loading documentation (CASSANDRA-15480) * Updated overview documentation (CASSANDRA-15483) * Added CDC and speculative retry documentation to DDL section (CASSANDRA-15492) diff --git a/bin/cqlsh.py b/bin/cqlsh.py index cb07df0c42..357d1b4c51 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -132,7 +132,7 @@ if cql_zip: ver = os.path.splitext(os.path.basename(cql_zip))[0][len(CQL_LIB_PREFIX):] sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver)) -third_parties = ('futures-', 'six-') +third_parties = ('futures-', 'six-', 'geomet-') for lib in third_parties: lib_zip = find_zip(lib) @@ -429,9 +429,6 @@ class Shell(cmd.Cmd): shunted_query_out = None use_paging = True - # TODO remove after virtual tables are added to connection metadata - virtual_keyspaces = None - default_page_size = 100 def __init__(self, hostname, port, color=False, @@ -451,7 +448,6 @@ class Shell(cmd.Cmd): request_timeout=DEFAULT_REQUEST_TIMEOUT_SECONDS, protocol_version=None, connect_timeout=DEFAULT_CONNECT_TIMEOUT_SECONDS, - allow_server_port_discovery=False, is_subshell=False): cmd.Cmd.__init__(self, completekey=completekey) self.hostname = hostname @@ -467,7 +463,6 @@ class Shell(cmd.Cmd): self.tracing_enabled = tracing_enabled self.page_size = self.default_page_size self.expand_enabled = expand_enabled - self.allow_server_port_discovery = allow_server_port_discovery if use_conn: self.conn = use_conn else: @@ -480,7 +475,6 @@ class Shell(cmd.Cmd): load_balancing_policy=WhiteListRoundRobinPolicy([self.hostname]), control_connection_timeout=connect_timeout, connect_timeout=connect_timeout, - allow_server_port_discovery=allow_server_port_discovery, **kwargs) self.owns_connection = not use_conn @@ -625,10 +619,7 @@ class Shell(cmd.Cmd): self.connection_versions = vers def get_keyspace_names(self): - # TODO remove after virtual tables are added to connection metadata - if self.virtual_keyspaces is None: - self.init_virtual_keyspaces_meta() - return list(map(str, list(self.conn.metadata.keyspaces.keys()) + list(self.virtual_keyspaces.keys()))) + return list(map(str, list(self.conn.metadata.keyspaces.keys()))) def get_columnfamily_names(self, ksname=None): if ksname is None: @@ -695,76 +686,8 @@ class Shell(cmd.Cmd): if ksname in self.conn.metadata.keyspaces: return self.conn.metadata.keyspaces[ksname] - # TODO remove after virtual tables are added to connection metadata - if self.virtual_keyspaces is None: - self.init_virtual_keyspaces_meta() - if ksname in self.virtual_keyspaces: - return self.virtual_keyspaces[ksname] - raise KeyspaceNotFound('Keyspace %r not found.' % ksname) - # TODO remove after virtual tables are added to connection metadata - def init_virtual_keyspaces_meta(self): - self.virtual_keyspaces = {} - for vkeyspace in self.fetch_virtual_keyspaces(): - self.virtual_keyspaces[vkeyspace.name] = vkeyspace - - # TODO remove after virtual tables are added to connection metadata - def fetch_virtual_keyspaces(self): - keyspaces = [] - - result = self.session.execute('SELECT keyspace_name FROM system_virtual_schema.keyspaces;') - for row in result: - name = row['keyspace_name'] - keyspace = KeyspaceMetadata(name, False, None, None) - tables = self.fetch_virtual_tables(name) - for table in tables: - keyspace.tables[table.name] = table - keyspaces.append(keyspace) - - return keyspaces - - # TODO remove after virtual tables are added to connection metadata - def fetch_virtual_tables(self, keyspace_name): - tables = [] - - result = self.session.execute("SELECT * FROM system_virtual_schema.tables WHERE keyspace_name = '{}'".format(keyspace_name)) - for row in result: - name = row['table_name'] - table = TableMetadata(keyspace_name, name) - self.fetch_virtual_columns(table) - tables.append(table) - - return tables - - # TODO remove after virtual tables are added to connection metadata - def fetch_virtual_columns(self, table): - result = self.session.execute("SELECT * FROM system_virtual_schema.columns WHERE keyspace_name = '{}' AND table_name = '{}';".format(table.keyspace_name, table.name)) - - partition_key_columns = [] - clustering_columns = [] - - for row in result: - name = row['column_name'] - cql_type = row['type'] - kind = row['kind'] - position = row['position'] - is_static = kind == 'static' - is_reversed = row['clustering_order'] == 'desc' - column = ColumnMetadata(table, name, cql_type, is_static, is_reversed) - table.columns[column.name] = column - - if kind == 'partition_key': - partition_key_columns.append((position, column)) - elif kind == 'clustering': - clustering_columns.append((position, column)) - - partition_key_columns.sort(key=lambda t: t[0]) - clustering_columns.sort(key=lambda t: t[0]) - - table.partition_key = map(lambda t: t[1], partition_key_columns) - table.clustering_key = map(lambda t: t[1], clustering_columns) - def get_keyspaces(self): return list(self.conn.metadata.keyspaces.values()) @@ -1859,7 +1782,6 @@ class Shell(cmd.Cmd): max_trace_wait=self.max_trace_wait, ssl=self.ssl, request_timeout=self.session.default_timeout, connect_timeout=self.conn.connect_timeout, - allow_server_port_discovery=self.allow_server_port_discovery, is_subshell=True) # duplicate coverage related settings in subshell if self.coverage: @@ -2357,7 +2279,6 @@ def read_options(cmdlineargs, environment): optvalues.connect_timeout = option_with_default(configs.getint, 'connection', 'timeout', DEFAULT_CONNECT_TIMEOUT_SECONDS) optvalues.request_timeout = option_with_default(configs.getint, 'connection', 'request_timeout', DEFAULT_REQUEST_TIMEOUT_SECONDS) optvalues.execute = None - optvalues.allow_server_port_discovery = option_with_default(configs.getboolean, 'connection', 'allow_server_port_discovery', 'False') (options, arguments) = parser.parse_args(cmdlineargs, values=optvalues) @@ -2523,8 +2444,7 @@ def main(options, hostname, port): single_statement=options.execute, request_timeout=options.request_timeout, connect_timeout=options.connect_timeout, - encoding=options.encoding, - allow_server_port_discovery=options.allow_server_port_discovery) + encoding=options.encoding) except KeyboardInterrupt: sys.exit('Connection aborted.') except CQL_ERRORS as e: diff --git a/lib/cassandra-driver-internal-only-3.12.0.post0-5838e2fd.zip b/lib/cassandra-driver-internal-only-3.12.0.post0-5838e2fd.zip deleted file mode 100644 index 8d627a9f81..0000000000 Binary files a/lib/cassandra-driver-internal-only-3.12.0.post0-5838e2fd.zip and /dev/null differ diff --git a/lib/cassandra-driver-internal-only-3.21.0.post0-05fb2c8d.zip b/lib/cassandra-driver-internal-only-3.21.0.post0-05fb2c8d.zip new file mode 100644 index 0000000000..59e1654183 Binary files /dev/null and b/lib/cassandra-driver-internal-only-3.21.0.post0-05fb2c8d.zip differ diff --git a/lib/geomet-0.1.0.zip b/lib/geomet-0.1.0.zip new file mode 100644 index 0000000000..9b446c0495 Binary files /dev/null and b/lib/geomet-0.1.0.zip differ diff --git a/lib/licenses/geom-0.1.0.txt b/lib/licenses/geom-0.1.0.txt new file mode 100644 index 0000000000..5c304d1a4a --- /dev/null +++ b/lib/licenses/geom-0.1.0.txt @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed 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.