changed references after rebase on master

googleapis · Apr 12, 2019 · bab1cca · bab1cca
1 parent 2e7ec9d
commit bab1cca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/...oogle-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDMLTransaction.java b/...oogle-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDMLTransaction.java
@@ -18,8 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
-import com.google.cloud.spanner.SpannerImpl.SessionImpl;
-import com.google.cloud.spanner.SpannerImpl.SessionTransaction;
+import com.google.cloud.spanner.SessionImpl.SessionTransaction;
 import com.google.cloud.spanner.spi.v1.SpannerRpc;
 import com.google.protobuf.ByteString;
 import com.google.spanner.v1.BeginTransactionRequest;

diff --git a/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java b/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
@@ -23,8 +23,7 @@
 import com.google.cloud.spanner.AbstractReadContext.MultiUseReadOnlyTransaction;
 import com.google.cloud.spanner.AbstractReadContext.SingleReadContext;
 import com.google.cloud.spanner.AbstractReadContext.SingleUseReadOnlyTransaction;
-import com.google.cloud.spanner.SpannerImpl.PartitionedDMLTransaction;
-import com.google.cloud.spanner.SpannerImpl.TransactionContextImpl;
+import com.google.cloud.spanner.TransactionRunnerImpl.TransactionContextImpl;
 import com.google.cloud.spanner.spi.v1.SpannerRpc;
 import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
@@ -196,8 +195,7 @@ public ReadOnlyTransaction readOnlyTransaction(TimestampBound bound) {
   @Override
   public TransactionRunner readWriteTransaction() {
     return setActive(
-        new SpannerImpl.TransactionRunnerImpl(
-            this, spanner.getRpc(), spanner.getDefaultPrefetchChunks()));
+        new TransactionRunnerImpl(this, spanner.getRpc(), spanner.getDefaultPrefetchChunks()));
   }
 
   @Override

diff --git a/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
@@ -28,13 +28,6 @@
 import com.google.cloud.BaseService;
 import com.google.cloud.PageImpl;
 import com.google.cloud.PageImpl.NextPageFetcher;
-import com.google.cloud.Timestamp;
-import com.google.cloud.spanner.AbstractReadContext.MultiUseReadOnlyTransaction;
-import com.google.cloud.spanner.AbstractReadContext.SingleReadContext;
-import com.google.cloud.spanner.AbstractReadContext.SingleUseReadOnlyTransaction;
-import com.google.cloud.spanner.TransactionRunnerImpl.TransactionContextImpl;
-import com.google.cloud.spanner.Options.ListOption;
-import com.google.cloud.spanner.SessionImpl.SessionTransaction;
 import com.google.cloud.spanner.spi.v1.SpannerRpc;
 import com.google.cloud.spanner.spi.v1.SpannerRpc.Paginated;
 import com.google.common.base.Preconditions;
@@ -44,14 +37,8 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.protobuf.Any;
-import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
-import com.google.spanner.v1.BeginTransactionRequest;
-import com.google.spanner.v1.CommitRequest;
-import com.google.spanner.v1.CommitResponse;
-import com.google.spanner.v1.Transaction;
-import com.google.spanner.v1.TransactionOptions;
 import io.grpc.Context;
 import io.opencensus.common.Scope;
 import io.opencensus.trace.AttributeValue;

diff --git a/...ts/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/...ts/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
@@ -23,8 +23,7 @@
 
 import com.google.api.client.util.BackOff;
 import com.google.cloud.Timestamp;
-import com.google.cloud.spanner.SpannerImpl.SessionImpl;
-import com.google.cloud.spanner.SpannerImpl.SessionTransaction;
+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.collect.ImmutableMap;
@@ -322,7 +321,7 @@ public TransactionRunner allowNestedTransaction() {
   public <T> T run(TransactionCallable<T> callable) {
     try (Scope s = tracer.withSpan(span)) {
       if (blockNestedTxn) {
-        SpannerImpl.hasPendingTransaction.set(Boolean.TRUE);
+        SessionImpl.hasPendingTransaction.set(Boolean.TRUE);
       }
 
       return runInternal(callable);
@@ -333,7 +332,7 @@ public <T> T run(TransactionCallable<T> callable) {
       // Remove threadLocal rather than set to FALSE to avoid a possible memory leak.
       // We also do this unconditionally in case a user has modified the flag when the transaction
       // was running.
-      SpannerImpl.hasPendingTransaction.remove();
+      SessionImpl.hasPendingTransaction.remove();
     }
   }