commit 6f40de650a9748d97ba6e3c79e1b8ef2192ce45b
author ZongtianHou <houzongtian@outlook.com> Tue Nov 24 11:51:02 2020 +0800
committer ZongtianHou <houzongtian@outlook.com> Tue Nov 24 13:40:57 2020 +0800
tree f57857449ca81a5e99e8b0c9d161f3f7a8790daa
parent 6cb439a19f3445dafc605ce6acfd3643053e7a7a

HAWQ-1773. fix orc type check for null orc file

depends/storage/src/storage/format/orc/orc-format-reader.cc

diff --git a/depends/storage/src/storage/format/orc/orc-format-reader.cc b/depends/storage/src/storage/format/orc/orc-format-reader.cc
index de42e8a..0f71718 100644
--- a/depends/storage/src/storage/format/orc/orc-format-reader.cc
+++ b/depends/storage/src/storage/format/orc/orc-format-reader.cc
@@ -97,16 +97,18 @@
   if (batch == nullptr) {
     batch = orcReader->createRowBatch(this->nTuplesPerBatch);
     // do type check
-    const dbcommon::TupleDesc *td = opts.getTupleDesc();
-    orc::StructVectorBatch *structBatch =
-        dynamic_cast<orc::StructVectorBatch *>(batch.get());
-    std::vector<orc::ColumnVectorBatch *>::iterator it =
-        structBatch->fields.begin();
-    int32_t nCols = columnsToRead != nullptr ? columnsToRead->size()
-                                             : structBatch->fields.size();
-    for (auto colIdx = 0; colIdx < nCols; ++colIdx) {
-      if (columnsToRead && !columnsToRead->at(colIdx)) continue;
-      typeCheck(td->getColumnType(colIdx), td->getColumnName(colIdx), *it++);
+    if (batch) {
+      const dbcommon::TupleDesc *td = opts.getTupleDesc();
+      orc::StructVectorBatch *structBatch =
+          dynamic_cast<orc::StructVectorBatch *>(batch.get());
+      std::vector<orc::ColumnVectorBatch *>::iterator it =
+          structBatch->fields.begin();
+      int32_t nCols = columnsToRead != nullptr ? columnsToRead->size()
+                                               : structBatch->fields.size();
+      for (auto colIdx = 0; colIdx < nCols; ++colIdx) {
+        if (columnsToRead && !columnsToRead->at(colIdx)) continue;
+        typeCheck(td->getColumnType(colIdx), td->getColumnName(colIdx), *it++);
+      }
     }
   }
 }