Merge branch 'master' into commit-stats2

google-cloud-spanner/clirr-ignored-differences.xml

@@ -407,7 +407,55 @@
  <method>java.lang.Object initialize()</method>
  </difference>
 
+ <!-- TransactionOptions and UpdateOptions -->
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/DatabaseClient</className>
+ <method>long executePartitionedUpdate(com.google.cloud.spanner.Statement)</method>
+ </difference>
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/DatabaseClient</className>
+ <method>com.google.cloud.spanner.TransactionRunner readWriteTransaction()</method>
+ </difference>
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/DatabaseClient</className>
+ <method>com.google.cloud.spanner.AsyncRunner runAsync()</method>
+ </difference>
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/DatabaseClient</className>
+ <method>com.google.cloud.spanner.TransactionManager transactionManager()</method>
+ </difference>
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/DatabaseClient</className>
+ <method>com.google.cloud.spanner.AsyncTransactionManager transactionManagerAsync()</method>
+ </difference>
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/TransactionContext</className>
+ <method>long[] batchUpdate(java.lang.Iterable)</method>
+ </difference>
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/TransactionContext</className>
+ <method>com.google.api.core.ApiFuture batchUpdateAsync(java.lang.Iterable)</method>
+ </difference>
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/TransactionContext</className>
+ <method>long executeUpdate(com.google.cloud.spanner.Statement)</method>
+ </difference>
+ <difference>
+ <differenceType>7004</differenceType>
+ <className>com/google/cloud/spanner/TransactionContext</className>
+ <method>com.google.api.core.ApiFuture executeUpdateAsync(com.google.cloud.spanner.Statement)</method>
+ </difference>
+
  <!-- Support for CommitStats added -->
+ <!-- 
  <difference>
  <differenceType>7005</differenceType>
  <className>com/google/cloud/spanner/CommitResponse</className>
@@ -463,5 +511,5 @@
  <method>com.google.cloud.spanner.AsyncTransactionManager transactionManagerAsync()</method>
  <to>com.google.cloud.spanner.AsyncTransactionManager transactionManagerAsync(com.google.cloud.spanner.TransactionOption[])</to>
  </difference>
-
+  -->
 </differences>

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncTransactionManagerImpl.java

@@ -48,10 +48,10 @@ final class AsyncTransactionManagerImpl
  private TransactionState txnState;
  private final SettableApiFuture<CommitResponse> commitResponse = SettableApiFuture.create();
 
- AsyncTransactionManagerImpl(SessionImpl session, Span span, Options options) {
+ AsyncTransactionManagerImpl(SessionImpl session, Span span, TransactionOption... options) {
  this.session = session;
  this.span = span;
- this.options = options;
+ this.options = Options.fromTransactionOptions(options);
  }
 
  @Override

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java

@@ -147,7 +147,11 @@ public Void run(TransactionContext ctx) {
  return null;
  }
  });
+<<<<<<< HEAD
  return runner.getCommitResponse();
+=======
+ return new CommitResponse(runner.getCommitTimestamp());
+>>>>>>> master
  }
 
  @Override
@@ -157,7 +161,11 @@ public Timestamp writeAtLeastOnce(Iterable<Mutation> mutations) throws SpannerEx
 
  @Override
  public CommitResponse writeAtLeastOnceWithOptions(
+<<<<<<< HEAD
  final Iterable<Mutation> mutations, final TransactionOption... options)
+=======
+ Iterable<Mutation> mutations, TransactionOption... transactionOptions)
+>>>>>>> master
  throws SpannerException {
  setActive(null);
  List<com.google.spanner.v1.Mutation> mutationsProto = new ArrayList<>();
@@ -175,7 +183,12 @@ public CommitResponse writeAtLeastOnceWithOptions(
  try (Scope s = tracer.withSpan(span)) {
  com.google.spanner.v1.CommitResponse response =
  spanner.getRpc().commit(request, this.options);
+<<<<<<< HEAD
  return new CommitResponse(response);
+=======
+ Timestamp t = Timestamp.fromProto(response.getCommitTimestamp());
+ return new CommitResponse(t);
+>>>>>>> master
  } catch (IllegalArgumentException e) {
  TraceUtil.setWithFailure(span, e);
  throw newSpannerException(ErrorCode.INTERNAL, "Could not parse commit response", e);
@@ -246,24 +259,44 @@ public ReadOnlyTransaction readOnlyTransaction(TimestampBound bound) {
 
  @Override
  public TransactionRunner readWriteTransaction(TransactionOption... options) {
+<<<<<<< HEAD
  return setActive(new TransactionRunnerImpl(this, Options.fromTransactionOptions(options)));
+=======
+ return setActive(
+ new TransactionRunnerImpl(
+ this, spanner.getRpc(), spanner.getDefaultPrefetchChunks(), options));
+>>>>>>> master
  }
 
  @Override
  public AsyncRunner runAsync(TransactionOption... options) {
  return new AsyncRunnerImpl(
+<<<<<<< HEAD
  setActive(new TransactionRunnerImpl(this, Options.fromTransactionOptions(options))));
+=======
+ setActive(
+ new TransactionRunnerImpl(
+ this, spanner.getRpc(), spanner.getDefaultPrefetchChunks(), options)));
+>>>>>>> master
  }
 
  @Override
  public TransactionManager transactionManager(TransactionOption... options) {
+<<<<<<< HEAD
  return new TransactionManagerImpl(this, currentSpan, Options.fromTransactionOptions(options));
+=======
+ return new TransactionManagerImpl(this, currentSpan, options);
+>>>>>>> master
  }
 
  @Override
  public AsyncTransactionManagerImpl transactionManagerAsync(TransactionOption... options) {
+<<<<<<< HEAD
  return new AsyncTransactionManagerImpl(
  this, currentSpan, Options.fromTransactionOptions(options));
+=======
+ return new AsyncTransactionManagerImpl(this, currentSpan, options);
+>>>>>>> master
  }
 
  @Override

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPool.java

@@ -1394,17 +1394,6 @@ public CommitResponse writeAtLeastOnceWithOptions(
  }
  }
 
- @Override
- public CommitResponse writeAtLeastOnceWithOptions(
- Iterable<Mutation> mutations, TransactionOption... options) throws SpannerException {
- try {
- markUsed();
- return delegate.writeAtLeastOnceWithOptions(mutations, options);
- } catch (SpannerException e) {
- throw lastException = e;
- }
- }
-
  @Override
  public long executePartitionedUpdate(Statement stmt, UpdateOption... options)
  throws SpannerException {

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolAsyncTransactionManager.java

@@ -49,7 +49,7 @@ class SessionPoolAsyncTransactionManager
  private boolean restartedAfterSessionNotFound;
 
  SessionPoolAsyncTransactionManager(
- SessionPool pool, PooledSessionFuture session, final TransactionOption... options) {
+ SessionPool pool, PooledSessionFuture session, TransactionOption... options) {
  this.pool = Preconditions.checkNotNull(pool);
  this.options = options;
  createTransaction(session);

google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionManagerImpl.java

@@ -36,10 +36,10 @@ final class TransactionManagerImpl implements TransactionManager, SessionTransac
  private TransactionRunnerImpl.TransactionContextImpl txn;
  private TransactionState txnState;
 
- TransactionManagerImpl(SessionImpl session, Span span, Options options) {
+ TransactionManagerImpl(SessionImpl session, Span span, TransactionOption... options) {
  this.session = session;
  this.span = span;
- this.options = options;
+ this.options = Options.fromTransactionOptions(options);
  }
 
  Span getSpan() {

google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java

@@ -31,6 +31,7 @@
 import com.google.cloud.spanner.Options.TransactionOption;
 import com.google.cloud.spanner.Options.UpdateOption;
 import com.google.cloud.spanner.SessionImpl.SessionTransaction;
+import com.google.cloud.spanner.spi.v1.SpannerRpc;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
@@ -75,7 +76,8 @@ class TransactionRunnerImpl implements SessionTransaction, TransactionRunner {
  static class TransactionContextImpl extends AbstractReadContext implements TransactionContext {
  static class Builder extends AbstractReadContext.Builder<Builder, TransactionContextImpl> {
  private ByteString transactionId;
- private Options options = Options.fromTransactionOptions();
+ private Options options;
+ private boolean trackTransactionStarter;
 
  private Builder() {}
 
@@ -85,7 +87,12 @@ Builder setTransactionId(ByteString transactionId) {
  }
 
  Builder setOptions(Options options) {
- this.options = options;
+ this.options = Preconditions.checkNotNull(options);
+ return self();
+ }
+
+ Builder setTrackTransactionStarter(boolean trackTransactionStarter) {
+ this.trackTransactionStarter = trackTransactionStarter;
  return self();
  }
 
@@ -176,13 +183,13 @@ public void removeListener(Runnable listener) {
 
  volatile ByteString transactionId;
 
- private final Options options;
  private CommitResponse commitResponse;
 
  private TransactionContextImpl(Builder builder) {
  super(builder);
  this.transactionId = builder.transactionId;
- this.options = Preconditions.checkNotNull(builder.options);
+ this.trackTransactionStarter = builder.trackTransactionStarter;
+ this.options = builder.options;
  this.finishedAsyncOperations.set(null);
  }
 
@@ -808,7 +815,6 @@ public ListenableAsyncResultSet executeQueryAsync(
  private final SessionImpl session;
  private final Options options;
  private Span span;
- private final Options options;
  private TransactionContextImpl txn;
  private volatile boolean isValid = true;
 
@@ -818,10 +824,14 @@ public TransactionRunner allowNestedTransaction() {
  return this;
  }
 
- TransactionRunnerImpl(SessionImpl session, Options options) {
+ TransactionRunnerImpl(
+ SessionImpl session,
+ SpannerRpc rpc,
+ int defaultPrefetchChunks,
+ TransactionOption... options) {
  this.session = session;
- this.options = options;
- this.txn = session.newTransaction(options);
+ this.options = Options.fromTransactionOptions(options);
+ this.txn = session.newTransaction(this.options);
  }
 
  @Override