From c062f3323eddeeb3eea33fe3ec61530373389367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Milenkovi=C4=87?= Date: Mon, 7 Oct 2024 09:24:56 +0100 Subject: [PATCH] remove python crate relates to: #1066 & #1067 --- ballista-cli/Cargo.toml | 2 +- python/.cargo/config.toml | 11 - python/.gitignore | 2 - python/Cargo.toml | 48 ---- python/LICENSE.txt | 202 -------------- python/README.md | 71 ----- python/pyballista/__init__.py | 36 --- python/pyballista/tests/__init__.py | 16 -- python/pyballista/tests/test_context.py | 77 ------ python/pyproject.toml | 64 ----- python/requirements.txt | 3 - python/src/context.rs | 353 ------------------------ python/src/lib.rs | 32 --- python/src/utils.rs | 24 -- python/testdata/test.csv | 2 - python/testdata/test.parquet | Bin 1851 -> 0 bytes 16 files changed, 1 insertion(+), 942 deletions(-) delete mode 100644 python/.cargo/config.toml delete mode 100644 python/.gitignore delete mode 100644 python/Cargo.toml delete mode 100644 python/LICENSE.txt delete mode 100644 python/README.md delete mode 100644 python/pyballista/__init__.py delete mode 100644 python/pyballista/tests/__init__.py delete mode 100644 python/pyballista/tests/test_context.py delete mode 100644 python/pyproject.toml delete mode 100644 python/requirements.txt delete mode 100644 python/src/context.rs delete mode 100644 python/src/lib.rs delete mode 100644 python/src/utils.rs delete mode 100644 python/testdata/test.csv delete mode 100755 python/testdata/test.parquet diff --git a/ballista-cli/Cargo.toml b/ballista-cli/Cargo.toml index dc8ff7cbd..2012c0401 100644 --- a/ballista-cli/Cargo.toml +++ b/ballista-cli/Cargo.toml @@ -34,7 +34,7 @@ clap = { workspace = true } datafusion = { workspace = true } datafusion-cli = { workspace = true } dirs = "5.0.1" -env_logger = "0.10" +env_logger = "0.11" mimalloc = { version = "0.1", default-features = false } num_cpus = "1.13.0" rustyline = "11.0.0" diff --git a/python/.cargo/config.toml b/python/.cargo/config.toml deleted file mode 100644 index d47f983e4..000000000 --- a/python/.cargo/config.toml +++ /dev/null @@ -1,11 +0,0 @@ -[target.x86_64-apple-darwin] -rustflags = [ - "-C", "link-arg=-undefined", - "-C", "link-arg=dynamic_lookup", -] - -[target.aarch64-apple-darwin] -rustflags = [ - "-C", "link-arg=-undefined", - "-C", "link-arg=dynamic_lookup", -] diff --git a/python/.gitignore b/python/.gitignore deleted file mode 100644 index 74486f04c..000000000 --- a/python/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -venv -*.so \ No newline at end of file diff --git a/python/Cargo.toml b/python/Cargo.toml deleted file mode 100644 index eb662cb1e..000000000 --- a/python/Cargo.toml +++ /dev/null @@ -1,48 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -[package] -name = "pyballista" -version = "0.12.0" -homepage = "https://github.com/apache/arrow-ballista" -repository = "https://github.com/apache/arrow-ballista" -authors = ["Apache DataFusion "] -description = "Apache Arrow Ballista Python Client" -readme = "README.md" -license = "Apache-2.0" -edition = "2021" -rust-version = "1.72" -include = ["/src", "/pyballista", "/LICENSE.txt", "pyproject.toml", "Cargo.toml", "Cargo.lock"] -publish = false - -[dependencies] -async-trait = "0.1.77" -ballista = { path = "../ballista/client", version = "0.12.0" } -ballista-core = { path = "../ballista/core", version = "0.12.0" } -datafusion = "41.0.0" -datafusion-proto = "41.0.0" -datafusion-python = "41.0.0" - -pyo3 = { version = "0.21", features = ["extension-module", "abi3", "abi3-py38"] } -pyo3-log = "0.11.0" -tokio = { version = "1.35", features = ["macros", "rt", "rt-multi-thread", "sync"] } - -[lib] -crate-type = ["cdylib"] -name = "pyballista" - - diff --git a/python/LICENSE.txt b/python/LICENSE.txt deleted file mode 100644 index d64569567..000000000 --- a/python/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/python/README.md b/python/README.md deleted file mode 100644 index 2898cb165..000000000 --- a/python/README.md +++ /dev/null @@ -1,71 +0,0 @@ - - -# PyBallista - -Python client for Ballista. - -This project is versioned and released independently from the main Ballista project and is intentionally not -part of the default Cargo workspace so that it doesn't cause overhead for maintainers of the main Ballista codebase. - -## Creating a SessionContext - -Creates a new context and connects to a Ballista scheduler process. - -```python -from pyballista import SessionContext ->>> ctx = SessionContext("localhost", 50050) -``` - -## Example SQL Usage - -```python ->>> ctx.sql("create external table t stored as parquet location '/mnt/bigdata/tpch/sf10-parquet/lineitem.parquet'") ->>> df = ctx.sql("select * from t limit 5") ->>> pyarrow_batches = df.collect() -``` - -## Example DataFrame Usage - -```python ->>> df = ctx.read_parquet('/mnt/bigdata/tpch/sf10-parquet/lineitem.parquet').limit(5) ->>> pyarrow_batches = df.collect() -``` - -## Creating Virtual Environment - -```shell -python3 -m venv venv -source venv/bin/activate -pip3 install -r requirements.txt -``` - -## Building - -```shell -maturin develop -``` - -Note that you can also run `maturin develop --release` to get a release build locally. - -## Testing - -```shell -python3 -m pytest -``` diff --git a/python/pyballista/__init__.py b/python/pyballista/__init__.py deleted file mode 100644 index 62a6bc790..000000000 --- a/python/pyballista/__init__.py +++ /dev/null @@ -1,36 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -from abc import ABCMeta, abstractmethod -from typing import List - -try: - import importlib.metadata as importlib_metadata -except ImportError: - import importlib_metadata - -import pyarrow as pa - -from .pyballista_internal import ( - SessionContext, -) - -__version__ = importlib_metadata.version(__name__) - -__all__ = [ - "SessionContext", -] diff --git a/python/pyballista/tests/__init__.py b/python/pyballista/tests/__init__.py deleted file mode 100644 index 13a83393a..000000000 --- a/python/pyballista/tests/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. diff --git a/python/pyballista/tests/test_context.py b/python/pyballista/tests/test_context.py deleted file mode 100644 index b440bb270..000000000 --- a/python/pyballista/tests/test_context.py +++ /dev/null @@ -1,77 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -from pyballista import SessionContext -import pytest - -def test_create_context(): - SessionContext("localhost", 50050) - -def test_select_one(): - ctx = SessionContext("localhost", 50050) - df = ctx.sql("SELECT 1") - batches = df.collect() - assert len(batches) == 1 - -def test_read_csv(): - ctx = SessionContext("localhost", 50050) - df = ctx.read_csv("testdata/test.csv", has_header=True) - batches = df.collect() - assert len(batches) == 1 - assert len(batches[0]) == 1 - -def test_register_csv(): - ctx = SessionContext("localhost", 50050) - ctx.register_csv("test", "testdata/test.csv", has_header=True) - df = ctx.sql("SELECT * FROM test") - batches = df.collect() - assert len(batches) == 1 - assert len(batches[0]) == 1 - -def test_read_parquet(): - ctx = SessionContext("localhost", 50050) - df = ctx.read_parquet("testdata/test.parquet") - batches = df.collect() - assert len(batches) == 1 - assert len(batches[0]) == 8 - -def test_register_parquet(): - ctx = SessionContext("localhost", 50050) - ctx.register_parquet("test", "testdata/test.parquet") - df = ctx.sql("SELECT * FROM test") - batches = df.collect() - assert len(batches) == 1 - assert len(batches[0]) == 8 - -def test_read_dataframe_api(): - ctx = SessionContext("localhost", 50050) - df = ctx.read_csv("testdata/test.csv", has_header=True) \ - .select_columns('a', 'b') \ - .limit(1) - batches = df.collect() - assert len(batches) == 1 - assert len(batches[0]) == 1 - -def test_execute_plan(): - ctx = SessionContext("localhost", 50050) - df = ctx.read_csv("testdata/test.csv", has_header=True) \ - .select_columns('a', 'b') \ - .limit(1) - df = ctx.execute_logical_plan(df.logical_plan()) - batches = df.collect() - assert len(batches) == 1 - assert len(batches[0]) == 1 diff --git a/python/pyproject.toml b/python/pyproject.toml deleted file mode 100644 index dbb76e59d..000000000 --- a/python/pyproject.toml +++ /dev/null @@ -1,64 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -[build-system] -requires = ["maturin>=0.15,<0.16"] -build-backend = "maturin" - -[project] -name = "pyballista" -description = "Python client for Apache Arrow Ballista Distributed SQL Query Engine" -readme = "README.md" -license = {file = "LICENSE.txt"} -requires-python = ">=3.6" -keywords = ["ballista", "sql", "rust", "distributed"] -classifier = [ - "Development Status :: 2 - Pre-Alpha", - "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", - "License :: OSI Approved", - "Operating System :: MacOS", - "Operating System :: Microsoft :: Windows", - "Operating System :: POSIX :: Linux", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python", - "Programming Language :: Rust", -] -dependencies = [ - "pyarrow>=11.0.0", -] - -[project.urls] -homepage = "https://datafusion.apache.org/ballista" -documentation = "https://datafusion.apache.org/ballista" -repository = "https://github.com/apache/arrow-ballista" - -[tool.isort] -profile = "black" - -[tool.maturin] -module-name = "pyballista.pyballista_internal" -include = [ - { path = "Cargo.lock", format = "sdist" } -] -exclude = [".github/**", "ci/**", ".asf.yaml"] -# Require Cargo.lock is up to date -locked = true diff --git a/python/requirements.txt b/python/requirements.txt deleted file mode 100644 index a03a8f8d2..000000000 --- a/python/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -datafusion==35.0.0 -pyarrow -pytest \ No newline at end of file diff --git a/python/src/context.rs b/python/src/context.rs deleted file mode 100644 index be7dd6109..000000000 --- a/python/src/context.rs +++ /dev/null @@ -1,353 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -use crate::utils::to_pyerr; -use datafusion::logical_expr::SortExpr; -use pyo3::exceptions::PyValueError; -use pyo3::prelude::*; -use std::path::PathBuf; - -use ballista::prelude::*; -use datafusion::arrow::datatypes::Schema; -use datafusion::arrow::pyarrow::PyArrowType; -use datafusion::prelude::*; -use datafusion_python::catalog::PyTable; -use datafusion_python::context::{ - convert_table_partition_cols, parse_file_compression_type, -}; -use datafusion_python::dataframe::PyDataFrame; -use datafusion_python::errors::DataFusionError; -use datafusion_python::expr::sort_expr::PySortExpr; -use datafusion_python::sql::logical::PyLogicalPlan; -use datafusion_python::utils::wait_for_future; - -/// PyBallista session context. This is largely a duplicate of -/// DataFusion's PySessionContext, with the main difference being -/// that this operates on a BallistaContext instead of DataFusion's -/// SessionContext. We could probably add extra extension points to -/// DataFusion to allow for a pluggable context and remove much of -/// this code. -#[pyclass(name = "SessionContext", module = "pyballista", subclass)] -pub struct PySessionContext { - ctx: BallistaContext, -} - -#[pymethods] -impl PySessionContext { - /// Create a new SessionContext by connecting to a Ballista scheduler process. - #[new] - pub fn new(host: &str, port: u16, py: Python) -> PyResult { - let config = BallistaConfig::new().unwrap(); - let ballista_context = BallistaContext::remote(host, port, &config); - let ctx = wait_for_future(py, ballista_context).map_err(to_pyerr)?; - Ok(Self { ctx }) - } - - pub fn sql(&mut self, query: &str, py: Python) -> PyResult { - let result = self.ctx.sql(query); - let df = wait_for_future(py, result)?; - Ok(PyDataFrame::new(df)) - } - - #[allow(clippy::too_many_arguments)] - #[pyo3(signature = (path, schema=None, table_partition_cols=vec![], file_extension=".avro"))] - pub fn read_avro( - &self, - path: &str, - schema: Option>, - table_partition_cols: Vec<(String, String)>, - file_extension: &str, - py: Python, - ) -> PyResult { - let mut options = AvroReadOptions::default() - .table_partition_cols(convert_table_partition_cols(table_partition_cols)?); - options.file_extension = file_extension; - let df = if let Some(schema) = schema { - options.schema = Some(&schema.0); - let read_future = self.ctx.read_avro(path, options); - wait_for_future(py, read_future).map_err(DataFusionError::from)? - } else { - let read_future = self.ctx.read_avro(path, options); - wait_for_future(py, read_future).map_err(DataFusionError::from)? - }; - Ok(PyDataFrame::new(df)) - } - - #[allow(clippy::too_many_arguments)] - #[pyo3(signature = ( - path, - schema=None, - has_header=true, - delimiter=",", - schema_infer_max_records=1000, - file_extension=".csv", - table_partition_cols=vec![], - file_compression_type=None))] - pub fn read_csv( - &self, - path: PathBuf, - schema: Option>, - has_header: bool, - delimiter: &str, - schema_infer_max_records: usize, - file_extension: &str, - table_partition_cols: Vec<(String, String)>, - file_compression_type: Option, - py: Python, - ) -> PyResult { - let path = path - .to_str() - .ok_or_else(|| PyValueError::new_err("Unable to convert path to a string"))?; - - let delimiter = delimiter.as_bytes(); - if delimiter.len() != 1 { - return Err(PyValueError::new_err( - "Delimiter must be a single character", - )); - }; - - let mut options = CsvReadOptions::new() - .has_header(has_header) - .delimiter(delimiter[0]) - .schema_infer_max_records(schema_infer_max_records) - .file_extension(file_extension) - .table_partition_cols(convert_table_partition_cols(table_partition_cols)?) - .file_compression_type(parse_file_compression_type(file_compression_type)?); - - if let Some(py_schema) = schema { - options.schema = Some(&py_schema.0); - let result = self.ctx.read_csv(path, options); - let df = PyDataFrame::new(wait_for_future(py, result)?); - Ok(df) - } else { - let result = self.ctx.read_csv(path, options); - let df = PyDataFrame::new(wait_for_future(py, result)?); - Ok(df) - } - } - - #[allow(clippy::too_many_arguments)] - #[pyo3(signature = (path, schema=None, schema_infer_max_records=1000, file_extension=".json", table_partition_cols=vec![], file_compression_type=None))] - pub fn read_json( - &mut self, - path: PathBuf, - schema: Option>, - schema_infer_max_records: usize, - file_extension: &str, - table_partition_cols: Vec<(String, String)>, - file_compression_type: Option, - py: Python, - ) -> PyResult { - let path = path - .to_str() - .ok_or_else(|| PyValueError::new_err("Unable to convert path to a string"))?; - let mut options = NdJsonReadOptions::default() - .table_partition_cols(convert_table_partition_cols(table_partition_cols)?) - .file_compression_type(parse_file_compression_type(file_compression_type)?); - options.schema_infer_max_records = schema_infer_max_records; - options.file_extension = file_extension; - let df = if let Some(schema) = schema { - options.schema = Some(&schema.0); - let result = self.ctx.read_json(path, options); - wait_for_future(py, result).map_err(DataFusionError::from)? - } else { - let result = self.ctx.read_json(path, options); - wait_for_future(py, result).map_err(DataFusionError::from)? - }; - Ok(PyDataFrame::new(df)) - } - - #[allow(clippy::too_many_arguments)] - #[pyo3(signature = ( - path, - table_partition_cols=vec![], - parquet_pruning=true, - file_extension=".parquet", - skip_metadata=true, - schema=None, - file_sort_order=None))] - pub fn read_parquet( - &self, - path: &str, - table_partition_cols: Vec<(String, String)>, - parquet_pruning: bool, - file_extension: &str, - skip_metadata: bool, - schema: Option>, - file_sort_order: Option>>, - py: Python, - ) -> PyResult { - let mut options = ParquetReadOptions::default() - .table_partition_cols(convert_table_partition_cols(table_partition_cols)?) - .parquet_pruning(parquet_pruning) - .skip_metadata(skip_metadata); - options.file_extension = file_extension; - options.schema = schema.as_ref().map(|x| &x.0); - options.file_sort_order = file_sort_order - .unwrap_or_default() - .into_iter() - .map(|e| { - e.into_iter() - .map(|f| { - let sort_expr: SortExpr = f.into(); - *sort_expr.expr - }) - .collect() - }) - .collect(); - - let result = self.ctx.read_parquet(path, options); - let df = - PyDataFrame::new(wait_for_future(py, result).map_err(DataFusionError::from)?); - Ok(df) - } - - #[allow(clippy::too_many_arguments)] - #[pyo3(signature = (name, - path, - schema=None, - file_extension=".avro", - table_partition_cols=vec![]))] - pub fn register_avro( - &mut self, - name: &str, - path: PathBuf, - schema: Option>, - file_extension: &str, - table_partition_cols: Vec<(String, String)>, - py: Python, - ) -> PyResult<()> { - let path = path - .to_str() - .ok_or_else(|| PyValueError::new_err("Unable to convert path to a string"))?; - - let mut options = AvroReadOptions::default() - .table_partition_cols(convert_table_partition_cols(table_partition_cols)?); - options.file_extension = file_extension; - options.schema = schema.as_ref().map(|x| &x.0); - - let result = self.ctx.register_avro(name, path, options); - wait_for_future(py, result).map_err(DataFusionError::from)?; - - Ok(()) - } - - #[allow(clippy::too_many_arguments)] - #[pyo3(signature = (name, - path, - schema=None, - has_header=true, - delimiter=",", - schema_infer_max_records=1000, - file_extension=".csv", - file_compression_type=None))] - pub fn register_csv( - &mut self, - name: &str, - path: PathBuf, - schema: Option>, - has_header: bool, - delimiter: &str, - schema_infer_max_records: usize, - file_extension: &str, - file_compression_type: Option, - py: Python, - ) -> PyResult<()> { - let path = path - .to_str() - .ok_or_else(|| PyValueError::new_err("Unable to convert path to a string"))?; - let delimiter = delimiter.as_bytes(); - if delimiter.len() != 1 { - return Err(PyValueError::new_err( - "Delimiter must be a single character", - )); - } - - let mut options = CsvReadOptions::new() - .has_header(has_header) - .delimiter(delimiter[0]) - .schema_infer_max_records(schema_infer_max_records) - .file_extension(file_extension) - .file_compression_type(parse_file_compression_type(file_compression_type)?); - options.schema = schema.as_ref().map(|x| &x.0); - - let result = self.ctx.register_csv(name, path, options); - wait_for_future(py, result).map_err(DataFusionError::from)?; - - Ok(()) - } - - #[allow(clippy::too_many_arguments)] - #[pyo3(signature = (name, path, table_partition_cols=vec![], - parquet_pruning=true, - file_extension=".parquet", - skip_metadata=true, - schema=None, - file_sort_order=None))] - pub fn register_parquet( - &mut self, - name: &str, - path: &str, - table_partition_cols: Vec<(String, String)>, - parquet_pruning: bool, - file_extension: &str, - skip_metadata: bool, - schema: Option>, - file_sort_order: Option>>, - py: Python, - ) -> PyResult<()> { - let mut options = ParquetReadOptions::default() - .table_partition_cols(convert_table_partition_cols(table_partition_cols)?) - .parquet_pruning(parquet_pruning) - .skip_metadata(skip_metadata); - options.file_extension = file_extension; - options.schema = schema.as_ref().map(|x| &x.0); - options.file_sort_order = file_sort_order - .unwrap_or_default() - .into_iter() - .map(|e| { - e.into_iter() - .map(|f| { - let sort_expr: SortExpr = f.into(); - *sort_expr.expr - }) - .collect() - }) - .collect(); - - let result = self.ctx.register_parquet(name, path, options); - wait_for_future(py, result).map_err(DataFusionError::from)?; - Ok(()) - } - - pub fn register_table(&mut self, name: &str, table: &PyTable) -> PyResult<()> { - self.ctx - .register_table(name, table.table()) - .map_err(DataFusionError::from)?; - Ok(()) - } - - pub fn execute_logical_plan( - &mut self, - logical_plan: PyLogicalPlan, - py: Python, - ) -> PyResult { - let result = self.ctx.execute_logical_plan(logical_plan.into()); - let df = wait_for_future(py, result).unwrap(); - Ok(PyDataFrame::new(df)) - } -} diff --git a/python/src/lib.rs b/python/src/lib.rs deleted file mode 100644 index 5fbd2491b..000000000 --- a/python/src/lib.rs +++ /dev/null @@ -1,32 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -use pyo3::prelude::*; -pub mod context; -mod utils; - -pub use crate::context::PySessionContext; - -#[pymodule] -fn pyballista_internal(_py: Python, m: Bound<'_, PyModule>) -> PyResult<()> { - pyo3_log::init(); - // Ballista structs - m.add_class::()?; - // DataFusion structs - m.add_class::()?; - Ok(()) -} diff --git a/python/src/utils.rs b/python/src/utils.rs deleted file mode 100644 index 10278537e..000000000 --- a/python/src/utils.rs +++ /dev/null @@ -1,24 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -use ballista_core::error::BallistaError; -use pyo3::exceptions::PyException; -use pyo3::PyErr; - -pub(crate) fn to_pyerr(err: BallistaError) -> PyErr { - PyException::new_err(err.to_string()) -} diff --git a/python/testdata/test.csv b/python/testdata/test.csv deleted file mode 100644 index 00910b0fe..000000000 --- a/python/testdata/test.csv +++ /dev/null @@ -1,2 +0,0 @@ -a,b -1,2 \ No newline at end of file diff --git a/python/testdata/test.parquet b/python/testdata/test.parquet deleted file mode 100755 index a63f5dca7c3821909748f34752966a0d7e08d47f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1851 zcmb7F&ui0g6#pje+AM2l7<*qVv_zM;YQD;X!1G_`Ye@W}TbqmweOL$NPTX=lg!8G{0y<66Rp8 z2pS|Aqlfj;PSH-&mT4zwizU$p1|0Y`VGJoyS_YbwNId;`jBg|z+DN8!b`S=|Sr$Ee51+|8u<)E>*X#arx$Xz24Q}8O`6X`}Xhr%F1Zjm_hG6In z7b&rg?-Cs*15K~?$g4Hmpi6uSk7fKqck31Rd$NO@X;dxW?*`sZ;$!02EAVEj1Dx*0 z{MLuNloZ0uLp~A&5eQYhXi-eh3&y9k4#_aQs_m^t;cL8xuhMu#`94GW^Wlpd7r_2h zbWlRre%G&Crz3oz;A@fee~~T(>&n~(=)0;8>IvyeeZ%&hb^-l_Dsj zFvuM<3gd=3Zp;SqWJI2b$YdaF$o()3pD7?YQ98!mj1HO5|D}r6be0>LFTr05hN163Gw zN`^s(6x}&&X(N%RnM7u%??nSFr{~`PZ?MG}V6i6>#vU;kXJ%l`=Er#5j4|7?$M(UP z-GIH6Am3BD#zq&s>YC+S`G?MW!>iZw=2&6OxPE8h?#;!8`C@+5-thcNe#V-dsZ?y! oaow58so4p;;FgVPyFBeqnNHc9FdWl$-SX^Jc0`|z5`8xR0vs|-V*mgE