Skip to content

Commit 0cff0e7

Browse files
authored
test: use an AtomicInteger for dbseq (#1853)
Use an AtomicInteger for dbseq to ensure unique database names if multiple tests try to create a database in parallel. Updates googleapis/java-spanner-jdbc#820
1 parent 4d6bb2d commit 0cff0e7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/testing/RemoteSpannerHelper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ public class RemoteSpannerHelper {
4848
private final SpannerOptions options;
4949
private final Spanner client;
5050
private final InstanceId instanceId;
51-
private static int dbSeq;
52-
private static int dbPrefix = new Random().nextInt(Integer.MAX_VALUE);
51+
private static final AtomicInteger dbSeq = new AtomicInteger();
52+
private static final int dbPrefix = new Random().nextInt(Integer.MAX_VALUE);
5353
private static final AtomicInteger backupSeq = new AtomicInteger();
54-
private static int backupPrefix = new Random().nextInt(Integer.MAX_VALUE);
54+
private static final int backupPrefix = new Random().nextInt(Integer.MAX_VALUE);
5555
private final List<Database> dbs = new ArrayList<>();
5656

5757
protected RemoteSpannerHelper(SpannerOptions options, InstanceId instanceId, Spanner client) {
@@ -104,7 +104,7 @@ public Database createTestDatabase(String... statements) throws SpannerException
104104
* Returns a database id which is guaranteed to be unique within the context of this environment.
105105
*/
106106
public String getUniqueDatabaseId() {
107-
return String.format("testdb_%d_%04d", dbPrefix, dbSeq++);
107+
return String.format("testdb_%d_%04d", dbPrefix, dbSeq.incrementAndGet());
108108
}
109109

110110
/**
@@ -159,7 +159,7 @@ public void cleanUp() {
159159
int numDropped = 0;
160160
for (Database db : dbs) {
161161
try {
162-
logger.log(Level.FINE, "Dropping test database {0}", db.getId());
162+
logger.log(Level.INFO, "Dropping test database {0}", db.getId());
163163
db.drop();
164164
++numDropped;
165165
} catch (SpannerException e) {

0 commit comments

Comments
 (0)