add remaining expr bindings

datafusion/__init__.py

@@ -62,6 +62,15 @@
  IsNotFalse,
  IsNotUnknown,
  Negative,
+ ScalarFunction,
+ BuiltinScalarFunction,
+ InList,
+ Exists,
+ Subquery,
+ InSubquery,
+ ScalarSubquery,
+ GroupingSet,
+ Placeholder,
 )
 
 __version__ = importlib_metadata.version(__name__)
@@ -99,6 +108,15 @@
  "IsNotFalse",
  "IsNotUnknown",
  "Negative",
+ "ScalarFunction",
+ "BuiltinScalarFunction",
+ "InList",
+ "Exists",
+ "Subquery",
+ "InSubquery",
+ "ScalarSubquery",
+ "GroupingSet",
+ "Placeholder",
 ]
 
 

datafusion/tests/test_imports.py

@@ -58,6 +58,15 @@
  IsNotFalse,
  IsNotUnknown,
  Negative,
+ ScalarFunction,
+ BuiltinScalarFunction,
+ InList,
+ Exists,
+ Subquery,
+ InSubquery,
+ ScalarSubquery,
+ GroupingSet,
+ Placeholder,
 )
 
 
@@ -105,6 +114,15 @@ def test_class_module_is_datafusion():
  IsNotFalse,
  IsNotUnknown,
  Negative,
+ ScalarFunction,
+ BuiltinScalarFunction,
+ InList,
+ Exists,
+ Subquery,
+ InSubquery,
+ ScalarSubquery,
+ GroupingSet,
+ Placeholder,
  ]:
  assert klass.__module__ == "datafusion.expr"
 

src/expr.rs

@@ -54,6 +54,15 @@ pub mod projection;
 pub mod scalar_variable;
 pub mod sort;
 pub mod table_scan;
+pub mod scalar_function;
+pub mod signature;
+pub mod in_list;
+pub mod exists;
+pub mod in_subquery;
+pub mod subquery;
+pub mod scalar_subquery;
+pub mod grouping_set;
+pub mod placeholder;
 
 /// A PyExpr that can be used on a DataFrame
 #[pyclass(name = "Expr", module = "datafusion.expr", subclass)]
@@ -230,6 +239,15 @@ pub(crate) fn init_module(m: &PyModule) -> PyResult<()> {
  m.add_class::<PySimilarTo>()?;
  m.add_class::<PyScalarVariable>()?;
  m.add_class::<alias::PyAlias>()?;
+ m.add_class::<scalar_function::PyScalarFunction>()?;
+ m.add_class::<scalar_function::PyBuiltinScalarFunction>()?;
+ m.add_class::<in_list::PyInList>()?;
+ m.add_class::<exists::PyExists>()?;
+ m.add_class::<subquery::PySubquery>()?;
+ m.add_class::<in_subquery::PyInSubquery>()?;
+ m.add_class::<scalar_subquery::PyScalarSubquery>()?;
+ m.add_class::<placeholder::PyPlaceholder>()?;
+ m.add_class::<grouping_set::PyGroupingSet>()?;
  // operators
  m.add_class::<table_scan::PyTableScan>()?;
  m.add_class::<projection::PyProjection>()?;

src/expr/exists.rs

@@ -0,0 +1,48 @@
+// 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 datafusion_expr::Subquery;
+use pyo3::prelude::*;
+
+use super::subquery::PySubquery;
+
+#[pyclass(name = "Exists", module = "datafusion.expr", subclass)]
+#[derive(Clone)]
+pub struct PyExists {
+ subquery: Subquery,
+ negated: bool,
+}
+
+impl PyExists {
+ pub fn new(subquery: Subquery, negated: bool) -> Self {
+ Self {
+ subquery,
+ negated
+ }
+ }
+}
+
+#[pymethods]
+impl PyExists {
+ fn subquery(&self) -> PySubquery {
+ self.subquery.clone().into()
+ }
+
+ fn negated(&self) -> bool {
+ self.negated
+ }
+}

src/expr/grouping_set.rs

@@ -0,0 +1,37 @@
+// 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 datafusion_expr::GroupingSet;
+use pyo3::prelude::*;
+
+#[pyclass(name = "GroupingSet", module = "datafusion.expr", subclass)]
+#[derive(Clone)]
+pub struct PyGroupingSet {
+ grouping_set: GroupingSet,
+}
+
+impl From<PyGroupingSet> for GroupingSet {
+ fn from(grouping_set: PyGroupingSet) -> Self {
+ grouping_set.grouping_set
+ }
+}
+
+impl From<GroupingSet> for PyGroupingSet {
+ fn from(grouping_set: GroupingSet) -> PyGroupingSet {
+ PyGroupingSet { grouping_set }
+ }
+}

src/expr/in_list.rs

@@ -0,0 +1,56 @@
+// 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::expr::PyExpr;
+use datafusion_expr::Expr;
+use pyo3::prelude::*;
+
+#[pyclass(name = "InList", module = "datafusion.expr", subclass)]
+#[derive(Clone)]
+pub struct PyInList {
+ expr: Box<Expr>,
+ list: Vec<Expr>,
+ negated: bool,
+}
+
+impl PyInList {
+ pub fn new(expr: Box<Expr>, list: Vec<Expr>, negated: bool) -> Self {
+ Self {
+ expr,
+ list,
+ negated
+ }
+ }
+}
+
+#[pymethods]
+impl PyInList {
+ fn expr(&self) -> PyExpr {
+ (*self.expr).clone().into()
+ }
+
+ fn list(&self) -> Vec<PyExpr> {
+ self.list
+ .iter()
+ .map(|e| e.clone().into())
+ .collect()
+ }
+
+ fn negated(&self) -> bool {
+ self.negated
+ }
+}

src/expr/in_subquery.rs

@@ -0,0 +1,54 @@
+// 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 datafusion_expr::{Subquery, Expr};
+use pyo3::prelude::*;
+
+use super::{subquery::PySubquery, PyExpr};
+
+#[pyclass(name = "InSubquery", module = "datafusion.expr", subclass)]
+#[derive(Clone)]
+pub struct PyInSubquery {
+ expr: Box<Expr>,
+ subquery: Subquery,
+ negated: bool,
+}
+
+impl PyInSubquery {
+ pub fn new(expr: Box<Expr>, subquery: Subquery, negated: bool) -> Self {
+ Self {
+ expr,
+ subquery,
+ negated
+ }
+ }
+}
+
+#[pymethods]
+impl PyInSubquery {
+ fn expr(&self) -> PyExpr {
+ (*self.expr).clone().into()
+ }
+
+ fn subquery(&self) -> PySubquery {
+ self.subquery.clone().into()
+ }
+
+ fn negated(&self) -> bool {
+ self.negated
+ }
+}