Skip to content

fix: add ability to use single-row transactions #10021

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.

Sign up for GitHub

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

Merged
crwilcox merged 2 commits into from
Jan 3, 2020
Merged

fix: add ability to use single-row transactions #10021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c164573
fix: add ability to use single-row transactions
mackenziestarr Dec 26, 2019
20a4838
fix: add unit tests for supporting single-row transactions
mackenziestarr Jan 3, 2020
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
6 changes: 5 additions & 1 deletion bigtable/google/cloud/bigtable/row.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@ def commit(self):
table_name=self._table.name,
row_key=self._row_key,
predicate_filter=self._filter.to_pb(),
app_profile_id=self._table._app_profile_id,
Copy link

@kolea2 kolea2 Jan 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding this! Would you be able to add a unit test for this as well?

Copy link
Contributor Author

@mackenziestarr mackenziestarr Jan 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @kolea2 see 20a4838, let me know if there is a better way to access the arguments passed to the mock

true_mutations=true_mutations,
false_mutations=false_mutations,
)
Expand Down Expand Up @@ -908,7 +909,10 @@ def commit(self):

data_client = self._table._instance._client.table_data_client
row_response = data_client.read_modify_write_row(
table_name=self._table.name, row_key=self._row_key, rules=self._rule_pb_list
table_name=self._table.name,
row_key=self._row_key,
rules=self._rule_pb_list,
app_profile_id=self._table._app_profile_id,
)

# Reset modifications after commit-ing request.
Expand Down
14 changes: 10 additions & 4 deletions bigtable/tests/unit/test_row.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ def test_commit(self):
project_id = "project-id"
row_key = b"row_key"
table_name = "projects/more-stuff"
app_profile_id = "app_profile_id"
column_family_id1 = u"column_family_id1"
column_family_id2 = u"column_family_id2"
column_family_id3 = u"column_family_id3"
Expand All @@ -420,7 +421,7 @@ def test_commit(self):
client = self._make_client(
project=project_id, credentials=credentials, admin=True
)
table = _Table(table_name, client=client)
table = _Table(table_name, client=client, app_profile_id=app_profile_id)
row_filter = RowSampleFilter(0.33)
row = self._make_one(row_key, table, filter_=row_filter)

Expand All @@ -444,6 +445,8 @@ def test_commit(self):
row.delete_cell(column_family_id2, column2, state=True)
row.delete_cells(column_family_id3, row.ALL_COLUMNS, state=True)
result = row.commit()
call_args = api.transport.check_and_mutate_row.call_args.args[0]
self.assertEqual(app_profile_id, call_args.app_profile_id)
self.assertEqual(result, expected_result)
self.assertEqual(row._true_pb_mutations, [])
self.assertEqual(row._false_pb_mutations, [])
Expand Down Expand Up @@ -564,6 +567,7 @@ def test_commit(self):
project_id = "project-id"
row_key = b"row_key"
table_name = "projects/more-stuff"
app_profile_id = "app_profile_id"
column_family_id = u"column_family_id"
column = b"column"

Expand All @@ -572,7 +576,7 @@ def test_commit(self):
client = self._make_client(
project=project_id, credentials=credentials, admin=True
)
table = _Table(table_name, client=client)
table = _Table(table_name, client=client, app_profile_id=app_profile_id)
row = self._make_one(row_key, table)

# Create request_pb
Expand All @@ -593,7 +597,8 @@ def mock_parse_rmw_row_response(row_response):
with _Monkey(MUT, _parse_rmw_row_response=mock_parse_rmw_row_response):
row.append_cell_value(column_family_id, column, value)
result = row.commit()

call_args = api.transport.read_modify_write_row.call_args.args[0]
self.assertEqual(app_profile_id, call_args.app_profile_id)
self.assertEqual(result, expected_result)
self.assertEqual(row._rule_pb_list, [])

Expand Down Expand Up @@ -819,9 +824,10 @@ def __init__(self, client=None):


class _Table(object):
def __init__(self, name, client=None):
def __init__(self, name, client=None, app_profile_id=None):
self.name = name
self._instance = _Instance(client)
self._app_profile_id = app_profile_id
self.client = client
self.mutated_rows = []

Expand Down