@@ -268,10 +268,9 @@ Result<std::shared_ptr<Table>> Table::Make(std::shared_ptr<Schema> schema,
268268 return Status::Invalid (" Schema and columns have different number of fields: " ,
269269 schema->num_fields (), " vs " , columns.size ());
270270 }
271- for (const auto & column : columns) {
272- if (column == nullptr ) {
273- return Status::Invalid (" Column should not be null" );
274- }
271+ if (std::any_of (columns.begin (), columns.end (),
272+ [](const auto & column) { return !column; })) {
273+ return Status::Invalid (" Column should not be null" );
275274 }
276275 return std::make_shared<SimpleTable>(std::move (schema), std::move (columns), num_rows);
277276}
@@ -283,10 +282,9 @@ Result<std::shared_ptr<Table>> Table::Make(std::shared_ptr<Schema> schema,
283282 return Status::Invalid (" Schema and arrays have different number of fields: " ,
284283 schema->num_fields (), " vs " , arrays.size ());
285284 }
286- for (const auto & array : arrays) {
287- if (array == nullptr ) {
288- return Status::Invalid (" Array should not be null" );
289- }
285+ if (std::any_of (arrays.begin (), arrays.end (),
286+ [](const auto & array) { return !array; })) {
287+ return Status::Invalid (" Array should not be null" );
290288 }
291289 return std::make_shared<SimpleTable>(std::move (schema), arrays, num_rows);
292290}
0 commit comments