Skip to content
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

feat: support 'col IN (a, b, c)' type expressions #652

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
+937 −415
Open

feat: support 'col IN (a, b, c)' type expressions #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
28a5648
feat: support 'col IN (a, b, c)' type expressions
roeap Jan 18, 2025
d6e3730
Merge branch 'main' into feat/col-in-arr
roeap Jan 24, 2025
848ef11
fix: PR feedback
roeap Jan 24, 2025
290d65d
chore: clippy
roeap Jan 24, 2025
def21c1
chore: fmt
roeap Jan 24, 2025
6b959eb
fix: null handling for in-list
roeap Jan 30, 2025
4e3e92c
Merge branch 'main' into feat/col-in-arr
roeap Jan 30, 2025
ba3b4e9
fix: simplify partial_cmp impl
roeap Jan 30, 2025
233c0e8
fix: partial_cmp for decimals via rust_decimal
roeap Feb 2, 2025
6c813e9
fix: in-list null handling
roeap Feb 2, 2025
88fd54c
chore: revert partialeq releated changes
roeap Feb 4, 2025
bff7143
chore: cleanup in-list implementation
roeap Feb 4, 2025
edeacfc
chore: clippy
roeap Feb 4, 2025
fcdf565
Merge branch 'main' into feat/col-in-arr
roeap Feb 4, 2025
fd58d70
test: add test for in-list false case
roeap Feb 4, 2025
511b451
refactor: split up arrow_expression module
roeap Feb 4, 2025
00b3002
chore: cleanup
roeap Feb 4, 2025
7d9abd4
chore: clippy
roeap Feb 4, 2025
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
33 changes: 24 additions & 9 deletions kernel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,30 @@ repository.workspace = true
readme.workspace = true
version.workspace = true
# exclude golden tests + golden test data since they push us over 10MB crate size limit
exclude = ["tests/golden_tables.rs", "tests/golden_data/" ]
exclude = ["tests/golden_tables.rs", "tests/golden_data/"]
rust-version.workspace = true

[package.metadata.docs.rs]
all-features = true

[package.metadata.release]
pre-release-replacements = [
{file="../README.md", search="delta_kernel = \"[a-z0-9\\.-]+\"", replace="delta_kernel = \"{{version}}\""},
{file="../README.md", search="version = \"[a-z0-9\\.-]+\"", replace="version = \"{{version}}\""},
{ file = "../README.md", search = "delta_kernel = \"[a-z0-9\\.-]+\"", replace = "delta_kernel = \"{{version}}\"" },
{ file = "../README.md", search = "version = \"[a-z0-9\\.-]+\"", replace = "version = \"{{version}}\"" },
]
pre-release-hook = [
"git",
"cliff",
"--repository",
"../",
"--config",
"../cliff.toml",
"--unreleased",
"--prepend",
"../CHANGELOG.md",
"--tag",
"{{version}}",
]
pre-release-hook = ["git", "cliff", "--repository", "../", "--config", "../cliff.toml", "--unreleased", "--prepend", "../CHANGELOG.md", "--tag", "{{version}}" ]

[dependencies]
bytes = "1.7"
Expand Down Expand Up @@ -74,7 +86,13 @@ walkdir = { workspace = true, optional = true }

[features]
arrow-conversion = ["arrow-schema"]
arrow-expression = ["arrow-arith", "arrow-array", "arrow-buffer", "arrow-ord", "arrow-schema"]
arrow-expression = [
"arrow-arith",
"arrow-array",
"arrow-buffer",
"arrow-ord",
"arrow-schema",
]
cloud = [
"object_store/aws",
"object_store/azure",
Expand Down Expand Up @@ -106,10 +124,7 @@ default-engine-base = [

# the default-engine use the reqwest crate with default features which uses native-tls. if you want
# to instead use rustls, use 'default-engine-rustls' which has no native-tls dependency
default-engine = [
"default-engine-base",
"reqwest/default",
]
default-engine = ["default-engine-base", "reqwest/default"]

default-engine-rustls = [
"default-engine-base",
Expand Down
2 changes: 1 addition & 1 deletion kernel/src/engine/arrow_conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ impl TryFrom<&ArrowDataType> for DataType {
ArrowDataType::Date64 => Ok(DataType::DATE),
ArrowDataType::Timestamp(TimeUnit::Microsecond, None) => Ok(DataType::TIMESTAMP_NTZ),
ArrowDataType::Timestamp(TimeUnit::Microsecond, Some(tz))
if tz.eq_ignore_ascii_case("utc") =>
if tz.eq_ignore_ascii_case("utc") || tz.eq_ignore_ascii_case("+00:00") =>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The data in arrow arrays should always represent a timestamp in UTC, so is this check even necessary?

https://github.com/apache/arrow-rs/blob/af777cd53e56f8382382137b6e08af249c475397/arrow-schema/src/datatype.rs#L179-L182

{
Ok(DataType::TIMESTAMP)
}
Expand Down
Loading
Loading