Add column name to validation error message, check for null, per apac…

…he#16
wesm · Mar 19, 2016 · 4d9adf6 · 4d9adf6
1 parent d350139
commit 4d9adf6
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/cpp/src/arrow/table.cc b/cpp/src/arrow/table.cc
@@ -57,16 +57,19 @@ Status Table::ValidateColumns() const {
     return Status::Invalid("Number of columns did not match schema");
   }
 
-  if (columns_.size() == 0) {
-    return Status::OK();
-  }
-
   // Make sure columns are all the same length
   for (size_t i = 0; i < columns_.size(); ++i) {
     const Column* col = columns_[i].get();
+    if (col == nullptr) {
+      std::stringstream ss;
+      ss << "Column " << i << " named " << col->name()
+         << " was null";
+      return Status::Invalid(ss.str());
+    }
     if (col->length() != num_rows_) {
       std::stringstream ss;
-      ss << "Column " << i << " expected length "
+      ss << "Column " << i << " named " << col->name()
+         << " expected length "
          << num_rows_
          << " but got length "
          << col->length();