From a8ce453ddd91adc13e52cb2886d5e761cbc90bc8 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 29 Aug 2017 16:53:02 -0700 Subject: [PATCH] Auto-update dependencies. [(#1093)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1093) * Auto-update dependencies. * Fix storage notification poll sample Change-Id: I6afbc79d15e050531555e4c8e51066996717a0f3 * Fix spanner samples Change-Id: I40069222c60d57e8f3d3878167591af9130895cb * Drop coverage because it's not useful Change-Id: Iae399a7083d7866c3c7b9162d0de244fbff8b522 * Try again to fix flaky logging test Change-Id: I6225c074701970c17c426677ef1935bb6d7e36b4 --- samples/samples/quickstart.py | 7 +-- samples/samples/requirements.txt | 2 +- samples/samples/snippets.py | 92 +++++++++++++++++--------------- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/samples/samples/quickstart.py b/samples/samples/quickstart.py index 43cbf4d7ab..75125839d2 100644 --- a/samples/samples/quickstart.py +++ b/samples/samples/quickstart.py @@ -36,10 +36,11 @@ def run_quickstart(): database = instance.database(database_id) # Execute a simple SQL statement. - results = database.execute_sql('SELECT 1') + with database.snapshot() as snapshot: + results = snapshot.execute_sql('SELECT 1') - for row in results: - print(row) + for row in results: + print(row) # [END spanner_quickstart] diff --git a/samples/samples/requirements.txt b/samples/samples/requirements.txt index 5d62b084e9..ce3842239d 100644 --- a/samples/samples/requirements.txt +++ b/samples/samples/requirements.txt @@ -1 +1 @@ -google-cloud-spanner==0.26.0 +google-cloud-spanner==0.27.0 diff --git a/samples/samples/snippets.py b/samples/samples/snippets.py index d4d43bd214..7e6dd79db3 100644 --- a/samples/samples/snippets.py +++ b/samples/samples/snippets.py @@ -94,11 +94,12 @@ def query_data(instance_id, database_id): instance = spanner_client.instance(instance_id) database = instance.database(database_id) - results = database.execute_sql( - 'SELECT SingerId, AlbumId, AlbumTitle FROM Albums') + with database.snapshot() as snapshot: + results = snapshot.execute_sql( + 'SELECT SingerId, AlbumId, AlbumTitle FROM Albums') - for row in results: - print(u'SingerId: {}, AlbumId: {}, AlbumTitle: {}'.format(*row)) + for row in results: + print(u'SingerId: {}, AlbumId: {}, AlbumTitle: {}'.format(*row)) def read_data(instance_id, database_id): @@ -107,14 +108,15 @@ def read_data(instance_id, database_id): instance = spanner_client.instance(instance_id) database = instance.database(database_id) - keyset = spanner.KeySet(all_=True) - results = database.read( - table='Albums', - columns=('SingerId', 'AlbumId', 'AlbumTitle',), - keyset=keyset,) + with database.snapshot() as snapshot: + keyset = spanner.KeySet(all_=True) + results = snapshot.read( + table='Albums', + columns=('SingerId', 'AlbumId', 'AlbumTitle',), + keyset=keyset,) - for row in results: - print(u'SingerId: {}, AlbumId: {}, AlbumTitle: {}'.format(*row)) + for row in results: + print(u'SingerId: {}, AlbumId: {}, AlbumTitle: {}'.format(*row)) def query_data_with_new_column(instance_id, database_id): @@ -130,11 +132,13 @@ def query_data_with_new_column(instance_id, database_id): instance = spanner_client.instance(instance_id) database = instance.database(database_id) - results = database.execute_sql( - 'SELECT SingerId, AlbumId, MarketingBudget FROM Albums') + with database.snapshot() as snapshot: + results = snapshot.execute_sql( + 'SELECT SingerId, AlbumId, MarketingBudget FROM Albums') - for row in results: - print(u'SingerId: {}, AlbumId: {}, MarketingBudget: {}'.format(*row)) + for row in results: + print( + u'SingerId: {}, AlbumId: {}, MarketingBudget: {}'.format(*row)) def add_index(instance_id, database_id): @@ -183,16 +187,18 @@ def query_data_with_index( 'start_title': type_pb2.Type(code=type_pb2.STRING), 'end_title': type_pb2.Type(code=type_pb2.STRING) } - results = database.execute_sql( - "SELECT AlbumId, AlbumTitle, MarketingBudget " - "FROM Albums@{FORCE_INDEX=AlbumsByAlbumTitle} " - "WHERE AlbumTitle >= @start_title AND AlbumTitle < @end_title", - params=params, param_types=param_types) - for row in results: - print( - u'AlbumId: {}, AlbumTitle: {}, ' - 'MarketingBudget: {}'.format(*row)) + with database.snapshot() as snapshot: + results = snapshot.execute_sql( + "SELECT AlbumId, AlbumTitle, MarketingBudget " + "FROM Albums@{FORCE_INDEX=AlbumsByAlbumTitle} " + "WHERE AlbumTitle >= @start_title AND AlbumTitle < @end_title", + params=params, param_types=param_types) + + for row in results: + print( + u'AlbumId: {}, AlbumTitle: {}, ' + 'MarketingBudget: {}'.format(*row)) def read_data_with_index(instance_id, database_id): @@ -209,15 +215,16 @@ def read_data_with_index(instance_id, database_id): instance = spanner_client.instance(instance_id) database = instance.database(database_id) - keyset = spanner.KeySet(all_=True) - results = database.read( - table='Albums', - columns=('AlbumId', 'AlbumTitle'), - keyset=keyset, - index='AlbumsByAlbumTitle') + with database.snapshot() as snapshot: + keyset = spanner.KeySet(all_=True) + results = snapshot.read( + table='Albums', + columns=('AlbumId', 'AlbumTitle'), + keyset=keyset, + index='AlbumsByAlbumTitle') - for row in results: - print('AlbumId: {}, AlbumTitle: {}'.format(*row)) + for row in results: + print('AlbumId: {}, AlbumTitle: {}'.format(*row)) def add_storing_index(instance_id, database_id): @@ -252,17 +259,18 @@ def read_data_with_storing_index(instance_id, database_id): instance = spanner_client.instance(instance_id) database = instance.database(database_id) - keyset = spanner.KeySet(all_=True) - results = database.read( - table='Albums', - columns=('AlbumId', 'AlbumTitle', 'MarketingBudget'), - keyset=keyset, - index='AlbumsByAlbumTitle2') + with database.snapshot() as snapshot: + keyset = spanner.KeySet(all_=True) + results = snapshot.read( + table='Albums', + columns=('AlbumId', 'AlbumTitle', 'MarketingBudget'), + keyset=keyset, + index='AlbumsByAlbumTitle2') - for row in results: - print( - u'AlbumId: {}, AlbumTitle: {}, ' - 'MarketingBudget: {}'.format(*row)) + for row in results: + print( + u'AlbumId: {}, AlbumTitle: {}, ' + 'MarketingBudget: {}'.format(*row)) def add_column(instance_id, database_id):