Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bigtable:Adding __eq__ and __ne__ methods for row set #6025

Merged
merged 4 commits into from
Sep 20, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions bigtable/google/cloud/bigtable/row_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,32 @@ def __init__(self):
self.row_keys = []
self.row_ranges = []

def __eq__(self, other):
if not isinstance(other, self.__class__):
return NotImplemented

if len(other.row_keys) != len(self.row_keys):
return False

if len(other.row_ranges) != len(self.row_ranges):
return False

if not sorted(other.row_keys) == sorted(self.row_keys):
return False

This comment was marked as spam.

This comment was marked as spam.


row_ranges = list(self.row_ranges)

for each in other.row_ranges:
try:
row_ranges.remove(each)
except ValueError:
return False

This comment was marked as spam.

This comment was marked as spam.


return True

def __ne__(self, other):
return not self == other

def add_row_key(self, row_key):
"""Add row key to row_keys list.

Expand Down Expand Up @@ -112,6 +138,17 @@ def __init__(self, start_key=None, end_key=None,
self.end_key = end_key
self.end_inclusive = end_inclusive

def __eq__(self, other):
if not isinstance(other, self.__class__):
return NotImplemented
return (other.start_key == self.start_key and
other.start_inclusive == self.start_inclusive and
other.end_key == self.end_key and
other.end_inclusive == self.end_inclusive)

def __ne__(self, other):
return not self == other

def get_range_kwargs(self):
""" Convert row range object to dict which can be passed to
google.bigtable.v2.RowRange add method.
Expand Down
145 changes: 145 additions & 0 deletions bigtable/tests/unit/test_row_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,115 @@ def test_constructor(self):
self.assertEqual([], row_set.row_keys)
self.assertEqual([], row_set.row_ranges)

def test__eq__(self):
row_key1 = b"row_key1"
row_key2 = b"row_key1"
row_range1 = RowRange(b"row_key4", b"row_key9")
row_range2 = RowRange(b"row_key4", b"row_key9")

row_set1 = self._make_one()
row_set2 = self._make_one()

row_set1.add_row_key(row_key1)
row_set2.add_row_key(row_key2)
row_set1.add_row_range(row_range1)
row_set2.add_row_range(row_range2)

self.assertEqual(row_set1, row_set2)

def test__eq__type_differ(self):
row_set1 = self._make_one()
row_set2 = object()
self.assertNotEqual(row_set1, row_set2)

def test__eq__len_row_keys_differ(self):
row_key1 = b"row_key1"
row_key2 = b"row_key1"

row_set1 = self._make_one()
row_set2 = self._make_one()

row_set1.add_row_key(row_key1)
row_set1.add_row_key(row_key2)
row_set2.add_row_key(row_key2)

self.assertNotEqual(row_set1, row_set2)

def test__eq__len_row_ranges_differ(self):
row_range1 = RowRange(b"row_key4", b"row_key9")
row_range2 = RowRange(b"row_key4", b"row_key9")

row_set1 = self._make_one()
row_set2 = self._make_one()

row_set1.add_row_range(row_range1)
row_set1.add_row_range(row_range2)
row_set2.add_row_range(row_range2)

self.assertNotEqual(row_set1, row_set2)

def test__eq__row_keys_differ(self):
row_set1 = self._make_one()
row_set2 = self._make_one()

row_set1.add_row_key(b"row_key1")
row_set1.add_row_key(b"row_key2")
row_set1.add_row_key(b"row_key3")
row_set2.add_row_key(b"row_key1")
row_set2.add_row_key(b"row_key2")
row_set2.add_row_key(b"row_key4")

self.assertNotEqual(row_set1, row_set2)

def test__eq__row_ranges_differ(self):
row_range1 = RowRange(b"row_key4", b"row_key9")
row_range2 = RowRange(b"row_key14", b"row_key19")
row_range3 = RowRange(b"row_key24", b"row_key29")

row_set1 = self._make_one()
row_set2 = self._make_one()

row_set1.add_row_range(row_range1)
row_set1.add_row_range(row_range2)
row_set1.add_row_range(row_range3)
row_set2.add_row_range(row_range1)
row_set2.add_row_range(row_range2)

self.assertNotEqual(row_set1, row_set2)

def test__ne__(self):
row_key1 = b"row_key1"
row_key2 = b"row_key1"
row_range1 = RowRange(b"row_key4", b"row_key9")
row_range2 = RowRange(b"row_key5", b"row_key9")

row_set1 = self._make_one()
row_set2 = self._make_one()

row_set1.add_row_key(row_key1)
row_set2.add_row_key(row_key2)
row_set1.add_row_range(row_range1)
row_set2.add_row_range(row_range2)

self.assertNotEqual(row_set1, row_set2)

def test__ne__same_value(self):
row_key1 = b"row_key1"
row_key2 = b"row_key1"
row_range1 = RowRange(b"row_key4", b"row_key9")
row_range2 = RowRange(b"row_key4", b"row_key9")

row_set1 = self._make_one()
row_set2 = self._make_one()

row_set1.add_row_key(row_key1)
row_set2.add_row_key(row_key2)
row_set1.add_row_range(row_range1)
row_set2.add_row_range(row_range2)

comparison_val = (row_set1 != row_set2)
self.assertFalse(comparison_val)

def test_add_row_key(self):
row_set = self._make_one()
row_set.add_row_key("row_key1")
Expand Down Expand Up @@ -92,6 +201,42 @@ def test_constructor(self):
self.assertTrue(row_range.start_inclusive)
self.assertFalse(row_range.end_inclusive)

def test__eq__(self):
start_key = b"row_key1"
end_key = b"row_key9"
row_range1 = self._make_one(start_key, end_key,
True, False)
row_range2 = self._make_one(start_key, end_key,
True, False)
self.assertEqual(row_range1, row_range2)

def test___eq__type_differ(self):
start_key = b"row_key1"
end_key = b"row_key9"
row_range1 = self._make_one(start_key, end_key,
True, False)
row_range2 = object()
self.assertNotEqual(row_range1, row_range2)

def test__ne__(self):
start_key = b"row_key1"
end_key = b"row_key9"
row_range1 = self._make_one(start_key, end_key,
True, False)
row_range2 = self._make_one(start_key, end_key,
False, True)
self.assertNotEqual(row_range1, row_range2)

def test__ne__same_value(self):
start_key = b"row_key1"
end_key = b"row_key9"
row_range1 = self._make_one(start_key, end_key,
True, False)
row_range2 = self._make_one(start_key, end_key,
True, False)
comparison_val = (row_range1 != row_range2)
self.assertFalse(comparison_val)

def test_get_range_kwargs_closed_open(self):
start_key = b"row_key1"
end_key = b"row_key9"
Expand Down