spanner-jdbc: Add music sql script based integration tests by olavloite · Pull Request #6034 · googleapis/google-cloud-java

olavloite · 2019-08-06T14:11:55Z

Adds SQL based integration tests for the Spanner JDBC driver based on the standard music data model.

codecov · 2019-08-06T15:38:24Z

Codecov Report

Merging #6034 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #6034      +/-   ##
============================================
+ Coverage     47.38%   47.38%   +<.01%     
+ Complexity    27197    27180      -17     
============================================
  Files          2523     2523              
  Lines        274599   274580      -19     
  Branches      31378    31380       +2     
============================================
- Hits         130123   130118       -5     
+ Misses       134863   134852      -11     
+ Partials       9613     9610       -3

Impacted Files	Coverage Δ	Complexity Δ
...e/cloud/bigtable/data/v2/BigtableDataSettings.java	`34.78% <0%> (+1.44%)`	`3% <0%> (-1%)`	⬇️
...gtable/admin/v2/BigtableInstanceAdminSettings.java	`100% <0%> (+3.44%)`	`6% <0%> (ø)`	⬇️
.../bigtable/admin/v2/BigtableTableAdminSettings.java	`71.73% <0%> (+8.1%)`	`7% <0%> (-1%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 13fc06a...c06a6f5. Read the comment docs.

kolea2 · 2019-08-07T02:51:50Z

...cloud-spanner-jdbc/src/test/resources/com/google/cloud/spanner/jdbc/ITSqlMusicScriptTest.sql

+SET AUTOCOMMIT = FALSE;
+SET TRANSACTION READ WRITE;
+
+INSERT INTO Singers (SingerId, FirstName, LastName, SingerInfo, BirthDate) VALUES (1,'Marilyn','Lindsey',FROM_BASE64('iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAIAAAB7GkOtAAANGklEQVR4nOzXi6/X9X3H8R56RO222IsXqqgwGROYWuf9wnDipV7B0GmxYzWr9bKNqDGatraltop2ird1hTXrqvbMiChiylA7mCtQK4aySkstRiyFrLZQy5DCWaMz+yteSZPX4/EHvD4n3/NLnnkPzlg//l1JC68bjO6fc+LXo/sv3XhXdH/M7tXR/S0fGBndf23ei9H9WzYfG91fdtoHo/uzn70pun/YtrOi+zMvzv79x6xeHt1/e8yz0f1fjNoW3X9qbvb7jIiuA/A7SwAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBo89IZzow8c/uab0f1Hj389uv/YCxuj+19d/Ep0f9GmO6L7P7p/Q3T/H8/5fnT/rzbvju6/svaK6P45i7L/349svSq6v9+Ri6P7ixf9KLr/1BV/G90/deeHo/suAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACg1MAXdv44+sAXb18S3R+/eUJ0f++3hqP7p/7LtdH9bWsejO5/dvry6P4Hr50b3Z8/fFp0/4Sxfx/d3/ejg9H9vca9Gt0fumQgur/0kDOj+7fd8rXo/tCMA6L7LgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoNTA8J3viz4wb/jM6P49P/+z6P53Zh8U3b/wgInR/aVbr4vuL1h4VnR/979Pi+6f8A8jo/t//OU3ovuzj748uv/cnuHo/thRv4ru3zr4y+j+GeMWR/c3nj09uu8CACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKDUwb92r0gSMnvxzdv3HTr6L7w19ZG91f++Svo/tDrx0f3X9mzvnR/Ykj50T3779p/+j+fld/Lrq/7LHXo/u/XXJRdP+PDs3+frbPuiq7//D10f3hUUPRfRcAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBq4Mb5y6IPfOzRb0X37xtxcXT/ic+cF92fsG1udP+6vZ+J7u9/+3ej+2cNHhTdX/bC1dH9rZeNju7PWnBudP/e/f8yun/UZ98T3b9s6r3R/XXT/y26/7MfZ7+PCwCglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKDVwyikHRh94acTj0f2jxx4f3f/QHVOi+zdcNia6/9Bh86L76w+/Jrp/0p/Pie7ftm6f6P4++x4b3b977XHR/SOvHR3dX7Thruj+C4+/Ed1ftfTV6P4d962L7rsAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSgx/65rnRB6ZufX90/80Fo6P739t+W3T/lx9fE93f8r1jo/vXzLg0uv/l3x4Q3V85+/ei+1ePXh3d/+uT/iS6P/jt46L766bMie6PfuCJ6P7ctWOi+5PXHBbddwEAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUGp37jzOgDF957V3T/5JP/Nbr/yFFD0f3fv/y86P75v1kd3Z+/18jo/uOPZH+fIzZE5991+pVfiO6fd8Z90f1XDrwjuv8/L78e3X962uLo/srJ46P7q3feE913AQCUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQY+v/a16APTnvxJdP+4H8yP7p+4ZEp0f9JvtkT35x9+TXR/yxNfiu7PPGhPdP8Dc3ZF9zePfya6P+v590T3d2zYHd1/aN7l0f0Jkz4Z3Z9087js/qQro/suAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACg1MCZtxwYfeCIz30lur9z+6To/n7LL4zuXzb9v6P7cy96Obp/64ObovsT9ro0ur98zlHR/ROWXRTdv+FvTozuTz5iQnR/1ANvRfd3feuH0f2ZH/l0dH/p2b+I7rsAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSA7PWfCb6wPS9/yO6//CKidH9BfecFN1/+uQbovtrhsZF9/c8vSa6/9Njst//9sHnovubJu4f3X/2L74R3T9l5Fej+7dtG4ruf/uT+0T37/7E9dH9R99/QXTfBQBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBrc96XvRx/YfuhN0f0nr7w+ur/1D34W3X/3zx+I7h885cXo/p3XDET3T/3UMdH9+9ZOje5fvOXy6P7dt384uj/tBwdG92fNeDu6v2veG9H9M762Iro/4bjHovsuAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACg1MCIhf8XfeAP/2s4uv/crr+L7k895J7o/oxDbo7uf3fm0uj+uaN+Et1fMfDD6P4FU7J//8b1b0f3D/3mQ9H90RecHt0f89G9o/vPf2lJdP/ji3dG9289OLvvAgAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASg186qzx0Qfe2bFfdP/B9306uv/5954T3f/iTx+O7l/yyKXR/YETn4ruH/1Pc6P7/3zyFdH9Px15RHR/8XuPje4PrZwd3T/t7KXR/f+dvCq6f9VbL0b33z3+19F9FwBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUGpw4iUfiz6wYtXY6P7s7zwf3d9xxZLo/titM6P7mz+R3Z8246Lo/jur1kf3D56+Mrp//u7d0f2Fd94f3b//6zui+xsn3xzdv3bH6dH9cXuOiO7f+p8jo/suAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACg1P8HAAD//+SLeeht2MttAAAAAElFTkSuQmCC'),DATE '1906-04-28');


Let's switch the BASE64 values to something generated by RandomResultSetGenerator.

The BASE64 values have been replaced with generated random bytes.

kolea2 · 2019-08-16T15:08:48Z

LGTM after rebase

kolea2 · 2019-08-19T14:43:38Z

...le-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/ITAbstractSpannerTest.java

-    StringBuilder url = new StringBuilder("cloudspanner:/").append(getDatabase().getId().getName());
+    StringBuilder url = new StringBuilder("cloudspanner:");
+    if (getTestEnv().getTestHelper().getOptions().getHost() != null) {
+      url.append(getTestEnv().getTestHelper().getOptions().getHost().replace("https:", ""));


Sorry just noticed this - should this be made consistent with the change we just merged for ITAbstractJdbcTest, or better yet - can we pull out this into a helper method?

Simplify the assertion as the actual number of restarts of a transaction cannot be determined for certain, as Cloud Spanner might abort any transaction.

…s#6034) * add music sql script based tests * allow using custom host for integration tests * replace base64 data with random numbers * run code formatter * use random data * fixed reference to wrong first name * count nested aborts as successful retries * simplify assertion to prevent flaky failures Simplify the assertion as the actual number of restarts of a transaction cannot be determined for certain, as Cloud Spanner might abort any transaction. * run code formatter * move connection URL generation to util method

olavloite requested a review from kolea2 August 6, 2019 14:11

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Aug 6, 2019

kolea2 suggested changes Aug 7, 2019

View reviewed changes

olavloite force-pushed the spanner-jdbc-cleanup-it-jdbc-music-script branch from 93ee9d0 to d2f52c2 Compare August 7, 2019 07:19

olavloite force-pushed the spanner-jdbc-cleanup-it-jdbc-music-script branch 2 times, most recently from b4e4b32 to 36948ce Compare August 17, 2019 06:13

olavloite requested a review from kolea2 August 17, 2019 14:43

kolea2 suggested changes Aug 19, 2019

View reviewed changes

kolea2 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Aug 19, 2019

yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Aug 19, 2019

olavloite added 10 commits August 20, 2019 16:40

add music sql script based tests

658c789

allow using custom host for integration tests

cf01adf

replace base64 data with random numbers

b98ce3d

run code formatter

fe76785

use random data

89c3c8c

fixed reference to wrong first name

85b0222

count nested aborts as successful retries

44e82b7

simplify assertion to prevent flaky failures

e2b0043

Simplify the assertion as the actual number of restarts of a transaction cannot be determined for certain, as Cloud Spanner might abort any transaction.

run code formatter

8fb30c6

move connection URL generation to util method

c06a6f5

olavloite force-pushed the spanner-jdbc-cleanup-it-jdbc-music-script branch from 381b050 to c06a6f5 Compare August 20, 2019 15:06

kolea2 approved these changes Aug 20, 2019

View reviewed changes

kolea2 merged commit 8d280ac into googleapis:master Aug 20, 2019

This was referenced Aug 22, 2019

Release google-cloud-java v0.106.0 #6127

Closed

Release google-cloud-java v0.106.0 #6140

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

spanner-jdbc: Add music sql script based integration tests#6034

spanner-jdbc: Add music sql script based integration tests#6034
kolea2 merged 10 commits intogoogleapis:masterfrom
olavloite:spanner-jdbc-cleanup-it-jdbc-music-script

olavloite commented Aug 6, 2019

Uh oh!

codecov bot commented Aug 6, 2019 •

edited

Loading

Uh oh!

kolea2 Aug 7, 2019

Uh oh!

olavloite Aug 7, 2019

Uh oh!

kolea2 commented Aug 16, 2019

Uh oh!

kolea2 Aug 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

olavloite commented Aug 6, 2019

Uh oh!

codecov bot commented Aug 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

kolea2 Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

olavloite Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

kolea2 commented Aug 16, 2019

Uh oh!

kolea2 Aug 19, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Aug 6, 2019 •

edited

Loading