This is an automated email from the ASF dual-hosted git repository.

benedict 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 cf10400  CASSANDRA-17164
cf10400 is described below

commit cf10400a79755de2d3e8ae058cfd45fe262e476b
Author: Benedict Elliott Smith <[email protected]>
AuthorDate: Mon Nov 29 22:22:52 2021 +0000

    CASSANDRA-17164
---
 client_request_metrics_local_remote_test.py |  2 +-
 secondary_indexes_test.py                   | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client_request_metrics_local_remote_test.py 
b/client_request_metrics_local_remote_test.py
index f0207ec..476d462 100644
--- a/client_request_metrics_local_remote_test.py
+++ b/client_request_metrics_local_remote_test.py
@@ -59,7 +59,7 @@ class TestClientRequestMetricsLocalRemote(Tester):
         # Run batch test:
         query = 'BEGIN BATCH '
         for i in murmur3_hashes.keys():
-            for y in range(0, 100):
+            for y in range(0, 50):
                 query += "INSERT INTO ks.test (id, ord, val) VALUES ({}, {}, 
'aaa')".format(i, y)
         query += 'APPLY BATCH;'
         session.execute(query)
diff --git a/secondary_indexes_test.py b/secondary_indexes_test.py
index 8007757..16cf447 100644
--- a/secondary_indexes_test.py
+++ b/secondary_indexes_test.py
@@ -345,8 +345,8 @@ class TestSecondaryIndexes(Tester):
 
         # Verify that the index is marked as built and it can answer queries 
and accept writes
         assert_one(session, """SELECT table_name, index_name FROM 
system."IndexInfo" WHERE table_name='k'""", ['k', 'idx'])
-        assert_length_equal(node.grep_log('became queryable after successful 
build'), 1)
-        assert_length_equal(node.grep_log('registered and writable'), 1)
+        assert_length_equal(node.grep_log('idx.*became queryable after 
successful build'), 1)
+        assert_length_equal(node.grep_log('idx.*registered and writable'), 1)
         session.execute("INSERT INTO k.t(k, v) VALUES (1, 1)")
         assert_all(session, "SELECT k FROM k.t WHERE v = 1", [[0], [1]], 
ignore_order=True)
 
@@ -361,8 +361,8 @@ class TestSecondaryIndexes(Tester):
         # Verify that the index is not built, not marked as built, and it 
still can answer queries and accept writes
         assert before_files == after_files
         assert_none(session, """SELECT * FROM system."IndexInfo" WHERE 
table_name='k'""")
-        assert_length_equal(node.grep_log('became queryable', from_mark=mark), 
0)
-        assert_length_equal(node.grep_log('became writable', from_mark=mark), 
0)
+        assert_length_equal(node.grep_log('idx.*became queryable', 
from_mark=mark), 0)
+        assert_length_equal(node.grep_log('idx.*became writable', 
from_mark=mark), 0)
         session.execute("INSERT INTO k.t(k, v) VALUES (2, 1)")
         assert_all(session, "SELECT k FROM k.t WHERE v = 1", [[0], [1], [2]], 
ignore_order=True)
 
@@ -379,8 +379,8 @@ class TestSecondaryIndexes(Tester):
         # Verify that the index is rebuilt, marked as built, and it still can 
answer queries and accept writes
         assert before_files != after_files
         assert_one(session, """SELECT table_name, index_name FROM 
system."IndexInfo" WHERE table_name='k'""", ['k', 'idx'])
-        assert_length_equal(node.grep_log('became queryable after successful 
build', from_mark=mark), 1)
-        assert_length_equal(node.grep_log('registered and writable', 
from_mark=mark), 1)
+        assert_length_equal(node.grep_log('idx.*became queryable after 
successful build', from_mark=mark), 1)
+        assert_length_equal(node.grep_log('idx.*registered and writable', 
from_mark=mark), 1)
         session.execute("INSERT INTO k.t(k, v) VALUES (3, 1)")
         assert_all(session, "SELECT k FROM k.t WHERE v = 1", [[0], [1], [2], 
[3]], ignore_order=True)
 
@@ -395,8 +395,8 @@ class TestSecondaryIndexes(Tester):
         # Verify that the index is not built, not marked as built, and it 
still can answer queries and accept writes
         assert before_files == after_files
         assert_none(session, """SELECT * FROM system."IndexInfo" WHERE 
table_name='k'""")
-        assert_length_equal(node.grep_log('became queryable', from_mark=mark), 
0)
-        assert_length_equal(node.grep_log('became writable', from_mark=mark), 
0)
+        assert_length_equal(node.grep_log('idx.*became queryable', 
from_mark=mark), 0)
+        assert_length_equal(node.grep_log('idx.*became writable', 
from_mark=mark), 0)
         session.execute("INSERT INTO k.t(k, v) VALUES (4, 1)")
         assert_all(session, "SELECT k FROM k.t WHERE v = 1", [[0], [1], [2], 
[3], [4]], ignore_order=True)
 
@@ -409,8 +409,8 @@ class TestSecondaryIndexes(Tester):
         # Verify that the index is rebuilt, marked as built, and it still can 
answer queries and accept writes
         assert before_files != after_files
         assert_one(session, """SELECT table_name, index_name FROM 
system."IndexInfo" WHERE table_name='k'""", ['k', 'idx'])
-        assert_length_equal(node.grep_log('became queryable', from_mark=mark), 
0)
-        assert_length_equal(node.grep_log('became writable', from_mark=mark), 
0)
+        assert_length_equal(node.grep_log('idx.*became queryable', 
from_mark=mark), 0)
+        assert_length_equal(node.grep_log('idx.*became writable', 
from_mark=mark), 0)
         session.execute("INSERT INTO k.t(k, v) VALUES (5, 1)")
         assert_all(session, "SELECT k FROM k.t WHERE v = 1", [[0], [1], [2], 
[3], [4], [5]], ignore_order=True)
 

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to