Skip to content

Commit 9d28c0b

Browse files
committed
select_columns has been deprecated since DF43
1 parent bdf8c89 commit 9d28c0b

2 files changed

Lines changed: 3 additions & 21 deletions

File tree

crates/core/src/dataframe.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -468,17 +468,17 @@ impl PyDataFrame {
468468
fn __getitem__(&self, key: Bound<'_, PyAny>) -> PyDataFusionResult<Self> {
469469
if let Ok(key) = key.extract::<PyBackedStr>() {
470470
// df[col]
471-
self.select_columns(vec![key])
471+
self.select_exprs(vec![key])
472472
} else if let Ok(tuple) = key.cast::<PyTuple>() {
473473
// df[col1, col2, col3]
474474
let keys = tuple
475475
.iter()
476476
.map(|item| item.extract::<PyBackedStr>())
477477
.collect::<PyResult<Vec<PyBackedStr>>>()?;
478-
self.select_columns(keys)
478+
self.select_exprs(keys)
479479
} else if let Ok(keys) = key.extract::<Vec<PyBackedStr>>() {
480480
// df[[col1, col2, col3]]
481-
self.select_columns(keys)
481+
self.select_exprs(keys)
482482
} else {
483483
let message = "DataFrame can only be indexed by string index or indices".to_string();
484484
Err(PyDataFusionError::Common(message))
@@ -554,13 +554,6 @@ impl PyDataFrame {
554554
Ok(PyTable::from(table_provider))
555555
}
556556

557-
#[pyo3(signature = (*args))]
558-
fn select_columns(&self, args: Vec<PyBackedStr>) -> PyDataFusionResult<Self> {
559-
let args = args.iter().map(|s| s.as_ref()).collect::<Vec<&str>>();
560-
let df = self.df.as_ref().clone().select_columns(&args)?;
561-
Ok(Self::new(df))
562-
}
563-
564557
#[pyo3(signature = (*args))]
565558
fn select_exprs(&self, args: Vec<PyBackedStr>) -> PyDataFusionResult<Self> {
566559
let args = args.iter().map(|s| s.as_ref()).collect::<Vec<&str>>();

python/datafusion/dataframe.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -395,17 +395,6 @@ def schema(self) -> pa.Schema:
395395
"""
396396
return self.df.schema()
397397

398-
@deprecated(
399-
"select_columns() is deprecated. Use :py:meth:`~DataFrame.select` instead"
400-
)
401-
def select_columns(self, *args: str) -> DataFrame:
402-
"""Filter the DataFrame by columns.
403-
404-
Returns:
405-
DataFrame only containing the specified columns.
406-
"""
407-
return self.select(*args)
408-
409398
def select_exprs(self, *args: str) -> DataFrame:
410399
"""Project arbitrary list of expression strings into a new DataFrame.
411400

0 commit comments

Comments
 (0)