-
Notifications
You must be signed in to change notification settings - Fork 133
Enable Dataframe to be converted into views which can be used in register_table #1016
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.
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
Changes from 15 commits
9d589a2
648c185
e55ac9f
ca42449
d0c3163
8578713
9cdd0dc
c207b6c
20dbfe8
4b4c641
12c4fe3
15ead1f
48eb8db
f73eebb
6bba2e2
7b0cbf1
f594b46
90a6a8b
c31395f
f0837de
9d8cdb5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| # 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 datafusion import SessionContext, col, literal | ||
|
|
||
|
|
||
| def test_register_filtered_dataframe(): | ||
| ctx = SessionContext() | ||
|
|
||
| data = {"a": [1, 2, 3, 4, 5], "b": [10, 20, 30, 40, 50]} | ||
|
|
||
| df = ctx.from_pydict(data, "my_table") | ||
|
|
||
| df_filtered = df.filter(col("a") > literal(2)) | ||
| view = df_filtered.into_view() | ||
|
|
||
| assert view.kind == "view" | ||
|
|
||
| ctx.register_table("view1", view) | ||
|
||
|
|
||
| df_view = ctx.sql("SELECT * FROM view1") | ||
|
|
||
| filtered_results = df_view.collect() | ||
|
|
||
| result_dicts = [batch.to_pydict() for batch in filtered_results] | ||
|
|
||
| expected_results = [{"a": [3, 4, 5], "b": [30, 40, 50]}] | ||
|
|
||
| assert result_dicts == expected_results | ||
|
|
||
| df_results = df.collect() | ||
|
|
||
| df_result_dicts = [batch.to_pydict() for batch in df_results] | ||
|
|
||
| expected_df_results = [{"a": [1, 2, 3, 4, 5], "b": [10, 20, 30, 40, 50]}] | ||
|
|
||
| assert df_result_dicts == expected_df_results | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ use datafusion::arrow::util::pretty; | |
| use datafusion::common::UnnestOptions; | ||
| use datafusion::config::{CsvOptions, TableParquetOptions}; | ||
| use datafusion::dataframe::{DataFrame, DataFrameWriteOptions}; | ||
| use datafusion::datasource::TableProvider; | ||
| use datafusion::execution::SendableRecordBatchStream; | ||
| use datafusion::parquet::basic::{BrotliLevel, Compression, GzipLevel, ZstdLevel}; | ||
| use datafusion::prelude::*; | ||
|
|
@@ -39,6 +40,7 @@ use pyo3::pybacked::PyBackedStr; | |
| use pyo3::types::{PyCapsule, PyTuple, PyTupleMethods}; | ||
| use tokio::task::JoinHandle; | ||
|
|
||
| use crate::catalog::PyTable; | ||
| use crate::errors::{py_datafusion_err, PyDataFusionError}; | ||
| use crate::expr::sort_expr::to_sort_expressions; | ||
| use crate::physical_plan::PyExecutionPlan; | ||
|
|
@@ -50,6 +52,22 @@ use crate::{ | |
| expr::{sort_expr::PySortExpr, PyExpr}, | ||
| }; | ||
|
|
||
| #[pyclass(name = "TableProvider", module = "datafusion")] | ||
| pub struct PyTableProvider { | ||
| provider: Arc<dyn TableProvider>, | ||
| } | ||
|
|
||
| impl PyTableProvider { | ||
| pub fn new(provider: Arc<dyn TableProvider>) -> Self { | ||
| Self { provider } | ||
| } | ||
|
|
||
| pub fn as_table(&self) -> PyTable { | ||
| let table_provider: Arc<dyn TableProvider> = self.provider.clone(); | ||
| PyTable::new(table_provider) | ||
| } | ||
| } | ||
|
|
||
|
Comment on lines
+58
to
+73
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In general I think this is a good idea, but I'm worried about causing confusion with a table provider created from a view and a table provider that is passed from an external source using pycapsule. I can imagine a user would think that a table provider object from one place can be used with another. That is, if I create a table provider with into_view I should be able to register it with the session context. Now, I don't think that operation is strictly necssary but I do expect it would cause some confusion. What I think we want to do is to have a single common PyTableProvider that can be created either via a pycapsule or into_view. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Do you mean a constructor that takes a pycapsule argument, then extract provider to use in Can I check how I can obtain the provider from There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any chance you can give me some code points or reference PRs that would help with implementation? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What if we just skip the whole creating a view as a table provider and instead go straight to registering a view on the session context? We could do something like @matko would that solve your needs or do you need that view table provider exposed for other use? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Otherwise I think we have to plan for how we can have a common concept around two ways of creating table providers in python code. Also we would want to think about how we would handle the return type of a udtf, which we haven't even addressed. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Sounds good. |
||
| /// A PyDataFrame is a representation of a logical plan and an API to compose statements. | ||
| /// Use it to build a plan and `.collect()` to execute the plan and collect the result. | ||
| /// The actual execution of a plan runs natively on Rust and Arrow on a multi-threaded environment. | ||
|
|
@@ -156,6 +174,20 @@ impl PyDataFrame { | |
| PyArrowType(self.df.schema().into()) | ||
| } | ||
|
|
||
| /// Convert this DataFrame into a Table that can be used in register_table | ||
| fn _into_view(&self) -> PyDataFusionResult<PyTable> { | ||
|
||
| // Call the underlying Rust DataFrame::into_view method. | ||
| // Note that the Rust method consumes self; here we clone the inner Arc<DataFrame> | ||
| // so that we don’t invalidate this PyDataFrame. | ||
| // _into_view because clippy says `into_*` usually take `self` by value | ||
| // but we cannot own self because Python objects are shared, | ||
| // so 'self' cannot be moved out of the Python interpreter | ||
| let table_provider = self.df.as_ref().clone().into_view(); | ||
| let table_provider = PyTableProvider::new(table_provider); | ||
|
|
||
| Ok(table_provider.as_table()) | ||
| } | ||
|
|
||
| #[pyo3(signature = (*args))] | ||
| fn select_columns(&self, args: Vec<PyBackedStr>) -> PyDataFusionResult<Self> { | ||
| let args = args.iter().map(|s| s.as_ref()).collect::<Vec<&str>>(); | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is very good, but would be more helpful if moved into the appropriate docs section so it goes into the online documentation rather than the readme.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I created a view.rst for this.