Fix crash when select count(*) from table with delta delete (facebook…

…incubator#9984) Summary: Pull Request resolved: facebookincubator#9984 Differential Revision: D57970942
Yuhta · May 30, 2024 · 40e7262 · 40e7262
1 parent 0dc4633
commit 40e7262
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/velox/dwio/common/Mutation.h b/velox/dwio/common/Mutation.h
@@ -29,4 +29,8 @@ struct Mutation {
   random::RandomSkipTracker* randomSkip = nullptr;
 };
 
+inline bool hasDeletion(const Mutation* mutation) {
+  return mutation && (mutation->deletedRows || mutation->randomSkip);
+}
+
 } // namespace facebook::velox::dwio::common
diff --git a/velox/dwio/common/Reader.cpp b/velox/dwio/common/Reader.cpp
@@ -205,7 +205,7 @@ void RowReader::readWithRowNumber(
     flatRowNum = rowNumVector->asUnchecked<FlatVector<int64_t>>();
   }
   auto* rawRowNum = flatRowNum->mutableRawValues();
-  if (numChildren == 0 && !mutation) {
+  if (numChildren == 0 && !hasDeletion(mutation)) {
     VELOX_DCHECK_EQ(rowsToRead, result->size());
     std::iota(rawRowNum, rawRowNum + rowsToRead, previousRow);
   } else {

diff --git a/velox/dwio/common/SelectiveStructColumnReader.cpp b/velox/dwio/common/SelectiveStructColumnReader.cpp
@@ -83,8 +83,10 @@ void SelectiveStructColumnReaderBase::next(
     VectorPtr& result,
     const Mutation* mutation) {
   process::TraceContext trace("SelectiveStructColumnReaderBase::next");
+  mutation_ = mutation;
+  hasMutation_ = hasDeletion(mutation);
   if (children_.empty()) {
-    if (mutation) {
+    if (hasMutation_) {
       if (fillMutatedOutputRows_) {
         fillOutputRowsFromMutation(numValues);
         numValues = outputRows_.size();
@@ -121,8 +123,6 @@ void SelectiveStructColumnReaderBase::next(
   if (numValues > oldSize) {
     std::iota(&rows_[oldSize], &rows_[rows_.size()], oldSize);
   }
-  mutation_ = mutation;
-  hasMutation_ = mutation && (mutation->deletedRows || mutation->randomSkip);
   read(readOffset_, rows_, nullptr);
   getValues(outputRows(), &result);
 }