You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/10 23:27:20 UTC
[1/3] git commit: Fix more of test/system/test_thrift_server.py
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 b3bb7fcc3 -> a771f60db
Fix more of test/system/test_thrift_server.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b55f38be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b55f38be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b55f38be
Branch: refs/heads/cassandra-2.0
Commit: b55f38be31bc594fcdf6af757e79de2eb7579b05
Parents: b2dcaf2
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Aug 10 23:54:13 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Aug 10 23:54:13 2014 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 43 ++++++++++++++++------------------
1 file changed, 20 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b55f38be/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py
index 7655958..1594356 100644
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@ -24,7 +24,6 @@ from . import thrift_client as client
from thrift.Thrift import TApplicationException
from ttypes import *
-from constants import VERSION
def _i64(n):
@@ -1236,8 +1235,6 @@ class TestMutations(ThriftTester):
assert cf0.comparator_type == "org.apache.cassandra.db.marshal.BytesType"
def test_describe(self):
- server_version = client.describe_version()
- assert server_version == VERSION, (server_version, VERSION)
assert client.describe_cluster_name() == 'Test Cluster'
def test_describe_ring(self):
@@ -1685,13 +1682,13 @@ class TestMutations(ThriftTester):
_assert_no_columnpath('key1', ColumnPath(column_family='Counter1', column='c1'))
# insert again and this time delete the whole row, check that it is gone
- client.add('key1', ColumnParent(column_family='Counter1'), CounterColumn('c1', d1), ConsistencyLevel.ONE)
+ client.add('key2', ColumnParent(column_family='Counter1'), CounterColumn('c1', d1), ConsistencyLevel.ONE)
time.sleep(5)
- rv2 = client.get('key1', ColumnPath(column_family='Counter1', column='c1'), ConsistencyLevel.ONE)
+ rv2 = client.get('key2', ColumnPath(column_family='Counter1', column='c1'), ConsistencyLevel.ONE)
assert rv2.counter_column.value == d1
- client.remove_counter('key1', ColumnPath(column_family='Counter1'), ConsistencyLevel.ONE)
+ client.remove_counter('key2', ColumnPath(column_family='Counter1'), ConsistencyLevel.ONE)
time.sleep(5)
- _assert_no_columnpath('key1', ColumnPath(column_family='Counter1', column='c1'))
+ _assert_no_columnpath('key2', ColumnPath(column_family='Counter1', column='c1'))
def test_incr_super_remove(self):
_set_keyspace('Keyspace1')
@@ -1710,13 +1707,13 @@ class TestMutations(ThriftTester):
_assert_no_columnpath('key1', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'))
# insert again and this time delete the whole row, check that it is gone
- client.add('key1', ColumnParent(column_family='SuperCounter1', super_column='sc1'), CounterColumn('c1', d1), ConsistencyLevel.ONE)
+ client.add('key2', ColumnParent(column_family='SuperCounter1', super_column='sc1'), CounterColumn('c1', d1), ConsistencyLevel.ONE)
time.sleep(5)
- rv2 = client.get('key1', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'), ConsistencyLevel.ONE)
+ rv2 = client.get('key2', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'), ConsistencyLevel.ONE)
assert rv2.counter_column.value == d1
- client.remove_counter('key1', ColumnPath(column_family='SuperCounter1', super_column='sc1'), ConsistencyLevel.ONE)
+ client.remove_counter('key2', ColumnPath(column_family='SuperCounter1', super_column='sc1'), ConsistencyLevel.ONE)
time.sleep(5)
- _assert_no_columnpath('key1', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'))
+ _assert_no_columnpath('key2', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'))
def test_incr_decr_standard_remove(self):
_set_keyspace('Keyspace1')
@@ -1735,13 +1732,13 @@ class TestMutations(ThriftTester):
_assert_no_columnpath('key1', ColumnPath(column_family='Counter1', column='c1'))
# insert again and this time delete the whole row, check that it is gone
- client.add('key1', ColumnParent(column_family='Counter1'), CounterColumn('c1', d1), ConsistencyLevel.ONE)
+ client.add('key2', ColumnParent(column_family='Counter1'), CounterColumn('c1', d1), ConsistencyLevel.ONE)
time.sleep(5)
- rv2 = client.get('key1', ColumnPath(column_family='Counter1', column='c1'), ConsistencyLevel.ONE)
+ rv2 = client.get('key2', ColumnPath(column_family='Counter1', column='c1'), ConsistencyLevel.ONE)
assert rv2.counter_column.value == d1
- client.remove_counter('key1', ColumnPath(column_family='Counter1'), ConsistencyLevel.ONE)
+ client.remove_counter('key2', ColumnPath(column_family='Counter1'), ConsistencyLevel.ONE)
time.sleep(5)
- _assert_no_columnpath('key1', ColumnPath(column_family='Counter1', column='c1'))
+ _assert_no_columnpath('key2', ColumnPath(column_family='Counter1', column='c1'))
def test_incr_decr_super_remove(self):
_set_keyspace('Keyspace1')
@@ -1760,13 +1757,13 @@ class TestMutations(ThriftTester):
_assert_no_columnpath('key1', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'))
# insert again and this time delete the whole row, check that it is gone
- client.add('key1', ColumnParent(column_family='SuperCounter1', super_column='sc1'), CounterColumn('c1', d1), ConsistencyLevel.ONE)
+ client.add('key2', ColumnParent(column_family='SuperCounter1', super_column='sc1'), CounterColumn('c1', d1), ConsistencyLevel.ONE)
time.sleep(5)
- rv2 = client.get('key1', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'), ConsistencyLevel.ONE)
+ rv2 = client.get('key2', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'), ConsistencyLevel.ONE)
assert rv2.counter_column.value == d1
- client.remove_counter('key1', ColumnPath(column_family='SuperCounter1', super_column='sc1'), ConsistencyLevel.ONE)
+ client.remove_counter('key2', ColumnPath(column_family='SuperCounter1', super_column='sc1'), ConsistencyLevel.ONE)
time.sleep(5)
- _assert_no_columnpath('key1', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'))
+ _assert_no_columnpath('key2', ColumnPath(column_family='SuperCounter1', super_column='sc1', column='c1'))
def test_incr_decr_standard_batch_add(self):
_set_keyspace('Keyspace1')
@@ -1809,21 +1806,21 @@ class TestMutations(ThriftTester):
_assert_no_columnpath('key1', ColumnPath(column_family='Counter1', column='c1'))
# insert again and this time delete the whole row, check that it is gone
- update_map = {'key1': {'Counter1': [
+ update_map = {'key2': {'Counter1': [
Mutation(column_or_supercolumn=ColumnOrSuperColumn(counter_column=CounterColumn('c1', d1))),
Mutation(column_or_supercolumn=ColumnOrSuperColumn(counter_column=CounterColumn('c1', d2))),
]}}
client.batch_mutate(update_map, ConsistencyLevel.ONE)
time.sleep(5)
- rv2 = client.get('key1', ColumnPath(column_family='Counter1', column='c1'), ConsistencyLevel.ONE)
+ rv2 = client.get('key2', ColumnPath(column_family='Counter1', column='c1'), ConsistencyLevel.ONE)
assert rv2.counter_column.value == d1+d2
- update_map = {'key1': {'Counter1': [
+ update_map = {'key2': {'Counter1': [
Mutation(deletion=Deletion()),
]}}
client.batch_mutate(update_map, ConsistencyLevel.ONE)
time.sleep(5)
- _assert_no_columnpath('key1', ColumnPath(column_family='Counter1', column='c1'))
+ _assert_no_columnpath('key2', ColumnPath(column_family='Counter1', column='c1'))
def test_incr_decr_standard_slice(self):
_set_keyspace('Keyspace1')
[3/3] git commit: Fix even more of test/system/test_thrift_server.py
Posted by al...@apache.org.
Fix even more of test/system/test_thrift_server.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a771f60d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a771f60d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a771f60d
Branch: refs/heads/cassandra-2.0
Commit: a771f60dbb43ba4b86afb5afe501620a816b1b3d
Parents: 47d27d5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 11 00:26:36 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 11 00:26:36 2014 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a771f60d/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py
index bef08a2..5f09475 100644
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@ -630,7 +630,7 @@ class TestMutations(ThriftTester):
for column in columns:
client.insert('key', ColumnParent('Standard1'), column, ConsistencyLevel.ONE)
- d = Deletion(1, predicate=SlicePredicate(slice_range=SliceRange(start='c2', finish='c5')))
+ d = Deletion(1, predicate=SlicePredicate(slice_range=SliceRange(start='c2', finish='c4')))
client.batch_mutate({'key': {'Standard1' : [Mutation(deletion=d)]}}, ConsistencyLevel.ONE)
_assert_columnpath_exists('key', ColumnPath('Standard1', column='c1'))
@@ -677,7 +677,7 @@ class TestMutations(ThriftTester):
for column in columns:
client.insert('key', ColumnParent('Super1', 'sc1'), column, ConsistencyLevel.ONE)
- r = SliceRange(start=_i64(2), finish=_i64(5))
+ r = SliceRange(start=_i64(2), finish=_i64(4))
d = Deletion(1, super_column='sc1', predicate=SlicePredicate(slice_range=r))
client.batch_mutate({'key': {'Super1' : [Mutation(deletion=d)]}}, ConsistencyLevel.ONE)
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47d27d53
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47d27d53
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47d27d53
Branch: refs/heads/cassandra-2.0
Commit: 47d27d5319c9a8edcd69fffb34d56b382e0f9c46
Parents: b3bb7fc b55f38b
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Aug 10 23:55:33 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Aug 10 23:55:33 2014 +0300
----------------------------------------------------------------------
test/system/test_thrift_server.py | 40 +++++++++++++++++-----------------
1 file changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/47d27d53/test/system/test_thrift_server.py
----------------------------------------------------------------------