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
4 changes: 4 additions & 0 deletions datafusion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
CreateView,
Distinct,
DropTable,
Repartition,
Partitioning,
)

__version__ = importlib_metadata.version(__name__)
Expand Down Expand Up @@ -141,6 +143,8 @@
"CreateView",
"Distinct",
"DropTable",
"Repartition",
"Partitioning",
]


Expand Down
4 changes: 4 additions & 0 deletions datafusion/tests/test_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@
CreateView,
Distinct,
DropTable,
Repartition,
Partitioning,
)


Expand Down Expand Up @@ -157,6 +159,8 @@ def test_class_module_is_datafusion():
CreateView,
Distinct,
DropTable,
Repartition,
Partitioning,
]:
assert klass.__module__ == "datafusion.expr"

Expand Down
3 changes: 3 additions & 0 deletions src/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pub mod literal;
pub mod logical_node;
pub mod placeholder;
pub mod projection;
pub mod repartition;
pub mod scalar_function;
pub mod scalar_subquery;
pub mod scalar_variable;
Expand Down Expand Up @@ -287,5 +288,7 @@ pub(crate) fn init_module(m: &PyModule) -> PyResult<()> {
m.add_class::<distinct::PyDistinct>()?;
m.add_class::<subquery_alias::PySubqueryAlias>()?;
m.add_class::<drop_table::PyDropTable>()?;
m.add_class::<repartition::PyPartitioning>()?;
m.add_class::<repartition::PyRepartition>()?;
Ok(())
}
127 changes: 127 additions & 0 deletions src/expr/repartition.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
// 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 std::fmt::{self, Display, Formatter};

use datafusion_expr::{logical_plan::Repartition, Expr, Partitioning};
use pyo3::prelude::*;

use crate::{errors::py_type_err, sql::logical::PyLogicalPlan};

use super::{logical_node::LogicalNode, PyExpr};

#[pyclass(name = "Repartition", module = "datafusion.expr", subclass)]
#[derive(Clone)]
pub struct PyRepartition {
repartition: Repartition,
}

#[pyclass(name = "Partitioning", module = "datafusion.expr", subclass)]
#[derive(Clone)]
pub struct PyPartitioning {
partitioning: Partitioning,
}

impl From<PyPartitioning> for Partitioning {
fn from(partitioning: PyPartitioning) -> Self {
partitioning.partitioning
}
}

impl From<Partitioning> for PyPartitioning {
fn from(partitioning: Partitioning) -> Self {
PyPartitioning { partitioning }
}
}

impl From<PyRepartition> for Repartition {
fn from(repartition: PyRepartition) -> Self {
repartition.repartition
}
}

impl From<Repartition> for PyRepartition {
fn from(repartition: Repartition) -> PyRepartition {
PyRepartition { repartition }
}
}

impl Display for PyRepartition {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
write!(
f,
"Repartition
input: {:?}
partitioning_scheme: {:?}",
&self.repartition.input, &self.repartition.partitioning_scheme,
)
}
}

#[pymethods]
impl PyRepartition {
fn input(&self) -> PyResult<Vec<PyLogicalPlan>> {
Ok(Self::inputs(self))
}

fn partitioning_scheme(&self) -> PyResult<PyPartitioning> {
Ok(PyPartitioning {
partitioning: self.repartition.partitioning_scheme.clone(),
})
}

fn distribute_list(&self) -> PyResult<Vec<PyExpr>> {
match &self.repartition.partitioning_scheme {
Partitioning::DistributeBy(distribute_list) => Ok(distribute_list
.iter()
.map(|e| PyExpr::from(e.clone()))
.collect()),
_ => Err(py_type_err("unexpected repartition strategy")),
}
}

fn distribute_columns(&self) -> PyResult<String> {
match &self.repartition.partitioning_scheme {
Partitioning::DistributeBy(distribute_list) => Ok(distribute_list
.iter()
.map(|e| match &e {
Expr::Column(column) => column.name.clone(),
_ => panic!("Encountered a type other than Expr::Column"),
})
.collect()),
_ => Err(py_type_err("unexpected repartition strategy")),
}
}

fn __repr__(&self) -> PyResult<String> {
Ok(format!("Repartition({})", self))
}

fn __name__(&self) -> PyResult<String> {
Ok("Repartition".to_string())
}
}

impl LogicalNode for PyRepartition {
fn inputs(&self) -> Vec<PyLogicalPlan> {
vec![PyLogicalPlan::from((*self.repartition.input).clone())]
}

fn to_variant(&self, py: Python) -> PyResult<PyObject> {
Ok(self.clone().into_py(py))
}
}