Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.

Updated Happy Base framework to the latest version of Bigtable 0.29.0 #36

Merged
tseaver merged 3 commits into from
Jun 5, 2018
Merged

Updated Happy Base framework to the latest version of Bigtable 0.29.0 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
193e3e9
Updated Happy Base framework to the latest version of Bigtable 0.29.0
vikas-jamdar May 31, 2018
d69511a
adding correct condition for bigtable version google-cloud-bigtable >…
vikas-jamdar Jun 4, 2018
73ce580
datetime timestamp removed. Time will be an integer in microseconds
vikas-jamdar Jun 5, 2018
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
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@


REQUIREMENTS = [
'google-cloud-bigtable >= 0.26.0, < 0.27dev',
'google-cloud-bigtable >= 0.29.0, < 0.30dev',
]

SETUP_BASE.pop('url')
Expand Down
18 changes: 8 additions & 10 deletions unit_tests/test_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,26 +1163,25 @@ def test_without_timestamp(self):
from google.cloud.bigtable.row_data import Cell

value1 = 'foo'
cell1 = Cell(value=value1, timestamp=None)
cell1 = Cell(value=value1, timestamp_micros=None)
value2 = 'bar'
cell2 = Cell(value=value2, timestamp=None)
cell2 = Cell(value=value2, timestamp_micros=None)

result = self._callFUT([cell1, cell2])
self.assertEqual(result, [value1, value2])

def test_with_timestamp(self):
from google.cloud._helpers import _datetime_from_microseconds
from google.cloud.bigtable.row_data import Cell

value1 = 'foo'
ts1_millis = 1221934570148
ts1 = _datetime_from_microseconds(ts1_millis * 1000)
cell1 = Cell(value=value1, timestamp=ts1)
ts1 = ts1_millis * 1000
cell1 = Cell(value=value1, timestamp_micros=ts1)

value2 = 'bar'
ts2_millis = 1221955575548
ts2 = _datetime_from_microseconds(ts2_millis * 1000)
cell2 = Cell(value=value2, timestamp=ts2)
ts2 = ts2_millis * 1000
cell2 = Cell(value=value2, timestamp_micros=ts2)

result = self._callFUT([cell1, cell2], include_timestamp=True)
self.assertEqual(result,
Expand Down Expand Up @@ -1215,17 +1214,16 @@ def test_without_timestamp(self):
self.assertEqual(result, expected_result)

def test_with_timestamp(self):
from google.cloud._helpers import _datetime_from_microseconds
from google.cloud.bigtable.row_data import Cell
from google.cloud.bigtable.row_data import PartialRowData

row_data = PartialRowData(b'row-key')
val1 = b'hi-im-bytes'
ts1_millis = 1221934570148
ts1 = _datetime_from_microseconds(ts1_millis * 1000)
ts1 = ts1_millis * 1000
val2 = b'bi-im-hytes'
ts2_millis = 1331934880000
ts2 = _datetime_from_microseconds(ts2_millis * 1000)
ts2 = ts2_millis * 1000
row_data._cells[u'fam1'] = {
b'col1': [Cell(val1, ts1)],
b'col2': [Cell(val2, ts2)],
Expand Down