Skip to content

Commit

Permalink
Auto-update dependencies. [(googleapis#1093)](GoogleCloudPlatform/pyt…
Browse files Browse the repository at this point in the history
…hon-docs-samples#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
  • Loading branch information
dpebot authored and Jon Wayne Parrott committed Aug 29, 2017
1 parent 4e22fb1 commit a8ce453
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 46 deletions.
7 changes: 4 additions & 3 deletions samples/samples/quickstart.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]


Expand Down
2 changes: 1 addition & 1 deletion samples/samples/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-spanner==0.26.0
google-cloud-spanner==0.27.0
92 changes: 50 additions & 42 deletions samples/samples/snippets.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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):
Expand Down Expand Up @@ -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):
Expand All @@ -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):
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit a8ce453

Please sign in to comment.