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-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5fd2c341 Remove deprecated CQL functions dateOf and unixTimestampOf
5fd2c341 is described below
commit 5fd2c34171be16480e9a2181dd81df6ae37b9429
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Tue Mar 14 13:20:59 2023 +0000
Remove deprecated CQL functions dateOf and unixTimestampOf
patch by Andrés de la Peña; reviewed by Berenguer Blasi and Stefan
Miklosovic for CASSANDRA-18328
---
upgrade_tests/cql_tests.py | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/upgrade_tests/cql_tests.py b/upgrade_tests/cql_tests.py
index e29042f8..8d3666c3 100644
--- a/upgrade_tests/cql_tests.py
+++ b/upgrade_tests/cql_tests.py
@@ -2652,9 +2652,13 @@ class TestCQL(UpgradeTester):
assert_row_count(cursor, 'test', 1, where="k = 0 AND t =
{}".format(dates[0]))
- assert_invalid(cursor, "SELECT dateOf(k) FROM test WHERE k = 0 AND
t = %s" % dates[0])
+ assert_invalid(cursor, "SELECT minTimeuuid(k) FROM test WHERE k =
0 AND t = %s" % dates[0])
+
+ cursor.execute("SELECT toTimestamp(t), toUnixTimestamp(t) FROM
test WHERE k = 0 AND t = %s" % dates[0])
+
+ if self.get_node_version(is_upgraded) < LooseVersion('5.0'):
+ cursor.execute("SELECT dateOf(t), unixTimestampOf(t) FROM test
WHERE k = 0 AND t = %s" % dates[0])
- cursor.execute("SELECT dateOf(t), unixTimestampOf(t) FROM test
WHERE k = 0 AND t = %s" % dates[0])
cursor.execute("SELECT t FROM test WHERE k = 0 AND t >
maxTimeuuid(1234567) AND t < minTimeuuid('2012-11-07 18:18:22-0800')")
# not sure what to check exactly so just checking the query returns
@@ -3029,7 +3033,10 @@ class TestCQL(UpgradeTester):
for i in range(0, 5):
cursor.execute("INSERT INTO test (k, t) VALUES (%d, now())" %
i)
- cursor.execute("SELECT dateOf(t) FROM test")
+ cursor.execute("SELECT totimestamp(t) FROM test")
+
+ if self.get_node_version(is_upgraded) < LooseVersion('5.0'):
+ cursor.execute("SELECT dateOf(t) FROM test")
def test_conditional_update(self):
cursor = self.prepare()
@@ -3424,7 +3431,10 @@ class TestCQL(UpgradeTester):
cursor.execute("TRUNCATE test")
cursor.execute("INSERT INTO test(k) VALUES (0)")
- assert_one(cursor, "SELECT dateOf(t) FROM test WHERE k=0", [None])
+ assert_one(cursor, "SELECT toTimestamp(t) FROM test WHERE k=0",
[None])
+
+ if self.get_node_version(is_upgraded) < LooseVersion('5.0'):
+ assert_one(cursor, "SELECT dateOf(t) FROM test WHERE k=0",
[None])
def test_cas_simple(self):
# cursor = self.prepare(nodes=3, rf=3)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
