Merging changes from v3.7.1 release (#488)

* Increased the number of retry attempts allowed  (#486)

Updated the number of attempts allowed

* bump version to 3.7.1 (#487)

bumped up version

* Refractore

* Minor change

Signed-off-by: varun-edachali-dbx <[email protected]>

Author: jprakash-db

CHANGELOG.md

@@ -5,6 +5,10 @@
 - Split the connector into two separate packages: `databricks-sql-connector` and `databricks-sqlalchemy`. The `databricks-sql-connector` package contains the core functionality of the connector, while the `databricks-sqlalchemy` package contains the SQLAlchemy dialect for the connector. 
 - Pyarrow dependency is now optional in `databricks-sql-connector`. Users needing arrow are supposed to explicitly install pyarrow
 
+# 3.7.1 (2025-01-07)
+
+- Relaxed the number of Http retry attempts (databricks/databricks-sql-python#486 by @jprakash-db)
+
 # 3.7.0 (2024-12-23)
 
 - Fix: Incorrect number of rows fetched in inline results when fetching results with FETCH_NEXT orientation (databricks/databricks-sql-python#479 by @jprakash-db)

src/databricks/sql/backend/thrift_backend.py

@@ -68,7 +68,7 @@
 # - 900s attempts-duration lines up w ODBC/JDBC drivers (for cluster startup > 10 mins)
 _retry_policy = {  # (type, default, min, max)
     "_retry_delay_min": (float, 1, 0.1, 60),
-    "_retry_delay_max": (float, 60, 5, 3600),
+    "_retry_delay_max": (float, 30, 5, 3600),
     "_retry_stop_after_attempts_count": (int, 30, 1, 60),
     "_retry_stop_after_attempts_duration": (float, 900, 1, 86400),
     "_retry_delay_default": (float, 5, 1, 60),

tests/unit/test_arrow_queue.py

@@ -1,11 +1,13 @@
 import unittest
 import pytest
+
 try:
     import pyarrow as pa
 except ImportError:
     pa = None
 from databricks.sql.utils import ArrowQueue
 
+
 @pytest.mark.skipif(pa is None, reason="PyArrow is not installed")
 class ArrowQueueSuite(unittest.TestCase):
     @staticmethod

tests/unit/test_cloud_fetch_queue.py

@@ -10,6 +10,7 @@
 import databricks.sql.utils as utils
 from databricks.sql.types import SSLOptions
 
+
 @pytest.mark.skipif(pyarrow is None, reason="PyArrow is not installed")
 class CloudFetchQueueSuite(unittest.TestCase):
     def create_result_link(

tests/unit/test_fetches.py

@@ -5,13 +5,14 @@
 try:
     import pyarrow as pa
 except ImportError:
-    pa=None
+    pa = None
 
 import databricks.sql.client as client
 from databricks.sql.utils import ExecuteResponse, ArrowQueue
 from databricks.sql.backend.thrift_backend import ThriftDatabricksClient
 from databricks.sql.result_set import ThriftResultSet
 
+
 @pytest.mark.skipif(pa is None, reason="PyArrow is not installed")
 class FetchTests(unittest.TestCase):
     """

tests/unit/test_fetches_bench.py

@@ -1,16 +1,18 @@
 import unittest
 from unittest.mock import Mock
+
 try:
     import pyarrow as pa
 except ImportError:
-    pa=None
+    pa = None
 import uuid
 import time
 import pytest
 
 import databricks.sql.client as client
 from databricks.sql.utils import ExecuteResponse, ArrowQueue
 
+
 @pytest.mark.skipif(pa is None, reason="PyArrow is not installed")
 class FetchBenchmarkTests(unittest.TestCase):
     """

tests/unit/test_thrift_backend.py

@@ -6,10 +6,11 @@
 from unittest.mock import patch, MagicMock, Mock
 from ssl import CERT_NONE, CERT_REQUIRED
 from urllib3 import HTTPSConnectionPool
+
 try:
     import pyarrow
 except ImportError:
-    pyarrow=None
+    pyarrow = None
 import databricks.sql
 from databricks.sql import utils
 from databricks.sql.types import SSLOptions
@@ -29,7 +30,8 @@ def retry_policy_factory():
         "_retry_delay_default": (float, 5, 1, 60),
     }
 
-@pytest.mark.skipif(pyarrow is None,reason="PyArrow is not installed")
+
+@pytest.mark.skipif(pyarrow is None, reason="PyArrow is not installed")
 class ThriftBackendTestSuite(unittest.TestCase):
     okay_status = ttypes.TStatus(statusCode=ttypes.TStatusCode.SUCCESS_STATUS)