Merge branch 'main' into set-local-retry-aborts-internally

Author: olavloite

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java

@@ -94,8 +94,8 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -109,7 +109,6 @@
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
@@ -130,9 +129,6 @@ class ConnectionImpl implements Connection {
       "This method may only be called while in autocommit mode";
   private static final String NOT_ALLOWED_IN_AUTOCOMMIT =
       "This method may not be called while in autocommit mode";
-
-  private static final ParsedStatement BEGIN_STATEMENT =
-      AbstractStatementParser.getInstance(Dialect.GOOGLE_STANDARD_SQL).parse(Statement.of("BEGIN"));
   private static final ParsedStatement COMMIT_STATEMENT =
       AbstractStatementParser.getInstance(Dialect.GOOGLE_STANDARD_SQL)
           .parse(Statement.of("COMMIT"));
@@ -145,9 +141,6 @@ class ConnectionImpl implements Connection {
   private static final ParsedStatement START_BATCH_DML_STATEMENT =
       AbstractStatementParser.getInstance(Dialect.GOOGLE_STANDARD_SQL)
           .parse(Statement.of("START BATCH DML"));
-  private static final ParsedStatement RUN_BATCH_STATEMENT =
-      AbstractStatementParser.getInstance(Dialect.GOOGLE_STANDARD_SQL)
-          .parse(Statement.of("RUN BATCH"));
 
   // These SAVEPOINT statements are used as sentinels to recognize the start/rollback/release of a
   // savepoint.
@@ -185,17 +178,6 @@ private LeakedConnectionException() {
   private final ConnectionStatementExecutor connectionStatementExecutor =
       new ConnectionStatementExecutorImpl(this);
 
-  /** Simple thread factory that is used for fire-and-forget rollbacks. */
-  static final class DaemonThreadFactory implements ThreadFactory {
-    @Override
-    public Thread newThread(Runnable r) {
-      Thread t = new Thread(r);
-      t.setName("connection-rollback-executor");
-      t.setDaemon(true);
-      return t;
-    }
-  }
-
   /**
    * Statements are executed using a separate thread in order to be able to cancel these. Statements
    * are automatically cancelled if the configured {@link ConnectionImpl#statementTimeout} is
@@ -507,11 +489,6 @@ UnitOfWorkType getUnitOfWorkType() {
     return unitOfWorkType;
   }
 
-  /** Get the current batch mode of this connection. */
-  BatchMode getBatchMode() {
-    return batchMode;
-  }
-
   /** @return <code>true</code> if this connection is in a batch. */
   boolean isInBatch() {
     return batchMode != BatchMode.NONE;
@@ -900,7 +877,7 @@ public byte[] getProtoDescriptors() {
               String.format(
                   "File %s is not a valid proto descriptors file", this.protoDescriptorsFilePath));
         }
-        InputStream pdStream = new FileInputStream(protoDescriptorsFile);
+        InputStream pdStream = Files.newInputStream(protoDescriptorsFile.toPath());
         this.protoDescriptors = ByteArray.copyFrom(pdStream).toByteArray();
       } catch (Exception exception) {
         throw SpannerExceptionFactory.newSpannerException(exception);
@@ -1424,7 +1401,7 @@ public ResultSet executeQuery(Statement query, QueryOption... options) {
 
   @Override
   public AsyncResultSet executeQueryAsync(Statement query, QueryOption... options) {
-    return parseAndExecuteQueryAsync(CallType.ASYNC, query, AnalyzeMode.NONE, options);
+    return parseAndExecuteQueryAsync(query, options);
   }
 
   @Override
@@ -1624,8 +1601,7 @@ private ResultSet parseAndExecuteQuery(
             + parsedStatement.getSqlWithoutComments());
   }
 
-  private AsyncResultSet parseAndExecuteQueryAsync(
-      CallType callType, Statement query, AnalyzeMode analyzeMode, QueryOption... options) {
+  private AsyncResultSet parseAndExecuteQueryAsync(Statement query, QueryOption... options) {
     Preconditions.checkNotNull(query);
     ConnectionPreconditions.checkState(!isClosed(), CLOSED_ERROR_MSG);
     ParsedStatement parsedStatement = getStatementParser().parse(query, buildQueryOptions());
@@ -1640,7 +1616,8 @@ private AsyncResultSet parseAndExecuteQueryAsync(
               spanner.getAsyncExecutorProvider(),
               options);
         case QUERY:
-          return internalExecuteQueryAsync(callType, parsedStatement, analyzeMode, options);
+          return internalExecuteQueryAsync(
+              CallType.ASYNC, parsedStatement, AnalyzeMode.NONE, options);
         case UPDATE:
           if (parsedStatement.hasReturningClause()) {
             // Cannot execute DML statement with returning clause in read-only mode or in
@@ -1653,7 +1630,8 @@ private AsyncResultSet parseAndExecuteQueryAsync(
                   "DML statement with returning clause cannot be executed in read-only mode: "
                       + parsedStatement.getSqlWithoutComments());
             }
-            return internalExecuteQueryAsync(callType, parsedStatement, analyzeMode, options);
+            return internalExecuteQueryAsync(
+                CallType.ASYNC, parsedStatement, AnalyzeMode.NONE, options);
           }
         case DDL:
         case UNKNOWN: