SNOW-1524152: Rename option for implicit server side query timeout (#…

…2040)
snowflakedb · Jan 21, 2025 · 9aaaa10 · 9aaaa10
1 parent f2ec619
commit 9aaaa10
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/net/snowflake/client/core/SFBaseSession.java b/src/main/java/net/snowflake/client/core/SFBaseSession.java
@@ -146,7 +146,7 @@ public abstract class SFBaseSession {
 
   private boolean isJdbcArrowTreatDecimalAsInt = true;
 
-  private boolean supportImplicitAsyncQueryTimeout = false;
+  private boolean implicitServerSideQueryTimeout = false;
 
   private boolean clearBatchOnlyAfterSuccessfulExecution = false;
 
@@ -1337,12 +1337,12 @@ public boolean getEnableReturnTimestampWithTimeZone() {
     return enableReturnTimestampWithTimeZone;
   }
 
-  boolean getSupportImplicitAsyncQueryTimeout() {
-    return supportImplicitAsyncQueryTimeout;
+  boolean getImplicitServerSideQueryTimeout() {
+    return implicitServerSideQueryTimeout;
   }
 
-  void setSupportImplicitAsyncQueryTimeout(boolean supportImplicitAsyncQueryTimeout) {
-    this.supportImplicitAsyncQueryTimeout = supportImplicitAsyncQueryTimeout;
+  void setImplicitServerSideQueryTimeout(boolean value) {
+    this.implicitServerSideQueryTimeout = value;
   }
 
   void setClearBatchOnlyAfterSuccessfulExecution(boolean value) {

diff --git a/src/main/java/net/snowflake/client/core/SFBaseStatement.java b/src/main/java/net/snowflake/client/core/SFBaseStatement.java
@@ -42,7 +42,7 @@ public void addProperty(String propertyName, Object propertyValue) throws SFExce
     if ("query_timeout".equalsIgnoreCase(propertyName)) {
       // Client side implementation
       queryTimeout = (Integer) propertyValue;
-      if (this.getSFBaseSession().getSupportImplicitAsyncQueryTimeout()) {
+      if (this.getSFBaseSession().getImplicitServerSideQueryTimeout()) {
         // Set server parameter for supporting query timeout on async queries
         statementParametersMap.put("STATEMENT_TIMEOUT_IN_SECONDS", (Integer) propertyValue);
       }

diff --git a/src/main/java/net/snowflake/client/core/SFSession.java b/src/main/java/net/snowflake/client/core/SFSession.java
@@ -551,9 +551,9 @@ public void addSFSessionProperty(String propertyName, Object propertyValue) thro
           }
           break;
 
-        case SUPPORT_IMPLICIT_ASYNC_QUERY_TIMEOUT:
+        case IMPLICIT_SERVER_SIDE_QUERY_TIMEOUT:
           if (propertyValue != null) {
-            setSupportImplicitAsyncQueryTimeout(getBooleanValue(propertyValue));
+            setImplicitServerSideQueryTimeout(getBooleanValue(propertyValue));
           }
           break;
 

diff --git a/src/main/java/net/snowflake/client/core/SFSessionProperty.java b/src/main/java/net/snowflake/client/core/SFSessionProperty.java
@@ -125,8 +125,7 @@ public enum SFSessionProperty {
   JAVA_LOGGING_CONSOLE_STD_OUT_THRESHOLD(
       "JAVA_LOGGING_CONSOLE_STD_OUT_THRESHOLD", false, String.class),
 
-  SUPPORT_IMPLICIT_ASYNC_QUERY_TIMEOUT(
-      "SUPPORT_IMPLICIT_ASYNC_QUERY_TIMEOUT", false, Boolean.class),
+  IMPLICIT_SERVER_SIDE_QUERY_TIMEOUT("IMPLICIT_SERVER_SIDE_QUERY_TIMEOUT", false, Boolean.class),
 
   CLEAR_BATCH_ONLY_AFTER_SUCCESSFUL_EXECUTION(
       "CLEAR_BATCH_ONLY_AFTER_SUCCESSFUL_EXECUTION", false, Boolean.class);

diff --git a/src/test/java/net/snowflake/client/jdbc/StatementLatestIT.java b/src/test/java/net/snowflake/client/jdbc/StatementLatestIT.java
@@ -310,7 +310,7 @@ public void testQueryIdIsSetOnFailedExecuteQuery() throws SQLException {
   @Test
   public void testSetQueryTimeoutForAsyncQueryUsingConnectionProperty() throws SQLException {
     Properties p = new Properties();
-    p.put("SUPPORT_IMPLICIT_ASYNC_QUERY_TIMEOUT", true);
+    p.put("IMPLICIT_SERVER_SIDE_QUERY_TIMEOUT", true);
     try (Connection con = getConnection(p);
         Statement statement = con.createStatement()) {
       statement.setQueryTimeout(3);
@@ -334,15 +334,15 @@ public void testSetQueryTimeoutForAsyncQueryUsingConnectionProperty() throws SQL
   }
 
   /**
-   * Test for setting query timeout on regular queries with the SUPPORT_IMPLICIT_ASYNC_QUERY_TIMEOUT
+   * Test for setting query timeout on regular queries with the IMPLICIT_SERVER_SIDE_QUERY_TIMEOUT
    * property set to true. Applicable to versions after 3.21.0.
    *
    * @throws SQLException if there is an error when executing
    */
   @Test
   public void testSetQueryTimeoutWhenAsyncConnectionPropertySet() throws SQLException {
     Properties p = new Properties();
-    p.put("SUPPORT_IMPLICIT_ASYNC_QUERY_TIMEOUT", true);
+    p.put("IMPLICIT_SERVER_SIDE_QUERY_TIMEOUT", true);
     try (Connection con = getConnection(p);
         Statement statement = con.createStatement()) {
       statement.setQueryTimeout(3);