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
3 changes: 3 additions & 0 deletions tests/development_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ def start_development_server(port=None, trino_version=TRINO_VERSION):
# Wait for logs indicating the service has started
wait_for_logs(trino, "SERVER STARTED", timeout=60)

if (wrapped := trino.get_wrapped_container()) and (image := wrapped.image):
print(f"Trino image tags: {image.tags}, digest: {image.id}")

# Otherwise some tests fail with No nodes available
time.sleep(2)

Expand Down
27 changes: 19 additions & 8 deletions tests/integration/test_dbapi_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -1306,22 +1306,24 @@ def test_select_query_stats(trino_connection):
completed_splits = cur.stats["completedSplits"]
cpu_time_millis = cur.stats["cpuTimeMillis"]
processed_bytes = cur.stats["processedBytes"]
processed_rows = cur.stats["processedRows"]
wall_time_millis = cur.stats["wallTimeMillis"]

while cur.fetchone() is not None:
assert query_id == cur.stats["queryId"]
assert completed_splits <= cur.stats["completedSplits"]
assert cpu_time_millis <= cur.stats["cpuTimeMillis"]
assert processed_bytes <= cur.stats["processedBytes"]
assert processed_rows <= cur.stats["processedRows"]
assert wall_time_millis <= cur.stats["wallTimeMillis"]
# No similar assertion for "processedRows" as it may decrease across responses.
# For example, when multiple Trino workers execute a LIMIT query, tasks for some workers
# may be cancelled once the row count reaches the limit, which can cause processedRows.
# to decrease in a subsequent response (it's an aggregation over active tasks).
assert "processedRows" in cur.stats

query_id = cur.stats["queryId"]
completed_splits = cur.stats["completedSplits"]
cpu_time_millis = cur.stats["cpuTimeMillis"]
processed_bytes = cur.stats["processedBytes"]
processed_rows = cur.stats["processedRows"]
wall_time_millis = cur.stats["wallTimeMillis"]


Expand Down Expand Up @@ -1533,11 +1535,20 @@ def retrieve_client_tags_from_query(run_trino, client_tags):
cur.fetchall()

api_url = "http://" + trino_connection.host + ":" + str(trino_connection.port)
query_info = requests.post(api_url + "/ui/login", data={
"username": "admin",
"password": "",
"redirectPath": api_url + '/ui/api/query/' + cur._query.query_id
}).json()

if trino_version() >= 483:
session = requests.Session()
resp = session.post(api_url + "/ui/auth/login", json={
"username": "admin", "password": ""
})
assert resp.ok, f"POST request to /ui/auth/login failed: {resp.status_code} {resp.reason}"
query_info = session.get(api_url + "/ui/api/query/" + cur._query.query_id).json()
else:
query_info = requests.post(api_url + "/ui/login", data={
"username": "admin",
"password": "",
"redirectPath": api_url + '/ui/api/query/' + cur._query.query_id
}).json()

query_client_tags = query_info['session']['clientTags']
return query_client_tags
Expand Down
Loading