pyvastbase 0.2.2__tar.gz → 0.2.5__tar.gz

{pyvastbase-0.2.2 → pyvastbase-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyvastbase
-Version: 0.2.2
+Version: 0.2.5
 Summary: Python SDK for Vastbase V3 (PyMilvus-style API)
 Author-email: "zhangzhijie(字节)" <zhangzj@vastdata.com.cn>
 License-Expression: MIT
@@ -21,6 +21,8 @@ Requires-Dist: pytest-cov>=4.1.0; extra == "dev"
 Requires-Dist: black>=23.0.0; extra == "dev"
 Requires-Dist: isort>=5.12.0; extra == "dev"
 Requires-Dist: mypy>=1.5.0; extra == "dev"
+Provides-Extra: pool
+Requires-Dist: psycopg-pool>=3.2; extra == "pool"
 Provides-Extra: async
 Requires-Dist: psycopg_pool>=3.2; extra == "async"
 Provides-Extra: all
@@ -30,7 +32,7 @@ Requires-Dist: pytest-cov>=4.1.0; extra == "all"
 Requires-Dist: black>=23.0.0; extra == "all"
 Requires-Dist: isort>=5.12.0; extra == "all"
 Requires-Dist: mypy>=1.5.0; extra == "all"
-Requires-Dist: psycopg_pool>=3.2; extra == "all"
+Requires-Dist: psycopg-pool>=3.2; extra == "all"
 
 # pyvastbase
 

{pyvastbase-0.2.2 → pyvastbase-0.2.5}/__init__.py

@@ -38,7 +38,7 @@ Example:
     ... )
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.5"
 __author__ = "pyvastbase contributors"
 
 # Core imports

{pyvastbase-0.2.2 → pyvastbase-0.2.5}/core/connections.py

@@ -383,17 +383,77 @@ class VastbaseConnection:
             }
 
     def close(self) -> None:
-        """Close connection"""
+        """Close connection and pool.
+
+        Gracefully closes the pool first; if that fails (e.g. during
+        interpreter shutdown when worker threads are already dead),
+        force-closes individual TCP connections so the server releases them.
+        """
         if self._pool:
-            self._pool.close()
+            try:
+                self._pool.close()
+            except Exception:
+                self._force_close_pool_connections()
+            # Neutralize ConnectionPool.__del__ so it won't try to join
+            # dead threads during GC, which would print the
+            # "RuntimeError: cannot join current thread" warning.
+            self._suppress_pool_del()
             self._pool = None
 
         if self._connection:
-            self._connection.close()
+            try:
+                self._connection.close()
+            except Exception:
+                pass
             self._connection = None
 
         self._connected = False
 
+    def _suppress_pool_del(self) -> None:
+        """Prevent ConnectionPool.__del__ from firing after cleanup.
+
+        Swaps the pool instance's class to a subclass with a no-op __del__,
+        so GC won't try to gather dead worker threads.
+        """
+        pool = self._pool
+        if pool is None:
+            return
+        try:
+            base = type(pool)
+            if base.__del__ is not object.__del__:  # has custom __del__
+                pool.__class__ = type(base.__name__, (base,), {'__del__': lambda self: None})
+        except Exception:
+            pass
+
+    def _force_close_pool_connections(self) -> None:
+        """Force-close individual pool connections when pool.close() fails.
+
+        Accesses psycopg_pool internals as a last resort during shutdown.
+        """
+        pool = self._pool
+        if pool is None:
+            return
+        # Mark pool as closed to prevent further getconn()
+        try:
+            pool._closed = True
+        except Exception:
+            pass
+        # Drain and close connections from internal deque
+        for attr in ("_pool", "_nconn", "_connections"):
+            bucket = getattr(pool, attr, None)
+            if bucket is None:
+                continue
+            items = list(bucket) if hasattr(bucket, "__iter__") else []
+            for conn in items:
+                try:
+                    conn.close()
+                except Exception:
+                    pass
+            try:
+                bucket.clear()
+            except Exception:
+                pass
+
     def __enter__(self) -> 'VastbaseConnection':
         """Context manager entry"""
         if not self._connected:

{pyvastbase-0.2.2 → pyvastbase-0.2.5}/pyproject.toml

@@ -35,6 +35,9 @@ dev = [
     "isort>=5.12.0",
     "mypy>=1.5.0",
 ]
+pool = [
+    "psycopg-pool>=3.2",
+]
 async = [
     "psycopg_pool>=3.2",
 ]
@@ -45,7 +48,7 @@ all = [
     "black>=23.0.0",
     "isort>=5.12.0",
     "mypy>=1.5.0",
-    "psycopg_pool>=3.2",
+    "psycopg-pool>=3.2",
 ]
 
 [tool.setuptools]