cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aweisb...@apache.org
Subject [33/50] cassandra git commit: ninja: adapt 'test_base_column_in_view_pk_complex_timestamp' to run on 3.0 (follow-up CASSANDRA-11500)
Date Wed, 15 Nov 2017 21:47:01 GMT
ninja: adapt 'test_base_column_in_view_pk_complex_timestamp' to run on 3.0 (follow-up CASSANDRA-11500)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/afc55e8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afc55e8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afc55e8f

Branch: refs/heads/master
Commit: afc55e8fe103597ef2a663be21828861a4832be7
Parents: 9119cdf
Author: Zhao Yang <zhaoyangsingapore@gmail.com>
Authored: Thu Sep 14 12:28:56 2017 +0800
Committer: Paulo Motta <paulo@apache.org>
Committed: Mon Sep 18 08:56:27 2017 -0500

----------------------------------------------------------------------
 materialized_views_test.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afc55e8f/materialized_views_test.py
----------------------------------------------------------------------
diff --git a/materialized_views_test.py b/materialized_views_test.py
index 60dea68..698e53d 100644
--- a/materialized_views_test.py
+++ b/materialized_views_test.py
@@ -1224,11 +1224,11 @@ class TestMaterializedViews(Tester):
         self.check_trace_events(result.get_query_trace(), False)
         self.assertEqual(0, len(result.current_rows))
 
-    @since('4.0')
+    @since('3.0')
     def test_base_column_in_view_pk_commutative_tombstone_with_flush(self):
         self._test_base_column_in_view_pk_commutative_tombstone_(flush=True)
 
-    @since('4.0')
+    @since('3.0')
     def test_base_column_in_view_pk_commutative_tombstone_without_flush(self):
         self._test_base_column_in_view_pk_commutative_tombstone_(flush=False)
 
@@ -1273,10 +1273,7 @@ class TestMaterializedViews(Tester):
         assert_one(session, "SELECT * FROM t", [1, 1, None, None])  # data deleted by row-tombstone@2
should not resurrect
 
         if flush:
-            for node in self.cluster.nodelist():
-                sstable_files = ' '.join(node.get_sstable_data_files('ks', 't_by_v'))
-                debug('Compacting {}'.format(sstable_files))
-                node.nodetool('compact --user-defined {}'.format(sstable_files))
+            self.cluster.compact()
             assert_one(session, "SELECT * FROM t_by_v", [1, 1, None, None])
             assert_one(session, "SELECT * FROM t", [1, 1, None, None])  # data deleted by
row-tombstone@2 should not resurrect
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message