Fix logical merge conflict in apache#1588 (apache#1678)

tustvold · web-flow · commit e02869a5b439 · 2022-05-09T06:47:28.000-04:00
diff --git a/parquet/src/arrow/array_reader/list_array.rs b/parquet/src/arrow/array_reader/list_array.rs
@@ -260,7 +260,7 @@ mod tests {
         item_nullable: bool,
     ) -> ArrowType {
         let field = Box::new(Field::new("item", data_type, item_nullable));
-        match OffsetSize::is_large() {
+        match OffsetSize::IS_LARGE {
             true => ArrowType::LargeList(field),
             false => ArrowType::List(field),
         }

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ mod tests {`
`260`	`260`	`item_nullable: bool,`
`261`	`261`	`) -> ArrowType {`
`262`	`262`	`let field = Box::new(Field::new("item", data_type, item_nullable));`
`263`		`- match OffsetSize::is_large() {`
	`263`	`+ match OffsetSize::IS_LARGE {`
`264`	`264`	`true => ArrowType::LargeList(field),`
`265`	`265`	`false => ArrowType::List(field),`
`266`	`266`	`}`