Skip to content

fix(presto-clp): Fix Presto S3 queries returning zero rows by updating worker image and correcting S3 endpoint URL format (fixes #2107, fixes #2108). #2109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junhaoliao merged 7 commits into from
Mar 23, 2026
Merged

fix(presto-clp): Fix Presto S3 queries returning zero rows by updating worker image and correcting S3 endpoint URL format (fixes #2107, fixes #2108). #2109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
31647b4
fix(presto-clp): Fix Presto S3 queries returning zero rows by updatin…
junhaoliao Mar 19, 2026
6d2eae4
fix(presto-clp): Remove unused bucket_name parameter from S3 endpoint…
junhaoliao Mar 19, 2026
d28a6bc
lint
junhaoliao Mar 19, 2026
fecb6d3
fix(presto-clp): Update YAML formatting for worker image definition i…
junhaoliao Mar 19, 2026
b046bcd
Merge branch 'main' into presto-s3
junhaoliao Mar 19, 2026
6336aa2
Merge branch 'main' into presto-s3
junhaoliao Mar 20, 2026
2bd171a
Merge branch 'main' into presto-s3
junhaoliao Mar 20, 2026
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: 2 additions & 1 deletion tools/deployment/presto-clp/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ services:
retries: 30

presto-worker:
image: "ghcr.io/y-scope/presto/prestissimo-worker:${CLP_PRESTO_WORKER_IMAGE_TAG:-clp-v0.10.0}"
image: >-
ghcr.io/y-scope/presto/prestissimo-worker:${CLP_PRESTO_WORKER_IMAGE_TAG:-clp-v0.10.0-fix.1}
depends_on:
presto-coordinator:
condition: "service_healthy"
Expand Down
11 changes: 4 additions & 7 deletions tools/deployment/presto-clp/scripts/init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ def _add_clp_s3_env_vars(

s3_endpoint_url = _get_config_value(clp_config, f"{s3_config_key}.endpoint_url")
s3_region_code = _get_config_value(clp_config, f"{s3_config_key}.region_code")
s3_end_point = _resolve_s3_endpoint_url(s3_endpoint_url, s3_region_code, s3_bucket)
s3_end_point = _resolve_s3_endpoint_url(s3_endpoint_url, s3_region_code)

env_vars["PRESTO_WORKER_CLPPROPERTIES_S3_AUTH_PROVIDER"] = "clp_package"
env_vars["PRESTO_WORKER_CLPPROPERTIES_S3_ACCESS_KEY_ID"] = s3_access_key_id
Expand All @@ -297,23 +297,20 @@ def _add_clp_s3_env_vars(
return True


def _resolve_s3_endpoint_url(
endpoint_url: str | None, region_code: str | None, bucket_name: str
) -> str:
def _resolve_s3_endpoint_url(endpoint_url: str | None, region_code: str | None) -> str:
"""
Returns the resolved S3 endpoint URL, or constructs an AWS S3 URL if not provided.

:param endpoint_url: Custom S3 endpoint URL.
:param region_code: AWS region code.
:param bucket_name:
:return: The S3 endpoint URL.
"""
if endpoint_url is not None:
return endpoint_url.rstrip("/")

if region_code is None:
return f"https://{bucket_name}.s3.{AWS_S3_DOMAIN}"
return f"https://{bucket_name}.s3.{region_code}.{AWS_S3_DOMAIN}"
return f"https://s3.{AWS_S3_DOMAIN}"
return f"https://s3.{region_code}.{AWS_S3_DOMAIN}"


def _add_memory_env_vars(env_vars: dict[str, str]) -> bool:
Expand Down
Loading