This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e8c5fe31a28ec6e5aac9a87f3aad138d4e913494 Merge: 3d022d3c5f 5eba52feb8 Author: Andrés de la Peña <[email protected]> AuthorDate: Wed Oct 25 12:15:26 2023 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 20 +++++++++------- pylib/cqlshlib/test/test_cqlsh_completion.py | 36 ++++++++++++++++++++++++---- pylib/cqlshlib/test/test_cqlsh_output.py | 12 ++++++---- pylib/cqlshlib/test/test_keyspace_init.cql | 30 ++++++++++++++++------- 5 files changed, 73 insertions(+), 26 deletions(-) diff --cc CHANGES.txt index 763b8ecbbd,317954aafb..e3a8ff051b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-alpha2 +5.1 + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Add cqlsh autocompletion for the vector data type (CASSANDRA-18946) * Fix nodetool tablehistograms output to avoid printing repeated information and ensure at most two arguments (CASSANDRA-18955) * Change the checksum algorithm SAI-related files use from CRC32 to CRC32C (CASSANDRA-18836) * Correctly remove Index.Group from IndexRegistry (CASSANDRA-18905) diff --cc pylib/cqlshlib/cql3handling.py index 220c197629,3c6518a0b9..d19febceaf --- a/pylib/cqlshlib/cql3handling.py +++ b/pylib/cqlshlib/cql3handling.py @@@ -21,8 -21,10 +21,8 @@@ from cqlshlib.cqlhandling import CqlPar simple_cql_types = {'ascii', 'bigint', 'blob', 'boolean', 'counter', 'date', 'decimal', 'double', 'duration', 'float', 'inet', 'int', 'smallint', 'text', 'time', 'timestamp', 'timeuuid', 'tinyint', 'uuid', 'varchar', 'varint'} - simple_cql_types.difference_update(('set', 'map', 'list')) + simple_cql_types.difference_update(('set', 'map', 'list', 'vector')) -cqldocs = helptopics.CQL3HelpTopics() - class UnexpectedTableStructure(UserWarning): --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
