Skip to content

Commit 3ec13dc

Browse files
author
kontinuation
committed
test(rust/sedona-raster-gdal): update raster array helpers
1 parent 41a02b0 commit 3ec13dc

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

rust/sedona-raster-gdal/benches/rs_as_raster.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fn raster_array(rows: usize) -> ArrayRef {
5454
if rows == 1 {
5555
Arc::new(raster)
5656
} else {
57-
let raster_struct = RasterStructArray::new(&raster);
57+
let raster_struct = RasterStructArray::try_new(&raster).unwrap();
5858
let raster_ref = raster_struct.get(0).unwrap();
5959
let mut builder = RasterBuilder::new(rows);
6060
for _ in 0..rows {
@@ -76,7 +76,7 @@ fn raster_array(rows: usize) -> ArrayRef {
7676
fn geometry_array(rows: usize) -> ArrayRef {
7777
let polygon = with_global_gdal(|_gdal| {
7878
let raster = base_raster();
79-
let raster_struct = RasterStructArray::new(&raster);
79+
let raster_struct = RasterStructArray::try_new(&raster).unwrap();
8080
let raster = raster_struct.get(0).unwrap();
8181
let md = raster.metadata();
8282
format!(

rust/sedona-raster-gdal/src/rs_as_raster.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ where
586586
.ok_or_else(|| {
587587
sedona_internal_datafusion_err!("Expected StructArray for raster data")
588588
})?;
589-
let raster_array = RasterStructArray::new(raster_struct);
589+
let raster_array = RasterStructArray::try_new(raster_struct)?;
590590

591591
for i in 0..num_iterations {
592592
if raster_array.is_null(i) {
@@ -600,7 +600,7 @@ where
600600
Ok(())
601601
}
602602
ColumnarValue::Scalar(ScalarValue::Struct(raster_struct)) => {
603-
let raster_array = RasterStructArray::new(raster_struct.as_ref());
603+
let raster_array = RasterStructArray::try_new(raster_struct.as_ref())?;
604604
let raster = if raster_array.is_null(0) {
605605
None
606606
} else {
@@ -660,7 +660,7 @@ mod tests {
660660

661661
fn load_reference_raster() -> RasterMetadata {
662662
let raster_array = reference_raster_spec().build();
663-
let raster_struct = RasterStructArray::new(&raster_array);
663+
let raster_struct = RasterStructArray::try_new(&raster_array).unwrap();
664664
raster_struct.get(0).unwrap().metadata()
665665
}
666666

@@ -681,7 +681,7 @@ mod tests {
681681
fn test_rs_as_raster_use_reference_extent() {
682682
let raster_array = reference_raster_spec().build();
683683
with_gdal(|gdal| {
684-
let raster_struct = RasterStructArray::new(&raster_array);
684+
let raster_struct = RasterStructArray::try_new(&raster_array).unwrap();
685685
let raster = raster_struct.get(0).unwrap();
686686
let md = raster.metadata();
687687

@@ -719,7 +719,7 @@ mod tests {
719719
fn test_rs_as_raster_use_geometry_extent() {
720720
let raster_array = reference_raster_spec().build();
721721
with_gdal(|gdal| {
722-
let raster_struct = RasterStructArray::new(&raster_array);
722+
let raster_struct = RasterStructArray::try_new(&raster_array).unwrap();
723723
let raster = raster_struct.get(0).unwrap();
724724
let md = raster.metadata();
725725

0 commit comments

Comments
 (0)