Skip to content

feat: changes for supporting DML with Returning #1914

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.

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

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.google.cloud.spanner.SpannerException;
import com.google.cloud.spanner.SpannerExceptionFactory;
import com.google.cloud.spanner.connection.AbstractStatementParser.ParsedStatement;
import com.google.common.base.Preconditions;
import com.google.spanner.v1.SpannerGrpc;

/**
Expand Down Expand Up @@ -62,7 +61,6 @@ public ApiFuture<ResultSet> executeQueryAsync(
final ParsedStatement statement,
final AnalyzeMode analyzeMode,
final QueryOption... options) {
Preconditions.checkArgument(statement.isQuery(), "Statement is not a query");
checkValidTransaction();
return executeStatementAsync(
statement,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@
import com.google.api.core.ApiFutures;
import com.google.api.gax.core.ExecutorProvider;
import com.google.cloud.spanner.AsyncResultSet;
import com.google.cloud.spanner.ErrorCode;
import com.google.cloud.spanner.ResultSet;
import com.google.cloud.spanner.ResultSets;
import com.google.cloud.spanner.SpannerExceptionFactory;
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.protobuf.Api;
import java.util.concurrent.Executor;

class AsyncStatementResultImpl implements AsyncStatementResult {

Expand Down Expand Up @@ -127,3 +132,90 @@ public ApiFuture<Void> getNoResultAsync() {
return noResult;
}
}

class AsyncStatementResultFromFutureImpl implements AsyncStatementResult {

static AsyncStatementResult of(ApiFuture<StatementResult> statementResultApiFuture, ExecutorProvider executorProvider) {
return new AsyncStatementResultFromFutureImpl(statementResultApiFuture, executorProvider);
}

private final ApiFuture<StatementResult> statementResult;
private final ExecutorProvider executorProvider;

private AsyncStatementResultFromFutureImpl(ApiFuture<StatementResult> statementResultApiFuture, ExecutorProvider executorProvider) {
this.statementResult = statementResultApiFuture;
this.executorProvider = executorProvider;
}

public ApiFuture<ResultType> getResultTypeAsync() {
return ApiFutures.transformAsync(
this.statementResult,
input -> {
return ApiFutures.immediateFuture(input.getResultType());
},
MoreExecutors.directExecutor());
}

@Override
public ResultType getResultType() {
return get(getResultTypeAsync());
}

@Override
public ClientSideStatementType getClientSideStatementType() {
return null;
}

@Override
public ResultSet getResultSet() {
return getResultSetAsync();
}

@Override
public Long getUpdateCount() {
return get(getUpdateCountAsync());
}

@Override
public AsyncResultSet getResultSetAsync() {
ApiFuture<ResultSet> resultSetApiFuture = ApiFutures.transformAsync(
this.statementResult,
input -> {
if (input.getResultType() == ResultType.RESULT_SET) {
return ApiFutures.immediateFuture(input.getResultSet());
}
return ApiFutures.immediateFailedFuture(SpannerExceptionFactory.newSpannerException(
ErrorCode.FAILED_PRECONDITION, "This result does not contain a ResultSet"));
},
MoreExecutors.directExecutor());
return ResultSets.toAsyncResultSet(resultSetApiFuture, executorProvider);
}

@Override
public ApiFuture<Long> getUpdateCountAsync() {
return ApiFutures.transformAsync(
this.statementResult,
input -> {
if (input.getResultType() == ResultType.UPDATE_COUNT) {
return ApiFutures.immediateFuture(input.getUpdateCount());
}
return ApiFutures.immediateFailedFuture(SpannerExceptionFactory.newSpannerException(
ErrorCode.FAILED_PRECONDITION, "This result does not contain an update count"));
},
MoreExecutors.directExecutor());
}

@Override
public ApiFuture<Void> getNoResultAsync() {
return ApiFutures.transformAsync(
this.statementResult,
input -> {
if (input.getResultType() == ResultType.NO_RESULT) {
return ApiFutures.immediateFuture(null);
}
return ApiFutures.immediateFailedFuture(SpannerExceptionFactory.newSpannerException(
ErrorCode.FAILED_PRECONDITION, "This result does not contain a 'no-result' result"));
},
MoreExecutors.directExecutor());
}
}
Loading