Merge pull request #50 from MarcoGorelli/preserve-name-for-field

preserve name in lazy schema tests
MarcoGorelli · Sep 14, 2024 · 93eeb7a · 93eeb7a
2 parents a93186d + 5f57a55
commit 93eeb7a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/docs/lists_in_lists_out.md b/docs/lists_in_lists_out.md
@@ -36,8 +36,8 @@ a function to each element of a List Series. In this case, we just want to find
 elements, so we'll do:
 
 ```rust
-fn list_idx_dtype(_input_fields: &[Field]) -> PolarsResult<Field> {
-    let field = Field::new(PlSmallStr::EMPTY, DataType::List(Box::new(IDX_DTYPE)));
+fn list_idx_dtype(input_fields: &[Field]) -> PolarsResult<Field> {
+    let field = Field::new(input_fields[0].name.clone(), DataType::List(Box::new(IDX_DTYPE)));
     Ok(field.clone())
 }
 

diff --git a/docs/struct.md b/docs/struct.md
@@ -37,14 +37,15 @@ fn shifted_struct(input_fields: &[Field]) -> PolarsResult<Field> {
     match field.dtype() {
         DataType::Struct(fields) => {
             let mut field_0 = fields[0].clone();
+            let name = field_0.name.clone();
             field_0.set_name(fields[fields.len() - 1].name().clone());
             let mut fields = fields[1..]
                 .iter()
                 .zip(fields[0..fields.len() - 1].iter())
                 .map(|(fld, name)| Field::new(name.name().clone(), fld.dtype().clone()))
                 .collect::<Vec<_>>();
             fields.push(field_0);
-            Ok(Field::new(PlSmallStr::EMPTY, DataType::Struct(fields)))
+            Ok(Field::new(name, DataType::Struct(fields)))
         }
         _ => unreachable!(),
     }
@@ -67,7 +68,8 @@ fn shift_struct(inputs: &[Series]) -> PolarsResult<Series> {
         return Ok(inputs[0].clone());
     }
     let mut field_0 = fields[0].clone();
-    field_0.rename(fields[fields.len() - 1].name()).clone();
+    let name = field_0.name().clone();
+    field_0.rename(fields[fields.len() - 1].name().clone());
     let mut fields = fields[1..]
         .iter()
         .zip(fields[..fields.len() - 1].iter())
@@ -78,7 +80,7 @@ fn shift_struct(inputs: &[Series]) -> PolarsResult<Series> {
         })
         .collect::<Vec<_>>();
     fields.push(field_0);
-    StructChunked::from_series(PlSmallStr::EMPTY, &fields).map(|ca| ca.into_series())
+    StructChunked::from_series(name, &fields).map(|ca| ca.into_series())
 }
 ```
 

diff --git a/src/expressions.rs b/src/expressions.rs
@@ -241,14 +241,15 @@ fn shifted_struct(input_fields: &[Field]) -> PolarsResult<Field> {
     match field.dtype() {
         DataType::Struct(fields) => {
             let mut field_0 = fields[0].clone();
+            let name = field_0.name.clone();
             field_0.set_name(fields[fields.len() - 1].name().clone());
             let mut fields = fields[1..]
                 .iter()
                 .zip(fields[0..fields.len() - 1].iter())
                 .map(|(fld, name)| Field::new(name.name().clone(), fld.dtype().clone()))
                 .collect::<Vec<_>>();
             fields.push(field_0);
-            Ok(Field::new(PlSmallStr::EMPTY, DataType::Struct(fields)))
+            Ok(Field::new(name, DataType::Struct(fields)))
         },
         _ => unreachable!(),
     }
@@ -262,6 +263,7 @@ fn shift_struct(inputs: &[Series]) -> PolarsResult<Series> {
         return Ok(inputs[0].clone());
     }
     let mut field_0 = fields[0].clone();
+    let name = field_0.name().clone();
     field_0.rename(fields[fields.len() - 1].name().clone());
     let mut fields = fields[1..]
         .iter()
@@ -273,7 +275,7 @@ fn shift_struct(inputs: &[Series]) -> PolarsResult<Series> {
         })
         .collect::<Vec<_>>();
     fields.push(field_0);
-    StructChunked::from_series(PlSmallStr::EMPTY, &fields).map(|ca| ca.into_series())
+    StructChunked::from_series(name, &fields).map(|ca| ca.into_series())
 }
 
 use reverse_geocoder::ReverseGeocoder;
@@ -290,8 +292,8 @@ fn reverse_geocode(inputs: &[Series]) -> PolarsResult<Series> {
     Ok(out.into_series())
 }
 
-fn list_idx_dtype(_input_fields: &[Field]) -> PolarsResult<Field> {
-    let field = Field::new(PlSmallStr::EMPTY, DataType::List(Box::new(IDX_DTYPE)));
+fn list_idx_dtype(input_fields: &[Field]) -> PolarsResult<Field> {
+    let field = Field::new(input_fields[0].name.clone(), DataType::List(Box::new(IDX_DTYPE)));
     Ok(field.clone())
 }