Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add support for CommitStats (#261)
* feat: add support for CommitStats * fix: remove overload delay * fix: gracefully close pool after each test * chore: update copyright year, comments and assertions * deps: use Spanner client lib 5.0.0 * fix: add new methods to clirr * test: add tests for SQLException
- Loading branch information
Showing
5 changed files
with
281 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
src/test/java/com/google/cloud/spanner/jdbc/JdbcCommitStatsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Copyright 2021 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.spanner.jdbc; | ||
|
|
||
| import static com.google.common.truth.Truth.assertThat; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import com.google.cloud.spanner.CommitResponse; | ||
| import com.google.cloud.spanner.Mutation; | ||
| import com.google.cloud.spanner.connection.AbstractMockServerTest; | ||
| import com.google.cloud.spanner.connection.SpannerPool; | ||
| import java.sql.DriverManager; | ||
| import java.sql.ResultSet; | ||
| import java.sql.SQLException; | ||
| import org.junit.After; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.JUnit4; | ||
|
|
||
| @RunWith(JUnit4.class) | ||
| public class JdbcCommitStatsTest extends AbstractMockServerTest { | ||
|
|
||
| @After | ||
| public void closeSpannerPool() { | ||
| SpannerPool.closeSpannerPool(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDefaultReturnCommitStats() throws SQLException { | ||
| try (java.sql.Connection connection = createJdbcConnection()) { | ||
| try (java.sql.ResultSet rs = | ||
| connection.createStatement().executeQuery("SHOW VARIABLE RETURN_COMMIT_STATS")) { | ||
| assertTrue(rs.next()); | ||
| assertFalse(rs.getBoolean("RETURN_COMMIT_STATS")); | ||
| assertFalse(rs.next()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testReturnCommitStatsInConnectionUrl() throws SQLException { | ||
| try (java.sql.Connection connection = | ||
| DriverManager.getConnection( | ||
| String.format("jdbc:%s;returnCommitStats=true", getBaseUrl()))) { | ||
| try (java.sql.ResultSet rs = | ||
| connection.createStatement().executeQuery("SHOW VARIABLE RETURN_COMMIT_STATS")) { | ||
| assertTrue(rs.next()); | ||
| assertTrue(rs.getBoolean("RETURN_COMMIT_STATS")); | ||
| assertFalse(rs.next()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSetReturnCommitStats() throws SQLException { | ||
| try (java.sql.Connection connection = createJdbcConnection()) { | ||
| connection.createStatement().execute("SET RETURN_COMMIT_STATS=true"); | ||
| try (java.sql.ResultSet rs = | ||
| connection.createStatement().executeQuery("SHOW VARIABLE RETURN_COMMIT_STATS")) { | ||
| assertTrue(rs.next()); | ||
| assertTrue(rs.getBoolean("RETURN_COMMIT_STATS")); | ||
| assertFalse(rs.next()); | ||
| } | ||
| connection.createStatement().execute("SET RETURN_COMMIT_STATS=false"); | ||
| try (java.sql.ResultSet rs = | ||
| connection.createStatement().executeQuery("SHOW VARIABLE RETURN_COMMIT_STATS")) { | ||
| assertTrue(rs.next()); | ||
| assertFalse(rs.getBoolean("RETURN_COMMIT_STATS")); | ||
| assertFalse(rs.next()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSetAndUseReturnCommitStats() throws SQLException { | ||
| try (CloudSpannerJdbcConnection connection = | ||
| createJdbcConnection().unwrap(CloudSpannerJdbcConnection.class)) { | ||
| connection.setReturnCommitStats(true); | ||
| connection.bufferedWrite(Mutation.newInsertBuilder("FOO").set("ID").to(1L).build()); | ||
| connection.commit(); | ||
| CommitResponse response = connection.getCommitResponse(); | ||
| assertNotNull(response); | ||
| assertNotNull(response.getCommitStats()); | ||
| assertThat(response.getCommitStats().getMutationCount()).isAtLeast(1); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testSetAndUseReturnCommitStatsUsingSql() throws SQLException { | ||
| try (java.sql.Connection connection = createJdbcConnection()) { | ||
| connection.createStatement().execute("SET RETURN_COMMIT_STATS=true"); | ||
| // Use a Mutation as the mock server only returns a non-zero mutation count for mutations, and | ||
| // not for DML statements. | ||
| connection | ||
| .unwrap(CloudSpannerJdbcConnection.class) | ||
| .bufferedWrite(Mutation.newInsertBuilder("FOO").set("ID").to(1L).build()); | ||
| connection.commit(); | ||
| try (ResultSet rs = | ||
| connection.createStatement().executeQuery("SHOW VARIABLE COMMIT_RESPONSE")) { | ||
| assertTrue(rs.next()); | ||
| assertNotNull(rs.getTimestamp("COMMIT_TIMESTAMP")); | ||
| assertThat(rs.getLong("MUTATION_COUNT")).isAtLeast(1L); | ||
| assertFalse(rs.next()); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters