Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ jobs:
- name: Allure Report
uses: firebolt-db/action-allure-report@v1
if: always()
continue-on-error: true
with:
github-key: ${{ secrets.GITHUB_TOKEN }}

- name: Upload coverage report
uses: actions/upload-artifact@v2
continue-on-error: true
with:
name: pytest-coverage-report
path: coverage.xml
Expand Down
5 changes: 3 additions & 2 deletions src/firebolt/async_db/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import socket
from json import JSONDecodeError
from types import TracebackType
from typing import Any, Dict, List, Optional
from typing import Any, Dict, Iterable, List, Optional

from httpcore.backends.auto import AutoBackend
from httpcore.backends.base import AsyncNetworkStream
from httpcore.backends.base import SOCKET_OPTION, AsyncNetworkStream
from httpx import AsyncHTTPTransport, HTTPStatusError, RequestError, Timeout

from firebolt.async_db.cursor import Cursor
Expand Down Expand Up @@ -140,6 +140,7 @@ async def connect_tcp(
port: int,
timeout: Optional[float] = None,
local_address: Optional[str] = None,
socket_options: Optional[Iterable[SOCKET_OPTION]] = None,
) -> AsyncNetworkStream:
stream = await super().connect_tcp(
host, port, timeout=timeout, local_address=local_address
Expand Down
11 changes: 8 additions & 3 deletions src/firebolt/db/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import socket
from json import JSONDecodeError
from types import TracebackType
from typing import Any, Dict, List, Optional
from typing import Any, Dict, Iterable, List, Optional
from warnings import warn

from httpcore.backends.base import NetworkStream
from httpcore.backends.base import SOCKET_OPTION, NetworkStream
from httpcore.backends.sync import SyncBackend
from httpx import HTTPStatusError, HTTPTransport, RequestError, Timeout
from readerwriterlock.rwlock import RWLockWrite
Expand Down Expand Up @@ -131,9 +131,14 @@ def connect_tcp(
port: int,
timeout: Optional[float] = None,
local_address: Optional[str] = None,
socket_options: Optional[Iterable[SOCKET_OPTION]] = None,
) -> NetworkStream:
stream = super().connect_tcp(
host, port, timeout=timeout, local_address=local_address
host,
port,
timeout=timeout,
local_address=local_address,
socket_options=socket_options,
)
# Enable keepalive
stream.get_extra_info("socket").setsockopt(
Expand Down