Skip to content

Commit c80da91

Browse files
waynexiacomphead
waynexia
and
comphead
authored
fix(typo): unqualifed to unqualified (#11159)
* fix(typo): unqualifed to unqualified Signed-off-by: Ruihang Xia <[email protected]> * keep the old API Signed-off-by: Ruihang Xia <[email protected]> * Update datafusion/common/src/dfschema.rs Co-authored-by: Oleks V <[email protected]> --------- Signed-off-by: Ruihang Xia <[email protected]> Co-authored-by: Oleks V <[email protected]>
1 parent 7a7797c commit c80da91

File tree

12 files changed

+35
-22
lines changed

12 files changed

+35
-22
lines changed

‎datafusion-examples/examples/expr_api.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,14 @@ fn expression_type_demo() -> Result<()> {
292292
// types of the input expressions. You can provide this information using
293293
// a schema. In this case we create a schema where the column `c` is of
294294
// type Utf8 (a String / VARCHAR)
295-
let schema = DFSchema::from_unqualifed_fields(
295+
let schema = DFSchema::from_unqualified_fields(
296296
vec![Field::new("c", DataType::Utf8, true)].into(),
297297
HashMap::new(),
298298
)?;
299299
assert_eq!("Utf8", format!("{}", expr.get_type(&schema).unwrap()));
300300

301301
// Using a schema where the column `foo` is of type Int32
302-
let schema = DFSchema::from_unqualifed_fields(
302+
let schema = DFSchema::from_unqualified_fields(
303303
vec![Field::new("c", DataType::Int32, true)].into(),
304304
HashMap::new(),
305305
)?;
@@ -308,7 +308,7 @@ fn expression_type_demo() -> Result<()> {
308308
// Get the type of an expression that adds 2 columns. Adding an Int32
309309
// and Float32 results in Float32 type
310310
let expr = col("c1") + col("c2");
311-
let schema = DFSchema::from_unqualifed_fields(
311+
let schema = DFSchema::from_unqualified_fields(
312312
vec![
313313
Field::new("c1", DataType::Int32, true),
314314
Field::new("c2", DataType::Float32, true),

‎datafusion/common/src/dfschema.rs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub type DFSchemaRef = Arc<DFSchema>;
9898
/// use arrow::datatypes::Field;
9999
/// use std::collections::HashMap;
100100
///
101-
/// let df_schema = DFSchema::from_unqualifed_fields(vec![
101+
/// let df_schema = DFSchema::from_unqualified_fields(vec![
102102
/// Field::new("c1", arrow::datatypes::DataType::Int32, false),
103103
/// ].into(),HashMap::new()).unwrap();
104104
/// let schema = Schema::from(df_schema);
@@ -159,6 +159,19 @@ impl DFSchema {
159159
}
160160

161161
/// Create a new `DFSchema` from a list of Arrow [Field]s
162+
#[allow(deprecated)]
163+
pub fn from_unqualified_fields(
164+
fields: Fields,
165+
metadata: HashMap<String, String>,
166+
) -> Result<Self> {
167+
Self::from_unqualifed_fields(fields, metadata)
168+
}
169+
170+
/// Create a new `DFSchema` from a list of Arrow [Field]s
171+
#[deprecated(
172+
since = "40.0.0",
173+
note = "Please use `from_unqualified_fields` instead (this one's name is a typo). This method is subject to be removed soon"
174+
)]
162175
pub fn from_unqualifed_fields(
163176
fields: Fields,
164177
metadata: HashMap<String, String>,

‎datafusion/core/src/datasource/listing/helpers.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ async fn prune_partitions(
261261
.collect();
262262
let schema = Arc::new(Schema::new(fields));
263263

264-
let df_schema = DFSchema::from_unqualifed_fields(
264+
let df_schema = DFSchema::from_unqualified_fields(
265265
partition_cols
266266
.iter()
267267
.map(|(n, d)| Field::new(n, d.clone(), true))

‎datafusion/core/src/physical_planner.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2763,7 +2763,7 @@ mod tests {
27632763
fn default() -> Self {
27642764
Self {
27652765
schema: DFSchemaRef::new(
2766-
DFSchema::from_unqualifed_fields(
2766+
DFSchema::from_unqualified_fields(
27672767
vec![Field::new("a", DataType::Int32, false)].into(),
27682768
HashMap::new(),
27692769
)

‎datafusion/expr/src/expr_schema.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl ExprSchemable for Expr {
8080
///
8181
/// fn main() {
8282
/// let expr = col("c1") + col("c2");
83-
/// let schema = DFSchema::from_unqualifed_fields(
83+
/// let schema = DFSchema::from_unqualified_fields(
8484
/// vec![
8585
/// Field::new("c1", DataType::Int32, true),
8686
/// Field::new("c2", DataType::Float32, true),
@@ -668,7 +668,7 @@ mod tests {
668668
.unwrap()
669669
);
670670

671-
let schema = DFSchema::from_unqualifed_fields(
671+
let schema = DFSchema::from_unqualified_fields(
672672
vec![Field::new("foo", DataType::Int32, true).with_metadata(meta.clone())]
673673
.into(),
674674
HashMap::new(),

‎datafusion/expr/src/logical_plan/builder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ impl LogicalPlanBuilder {
223223
Field::new(name, data_type.clone(), true)
224224
})
225225
.collect::<Vec<_>>();
226-
let dfschema = DFSchema::from_unqualifed_fields(fields.into(), HashMap::new())?;
226+
let dfschema = DFSchema::from_unqualified_fields(fields.into(), HashMap::new())?;
227227
let schema = DFSchemaRef::new(dfschema);
228228
Ok(Self::from(LogicalPlan::Values(Values { schema, values })))
229229
}

‎datafusion/expr/src/logical_plan/plan.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2080,7 +2080,7 @@ impl SubqueryAlias {
20802080
let fields = change_redundant_column(plan.schema().fields());
20812081
let meta_data = plan.schema().as_ref().metadata().clone();
20822082
let schema: Schema =
2083-
DFSchema::from_unqualifed_fields(fields.into(), meta_data)?.into();
2083+
DFSchema::from_unqualified_fields(fields.into(), meta_data)?.into();
20842084
// Since schema is the same, other than qualifier, we can use existing
20852085
// functional dependencies:
20862086
let func_dependencies = plan.schema().functional_dependencies().clone();

‎datafusion/optimizer/src/analyzer/type_coercion.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ mod test {
843843
Arc::new(LogicalPlan::EmptyRelation(EmptyRelation {
844844
produce_one_row: false,
845845
schema: Arc::new(
846-
DFSchema::from_unqualifed_fields(
846+
DFSchema::from_unqualified_fields(
847847
vec![Field::new("a", data_type, true)].into(),
848848
std::collections::HashMap::new(),
849849
)
@@ -1081,7 +1081,7 @@ mod test {
10811081
let expr = col("a").in_list(vec![lit(1_i32), lit(4_i8), lit(8_i64)], false);
10821082
let empty = Arc::new(LogicalPlan::EmptyRelation(EmptyRelation {
10831083
produce_one_row: false,
1084-
schema: Arc::new(DFSchema::from_unqualifed_fields(
1084+
schema: Arc::new(DFSchema::from_unqualified_fields(
10851085
vec![Field::new("a", DataType::Decimal128(12, 4), true)].into(),
10861086
std::collections::HashMap::new(),
10871087
)?),
@@ -1278,7 +1278,7 @@ mod test {
12781278
#[test]
12791279
fn test_type_coercion_rewrite() -> Result<()> {
12801280
// gt
1281-
let schema = Arc::new(DFSchema::from_unqualifed_fields(
1281+
let schema = Arc::new(DFSchema::from_unqualified_fields(
12821282
vec![Field::new("a", DataType::Int64, true)].into(),
12831283
std::collections::HashMap::new(),
12841284
)?);
@@ -1289,7 +1289,7 @@ mod test {
12891289
assert_eq!(expected, result);
12901290

12911291
// eq
1292-
let schema = Arc::new(DFSchema::from_unqualifed_fields(
1292+
let schema = Arc::new(DFSchema::from_unqualified_fields(
12931293
vec![Field::new("a", DataType::Int64, true)].into(),
12941294
std::collections::HashMap::new(),
12951295
)?);
@@ -1300,7 +1300,7 @@ mod test {
13001300
assert_eq!(expected, result);
13011301

13021302
// lt
1303-
let schema = Arc::new(DFSchema::from_unqualifed_fields(
1303+
let schema = Arc::new(DFSchema::from_unqualified_fields(
13041304
vec![Field::new("a", DataType::Int64, true)].into(),
13051305
std::collections::HashMap::new(),
13061306
)?);
@@ -1373,7 +1373,7 @@ mod test {
13731373

13741374
#[test]
13751375
fn test_case_expression_coercion() -> Result<()> {
1376-
let schema = Arc::new(DFSchema::from_unqualifed_fields(
1376+
let schema = Arc::new(DFSchema::from_unqualified_fields(
13771377
vec![
13781378
Field::new("boolean", DataType::Boolean, true),
13791379
Field::new("integer", DataType::Int32, true),

‎datafusion/optimizer/src/common_subexpr_eliminate.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ mod test {
17021702
fn test_extract_expressions_from_grouping_set() -> Result<()> {
17031703
let mut result = Vec::with_capacity(3);
17041704
let grouping = grouping_set(vec![vec![col("a"), col("b")], vec![col("c")]]);
1705-
let schema = DFSchema::from_unqualifed_fields(
1705+
let schema = DFSchema::from_unqualified_fields(
17061706
vec![
17071707
Field::new("a", DataType::Int32, false),
17081708
Field::new("b", DataType::Int32, false),
@@ -1721,7 +1721,7 @@ mod test {
17211721
fn test_extract_expressions_from_grouping_set_with_identical_expr() -> Result<()> {
17221722
let mut result = Vec::with_capacity(2);
17231723
let grouping = grouping_set(vec![vec![col("a"), col("b")], vec![col("a")]]);
1724-
let schema = DFSchema::from_unqualifed_fields(
1724+
let schema = DFSchema::from_unqualified_fields(
17251725
vec![
17261726
Field::new("a", DataType::Int32, false),
17271727
Field::new("b", DataType::Int32, false),
@@ -1790,7 +1790,7 @@ mod test {
17901790
#[test]
17911791
fn test_extract_expressions_from_col() -> Result<()> {
17921792
let mut result = Vec::with_capacity(1);
1793-
let schema = DFSchema::from_unqualifed_fields(
1793+
let schema = DFSchema::from_unqualified_fields(
17941794
vec![Field::new("a", DataType::Int32, false)].into(),
17951795
HashMap::default(),
17961796
)?;

‎datafusion/optimizer/src/propagate_empty_relation.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ mod tests {
578578

579579
let empty = LogicalPlan::EmptyRelation(EmptyRelation {
580580
produce_one_row: false,
581-
schema: Arc::new(DFSchema::from_unqualifed_fields(
581+
schema: Arc::new(DFSchema::from_unqualified_fields(
582582
fields.into(),
583583
Default::default(),
584584
)?),

0 commit comments

Comments
 (0)