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: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ LakeBench supports multiple lakehouse compute engines. Each benchmark scenario d
| DuckDB | ✅ | ✅ | ✅ | ✅ |
| Polars | ✅ | ⚠️ | ⚠️ | 🔜 |
| Daft | ✅ | ⚠️ | ⚠️ | 🔜 |
| Sail | ✅ | ⚠️ | ✅ | ✅ |
| Sail | ✅ | | ✅ | ✅ |

> **Legend:**
> ✅ = Supported
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ daft = ["daft==0.6.6", "deltalake==1.0.2", "pyarrow>=15.0.0"]
tpcds_datagen = ["duckdb==1.3.1", "pyarrow>=15.0.0"]
tpch_datagen = ["duckdb==1.3.1", "pyarrow>=15.0.0"]
sparkmeasure = ["sparkmeasure==0.24.0"]
sail = ["pysail>=0.3.5", "pyspark[connect]>=4.0.0", "deltalake>=1.0.2", "pyarrow>=15.0.0"]
sail = ["pysail>=0.3.7", "pyspark[connect]>=4.0.0", "deltalake>=1.0.2", "pyarrow>=15.0.0"]

[project.urls]
github = "https://github.com/mwc360/LakeBench"
Expand Down
Empty file.
23 changes: 0 additions & 23 deletions src/lakebench/benchmarks/tpcds/resources/queries/sail/q36.sql

This file was deleted.

39 changes: 0 additions & 39 deletions src/lakebench/benchmarks/tpcds/resources/queries/sail/q70.sql

This file was deleted.

21 changes: 0 additions & 21 deletions src/lakebench/benchmarks/tpcds/resources/queries/sail/q86.sql

This file was deleted.

9 changes: 8 additions & 1 deletion src/lakebench/engines/sail.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
from .base import BaseEngine
from .delta_rs import DeltaRs

import os
import posixpath
from typing import Any, Optional
from importlib.metadata import version



class Sail(BaseEngine):
"""
Sail Engine for ELT Benchmarks.
Expand Down Expand Up @@ -33,6 +36,10 @@ def __init__(
self.deltars = DeltaRs()
self.catalog_name = None
self.schema_name = None

# Set Sail specific environment variables
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shehabgamin - FYI I moved the env vars inside the init so that they con't get created when the module is imported but the class is not initialized.

os.environ["SAIL_RUNTIME__ENABLE_SECONDARY"] = "true"
os.environ["SAIL_OPTIMIZER__ENABLE_JOIN_REORDER"] = "true"

if Sail._SAIL_SERVER is None:
# create server
Expand Down Expand Up @@ -86,7 +93,7 @@ def execute_sql_query(self, query: str, context_decorator: Optional[str] = None)
"""
Execute a SQL query using Sail.
"""
execute_sql = self.spark.sql(query).collect()
execute_sql = self.spark.sql(query).toPandas()

def execute_sql_statement(self, statement: str, context_decorator: Optional[str] = None):
"""
Expand Down