address comments

Author: sfc-gh-bli

src/main/java/net/snowflake/client/core/QueryExecDTO.java

@@ -55,6 +55,7 @@ public QueryExecDTO(
         asyncExec);
   }
 
+  @SnowflakeJdbcInternalApi
   public QueryExecDTO(
       String sqlText,
       String dataframeAst,
@@ -88,10 +89,12 @@ public void setSqlText(String sqlText) {
     this.sqlText = sqlText;
   }
 
+  @SnowflakeJdbcInternalApi
   public String getDataframeAst() {
     return this.dataframeAst;
   }
 
+  @SnowflakeJdbcInternalApi
   public void setDataframeAst(String dataframeAst) {
     this.dataframeAst = dataframeAst;
   }

src/main/java/net/snowflake/client/core/SFBaseStatement.java

@@ -92,14 +92,14 @@ public abstract SFBaseResultSet execute(
    * @throws SFException exception raised from Snowflake components
    * @throws SQLException if SQL error occurs
    */
+  @SnowflakeJdbcInternalApi
   public SFBaseResultSet execute(
       String sql,
       String dataframeAst,
       Map<String, ParameterBindingDTO> parametersBinding,
       CallingMethod caller,
       ExecTimeTelemetryData execTimeData)
       throws SQLException, SFException {
-    // only used internally, not a public API
     throw new UnsupportedOperationException();
   }
 

src/main/java/net/snowflake/client/core/SFStatement.java

@@ -357,6 +357,7 @@ public Object executeHelper(
    * @throws SFException if query is canceled
    * @throws SnowflakeSQLException if query is already running
    */
+  @SnowflakeJdbcInternalApi
   public Object executeHelper(
       String sql,
       String dataframeAst,
@@ -736,6 +737,8 @@ public SFBaseResultSet execute(
     return execute(sql, false, parametersBinding, caller, execTimeData);
   }
 
+
+  @SnowflakeJdbcInternalApi
   @Override
   public SFBaseResultSet execute(
       String sql,
@@ -826,6 +829,7 @@ public SFBaseResultSet execute(
    * @throws SFException exception raised from Snowflake components
    * @throws SQLException if SQL error occurs
    */
+  @SnowflakeJdbcInternalApi
   public SFBaseResultSet execute(
       String sql,
       String dataframeAst,
@@ -1032,6 +1036,6 @@ public SFBaseResultSet asyncExecute(
       CallingMethod caller,
       ExecTimeTelemetryData execTimeData)
       throws SQLException, SFException {
-    return execute(sql, null, true, parametersBinding, caller, execTimeData);
+    return execute(sql, true, parametersBinding, caller, execTimeData);
   }
 }

src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java

@@ -1318,7 +1318,6 @@ private static JsonNode parseCommandInGS(SFStatement statement, String command)
       result =
           statement.executeHelper(
               command,
-              null,
               "application/json",
               null, // bindValues
               false, // describeOnly

src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatementV1.java

@@ -164,7 +164,7 @@ public ResultSet executeQuery() throws SQLException {
     } else {
       logger.trace("executeQuery()", false);
     }
-    ResultSet rs = executeQueryInternal(sql, null, false, parameterBindings, execTimeData);
+    ResultSet rs = executeQueryInternal(sql, false, parameterBindings, execTimeData);
     execTimeData.setQueryEnd();
     execTimeData.generateTelemetry();
     logger.debug("Query completed. {}", execTimeData.getLogString());
@@ -186,7 +186,7 @@ public ResultSet executeAsyncQuery() throws SQLException {
     } else {
       logger.trace("executeAsyncQuery()", false);
     }
-    ResultSet rs = executeQueryInternal(sql, null, true, parameterBindings, execTimeData);
+    ResultSet rs = executeQueryInternal(sql, true, parameterBindings, execTimeData);
     execTimeData.setQueryEnd();
     execTimeData.generateTelemetry();
     logger.debug("Query completed. {}", execTimeData.getLogString());

src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java

@@ -16,15 +16,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import net.snowflake.client.core.CancellationReason;
-import net.snowflake.client.core.ExecTimeTelemetryData;
-import net.snowflake.client.core.ParameterBindingDTO;
-import net.snowflake.client.core.ResultUtil;
-import net.snowflake.client.core.SFBaseResultSet;
-import net.snowflake.client.core.SFBaseStatement;
-import net.snowflake.client.core.SFException;
-import net.snowflake.client.core.SFStatement;
-import net.snowflake.client.core.StmtUtil;
+
+import net.snowflake.client.core.*;
 import net.snowflake.client.log.SFLogger;
 import net.snowflake.client.log.SFLoggerFactory;
 import net.snowflake.client.util.VariableTypeArray;
@@ -146,7 +139,7 @@ public ResultSet executeQuery(String sql) throws SQLException {
         new ExecTimeTelemetryData("ResultSet Statement.executeQuery(String)", this.batchID);
 
     raiseSQLExceptionIfStatementIsClosed();
-    ResultSet rs = executeQueryInternal(sql, null, false, null, execTimeData);
+    ResultSet rs = executeQueryInternal(sql, false, null, execTimeData);
     execTimeData.setQueryEnd();
     execTimeData.generateTelemetry();
     logger.debug("Query completed. {}", execTimeData.getLogString());
@@ -164,7 +157,7 @@ public ResultSet executeAsyncQuery(String sql) throws SQLException {
     ExecTimeTelemetryData execTimeData =
         new ExecTimeTelemetryData("ResultSet Statement.executeAsyncQuery(String)", this.batchID);
     raiseSQLExceptionIfStatementIsClosed();
-    ResultSet rs = executeQueryInternal(sql, null, true, null, execTimeData);
+    ResultSet rs = executeQueryInternal(sql, true, null, execTimeData);
     execTimeData.setQueryEnd();
     execTimeData.generateTelemetry();
     logger.debug("Query completed. {}", queryID, execTimeData.getLogString());
@@ -178,6 +171,7 @@ public ResultSet executeAsyncQuery(String sql) throws SQLException {
    * @return ResultSet
    * @throws SQLException if @link{#executeQueryInternal(String, Map)} throws an exception
    */
+  @SnowflakeJdbcInternalApi
   public ResultSet executeDataframeAst(String dataframeAst) throws SQLException {
     ExecTimeTelemetryData execTimeData =
         new ExecTimeTelemetryData("ResultSet Statement.executeQuery(String)", this.batchID);
@@ -281,6 +275,23 @@ private void setQueryIdWhenValidOrNull(String queryId) {
       this.queryID = null;
     }
   }
+  /**
+   * Internal method for executing a query with bindings accepted.
+   *
+   * @param sql sql statement
+   * @param asyncExec execute query asynchronously
+   * @param parameterBindings parameters bindings
+   * @return query result set
+   * @throws SQLException if @link{SFStatement.execute(String)} throws exception
+   */
+  ResultSet executeQueryInternal(
+          String sql,
+          boolean asyncExec,
+          Map<String, ParameterBindingDTO> parameterBindings,
+          ExecTimeTelemetryData execTimeData)
+          throws SQLException {
+    return executeQueryInternal(sql,null, asyncExec, parameterBindings, execTimeData);
+  }
 
   /**
    * Internal method for executing a query with bindings accepted.
@@ -292,6 +303,7 @@ private void setQueryIdWhenValidOrNull(String queryId) {
    * @return query result set
    * @throws SQLException if @link{SFStatement.execute(String)} throws exception
    */
+  @SnowflakeJdbcInternalApi
   ResultSet executeQueryInternal(
       String sql,
       String dataframeAst,