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 53c25f8faa68065040c37f29f3f7f0f0b7161a98
Merge: bb686fc27d f41ecf586c
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Thu Nov 2 17:10:13 2023 +0000
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
lib/cassandra-driver-internal-only-3.25.0.zip | Bin 345177 -> 0 bytes
lib/cassandra-driver-internal-only-3.28.0.zip | Bin 0 -> 356837 bytes
pylib/cqlshlib/formatting.py | 15 +++++++++++----
pylib/cqlshlib/test/test_cqlsh_output.py | 22 ++++++++++++++++++++++
5 files changed, 34 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index c7bbed34a0,f54569f342..d7a0a03b6d
--- 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:
+ * Upgrade Python driver to 3.28.0 (CASSANDRA-18960)
* Add retries to IR messages (CASSANDRA-18962)
* Add metrics and logging to repair retries (CASSANDRA-18952)
* Remove deprecated code in Cassandra 1.x and 2.x (CASSANDRA-18959)
diff --cc pylib/cqlshlib/test/test_cqlsh_output.py
index 3cb6d51300,9ca7988d2e..65ac5be482
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@@ -935,9 -935,31 +935,31 @@@ class TestCqlshOutput(BaseTestCase)
"""),
))
+ def test_vectors_output(self):
+ self.assertQueriesGiveColoredOutput((
+ ("SELECT vectorcol FROM has_all_types;", r"""
+ vectorcol
+ MMMMMMMMM
+ -----------------------
+
+ [1, -2, NaN]
+ BGBBGGBBGGGB
+ [1, 2, 3]
+ BGBBGBBGB
+ [0, 0, 0]
+ BGBBGBBGB
+ null
+ RRRR
+ [1e+08, 1e+08, 1e+08]
+ BGGGGGBBGGGGGBBGGGGGB
+
+ (5 rows)
+ """),
+ ))
+
def test_expanded_output_counts_past_page(self):
query = "PAGING 5; EXPAND ON; SELECT * FROM twenty_rows_table;"
- output, result = testcall_cqlsh(prompt=None, env=self.default_env,
+ output, result = cqlsh_testcall(prompt=None, env=self.default_env,
tty=False, input=query)
self.assertEqual(0, result)
# format is "@ Row 1"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
