Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: create filter in correct order #180

Merged
merged 3 commits into from Apr 28, 2020
Merged

fix: create filter in correct order #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d709b9d
fix: create filter in correct order
olavloite Apr 24, 2020
adcdc87
tests: fix flaky test
olavloite Apr 24, 2020
13e8ae6
tests: fix another flaky test
olavloite Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
View file
Open in desktop
Expand Up @@ -703,9 +703,9 @@ public Paginated<Operation> listOperations(String nextPageToken) {
instanceName,
0,
String.format(
"(name:%s/operations/) AND (metadata.@type:type.googleapis.com/%s)",
String.format("%s/databases/%s", instanceName, databaseId),
CreateDatabaseMetadata.getDescriptor().getFullName()),
"(metadata.@type:type.googleapis.com/%s) AND (name:%s/operations/)",
CreateDatabaseMetadata.getDescriptor().getFullName(),
String.format("%s/databases/%s", instanceName, databaseId)),
nextPageToken);
}
},
Expand Down Expand Up @@ -822,9 +822,9 @@ public Paginated<Operation> listOperations(String nextPageToken) {
instanceName,
0,
String.format(
"(metadata.name:%s) AND (metadata.@type:type.googleapis.com/%s)",
String.format("%s/backups/%s", instanceName, backupId),
CreateBackupMetadata.getDescriptor().getFullName()),
"(metadata.@type:type.googleapis.com/%s) AND (metadata.name:%s)",
CreateBackupMetadata.getDescriptor().getFullName(),
String.format("%s/backups/%s", instanceName, backupId)),
nextPageToken);
}
},
Expand Down Expand Up @@ -874,9 +874,9 @@ public Paginated<Operation> listOperations(String nextPageToken) {
databaseInstanceName,
0,
String.format(
"(metadata.name:%s) AND (metadata.@type:type.googleapis.com/%s)",
String.format("%s/databases/%s", databaseInstanceName, databaseId),
RestoreDatabaseMetadata.getDescriptor().getFullName()),
"(metadata.@type:type.googleapis.com/%s) AND (metadata.name:%s)",
RestoreDatabaseMetadata.getDescriptor().getFullName(),
String.format("%s/databases/%s", databaseInstanceName, databaseId)),
nextPageToken);
}
},
Expand Down
12 changes: 3 additions & 9 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminGaxTest.java
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
import com.google.cloud.spanner.admin.database.v1.MockDatabaseAdminImpl;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Uninterruptibles;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Any;
import com.google.protobuf.Empty;
Expand All @@ -45,6 +46,7 @@
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
Expand All @@ -63,7 +65,6 @@
public class DatabaseAdminGaxTest {
public static class DelayedStatusRuntimeException extends RuntimeException {
private final long millis;
private boolean hasWaited = false;

public DelayedStatusRuntimeException(StatusRuntimeException cause, long millis) {
super(cause);
Expand All @@ -72,14 +73,7 @@ public DelayedStatusRuntimeException(StatusRuntimeException cause, long millis)

@Override
public synchronized Throwable getCause() {
if (!hasWaited) {
try {
Thread.sleep(millis);
hasWaited = true;
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
Uninterruptibles.sleepUninterruptibly(millis, TimeUnit.MILLISECONDS);
return super.getCause();
}
}
Expand Down
12 changes: 3 additions & 9 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminGaxTest.java
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@
import com.google.cloud.spanner.admin.instance.v1.MockInstanceAdminImpl;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Uninterruptibles;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Any;
import com.google.protobuf.Empty;
Expand All @@ -52,6 +53,7 @@
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
Expand All @@ -70,7 +72,6 @@
public class InstanceAdminGaxTest {
public static class DelayedStatusRuntimeException extends RuntimeException {
private final long millis;
private boolean hasWaited = false;

public DelayedStatusRuntimeException(StatusRuntimeException cause, long millis) {
super(cause);
Expand All @@ -79,14 +80,7 @@ public DelayedStatusRuntimeException(StatusRuntimeException cause, long millis)

@Override
public synchronized Throwable getCause() {
if (!hasWaited) {
try {
Thread.sleep(millis);
hasWaited = true;
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
Uninterruptibles.sleepUninterruptibly(millis, TimeUnit.MILLISECONDS);
return super.getCause();
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...le-cloud-spanner/src/test/java/com/google/cloud/spanner/MockDatabaseAdminServiceImpl.java
View file
Open in desktop
Expand Up @@ -588,14 +588,14 @@ private boolean matchesFilter(Object obj, String filter) throws Exception {
Operation operation = (Operation) obj;
Pattern pattern =
Pattern.compile(
"(?:\\(metadata.(?:name|database):(.*)\\)|\\(name:(.*)/operations/\\)) AND \\(metadata.@type:type.googleapis.com/(.*)\\)");
"(?:\\(metadata.@type:type.googleapis.com/(.*)\\)) AND (?:\\(metadata.(?:name|database):(.*)\\)|\\(name:(.*)/operations/\\))");
Matcher matcher = pattern.matcher(filter);
if (matcher.matches()) {
String objectName = matcher.group(1);
String type = matcher.group(1);
String objectName = matcher.group(2);
if (objectName == null) {
objectName = matcher.group(2);
objectName = matcher.group(3);
}
String type = matcher.group(3);
Any anyMetadata = operation.getMetadata();
if (anyMetadata.getTypeUrl().endsWith(type)) {
if (type.equals(CreateBackupMetadata.getDescriptor().getFullName())) {
Expand Down