paleolimbot commented on code in PR #559:
URL: https://github.com/apache/sedona-db/pull/559#discussion_r2742364611
##########
rust/sedona-raster-functions/src/rs_rastercoordinate.rs:
##########
@@ -368,4 +371,108 @@ mod tests {
.unwrap();
assert_array_equal(&result, &expected);
}
+
+ #[rstest]
+ fn udf_invoke_xy_with_scalar_raster_array_coords(#[values(Coord::Y,
Coord::X)] coord: Coord) {
+ let udf = match coord {
+ Coord::X => rs_worldtorastercoordx_udf(),
+ Coord::Y => rs_worldtorastercoordy_udf(),
+ };
+ let tester = ScalarUdfTester::new(
+ udf.into(),
+ vec![
+ RASTER,
+ SedonaType::Arrow(DataType::Float64),
+ SedonaType::Arrow(DataType::Float64),
+ ],
+ );
+
+ // Use raster 1 (invertible) as scalar.
+ let rasters = generate_test_rasters(2, Some(0)).unwrap();
+ let raster_struct =
rasters.as_any().downcast_ref::<StructArray>().unwrap();
+ let raster_struct_one = raster_struct
+ .slice(1, 1)
+ .as_any()
+ .downcast_ref::<StructArray>()
+ .unwrap()
+ .clone();
+ let scalar_raster = ScalarValue::Struct(Arc::new(raster_struct_one));
+
+ let world_x = Arc::new(arrow_array::Float64Array::from(vec![2.0, 2.0,
2.0]));
+ let world_y = Arc::new(arrow_array::Float64Array::from(vec![3.0, 3.0,
3.0]));
+
+ let result = tester
+ .invoke(vec![
+ ColumnarValue::Scalar(scalar_raster),
+ ColumnarValue::Array(world_x),
+ ColumnarValue::Array(world_y),
+ ])
+ .unwrap();
+
+ let array = match result {
+ ColumnarValue::Array(array) => array,
+ ColumnarValue::Scalar(_) => panic!("Expected array result"),
+ };
+
+ let int_array = array
+ .as_any()
+ .downcast_ref::<arrow_array::Int64Array>()
+ .expect("Expected Int64Array");
+ assert_eq!(int_array.len(), 3);
+
+ // At upper-left world coordinate, raster coords should be (0,0).
+ for i in 0..3 {
+ assert!(!int_array.is_null(i));
+ assert_eq!(int_array.value(i), 0_i64);
+ }
Review Comment:
Does this work too?
```suggestion
let expected = create_array!(Int64, [Some(0), Some(0), Some(0)]) as
ArrayRef;
assert_eq!(&array, &expected);
```
##########
rust/sedona-raster-functions/src/rs_rastercoordinate.rs:
##########
@@ -368,4 +371,108 @@ mod tests {
.unwrap();
assert_array_equal(&result, &expected);
}
+
+ #[rstest]
+ fn udf_invoke_xy_with_scalar_raster_array_coords(#[values(Coord::Y,
Coord::X)] coord: Coord) {
+ let udf = match coord {
+ Coord::X => rs_worldtorastercoordx_udf(),
+ Coord::Y => rs_worldtorastercoordy_udf(),
+ };
+ let tester = ScalarUdfTester::new(
+ udf.into(),
+ vec![
+ RASTER,
+ SedonaType::Arrow(DataType::Float64),
+ SedonaType::Arrow(DataType::Float64),
+ ],
+ );
+
+ // Use raster 1 (invertible) as scalar.
+ let rasters = generate_test_rasters(2, Some(0)).unwrap();
+ let raster_struct =
rasters.as_any().downcast_ref::<StructArray>().unwrap();
+ let raster_struct_one = raster_struct
+ .slice(1, 1)
+ .as_any()
+ .downcast_ref::<StructArray>()
+ .unwrap()
+ .clone();
+ let scalar_raster = ScalarValue::Struct(Arc::new(raster_struct_one));
+
+ let world_x = Arc::new(arrow_array::Float64Array::from(vec![2.0, 2.0,
2.0]));
+ let world_y = Arc::new(arrow_array::Float64Array::from(vec![3.0, 3.0,
3.0]));
+
+ let result = tester
+ .invoke(vec![
+ ColumnarValue::Scalar(scalar_raster),
+ ColumnarValue::Array(world_x),
+ ColumnarValue::Array(world_y),
+ ])
+ .unwrap();
+
+ let array = match result {
+ ColumnarValue::Array(array) => array,
+ ColumnarValue::Scalar(_) => panic!("Expected array result"),
+ };
+
+ let int_array = array
+ .as_any()
+ .downcast_ref::<arrow_array::Int64Array>()
+ .expect("Expected Int64Array");
+ assert_eq!(int_array.len(), 3);
+
+ // At upper-left world coordinate, raster coords should be (0,0).
+ for i in 0..3 {
+ assert!(!int_array.is_null(i));
+ assert_eq!(int_array.value(i), 0_i64);
+ }
+ }
+
+ #[test]
+ fn udf_invoke_pt_with_scalar_raster_array_coords() {
+ let udf = rs_worldtorastercoord_udf();
+ let tester = ScalarUdfTester::new(
+ udf.into(),
+ vec![
+ RASTER,
+ SedonaType::Arrow(DataType::Float64),
+ SedonaType::Arrow(DataType::Float64),
+ ],
+ );
+
+ let rasters = generate_test_rasters(2, Some(0)).unwrap();
+ let raster_struct =
rasters.as_any().downcast_ref::<StructArray>().unwrap();
+ let raster_struct_one = raster_struct
+ .slice(1, 1)
+ .as_any()
+ .downcast_ref::<StructArray>()
+ .unwrap()
+ .clone();
+ let scalar_raster = ScalarValue::Struct(Arc::new(raster_struct_one));
+
+ let world_x = Arc::new(arrow_array::Float64Array::from(vec![2.0, 2.0,
2.0]));
+ let world_y = Arc::new(arrow_array::Float64Array::from(vec![3.0, 3.0,
3.0]));
Review Comment:
Same comments as above (I think the scalar raster can be generated more
compactly and probably more than one unique value in the output would be a
better test).
##########
rust/sedona-raster-functions/src/rs_rastercoordinate.rs:
##########
@@ -368,4 +371,108 @@ mod tests {
.unwrap();
assert_array_equal(&result, &expected);
}
+
+ #[rstest]
+ fn udf_invoke_xy_with_scalar_raster_array_coords(#[values(Coord::Y,
Coord::X)] coord: Coord) {
+ let udf = match coord {
+ Coord::X => rs_worldtorastercoordx_udf(),
+ Coord::Y => rs_worldtorastercoordy_udf(),
+ };
+ let tester = ScalarUdfTester::new(
+ udf.into(),
+ vec![
+ RASTER,
+ SedonaType::Arrow(DataType::Float64),
+ SedonaType::Arrow(DataType::Float64),
+ ],
+ );
+
+ // Use raster 1 (invertible) as scalar.
+ let rasters = generate_test_rasters(2, Some(0)).unwrap();
+ let raster_struct =
rasters.as_any().downcast_ref::<StructArray>().unwrap();
+ let raster_struct_one = raster_struct
+ .slice(1, 1)
+ .as_any()
+ .downcast_ref::<StructArray>()
+ .unwrap()
+ .clone();
+ let scalar_raster = ScalarValue::Struct(Arc::new(raster_struct_one));
+
+ let world_x = Arc::new(arrow_array::Float64Array::from(vec![2.0, 2.0,
2.0]));
+ let world_y = Arc::new(arrow_array::Float64Array::from(vec![3.0, 3.0,
3.0]));
Review Comment:
This particular test seems like it might benefit from having >1 unique value
in the input.
##########
rust/sedona-raster-functions/src/rs_rastercoordinate.rs:
##########
@@ -368,4 +371,108 @@ mod tests {
.unwrap();
assert_array_equal(&result, &expected);
}
+
+ #[rstest]
+ fn udf_invoke_xy_with_scalar_raster_array_coords(#[values(Coord::Y,
Coord::X)] coord: Coord) {
+ let udf = match coord {
+ Coord::X => rs_worldtorastercoordx_udf(),
+ Coord::Y => rs_worldtorastercoordy_udf(),
+ };
+ let tester = ScalarUdfTester::new(
+ udf.into(),
+ vec![
+ RASTER,
+ SedonaType::Arrow(DataType::Float64),
+ SedonaType::Arrow(DataType::Float64),
+ ],
+ );
+
+ // Use raster 1 (invertible) as scalar.
+ let rasters = generate_test_rasters(2, Some(0)).unwrap();
+ let raster_struct =
rasters.as_any().downcast_ref::<StructArray>().unwrap();
+ let raster_struct_one = raster_struct
+ .slice(1, 1)
+ .as_any()
+ .downcast_ref::<StructArray>()
+ .unwrap()
+ .clone();
+ let scalar_raster = ScalarValue::Struct(Arc::new(raster_struct_one));
Review Comment:
Does `try_from_array()` work for this?
```suggestion
let raster_struct =
rasters.as_any().downcast_ref::<StructArray>().unwrap();
let scalar_raster = ScalarValue::try_from_array(&raster_struct,
1).unwrap();
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
