Use Operator::finish() instead of setting isFinishing_ flag directly (#…

…15) Summary: Pull Request resolved: #15 Reviewed By: kgpai Differential Revision: D30231266 Pulled By: mbasmanova fbshipit-source-id: cb1d6d7b0923585753f19ddff458116036646f14
facebookincubator · Aug 10, 2021 · 7708357 · 7708357
1 parent e7cb24e
commit 7708357
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/velox/exec/OrderBy.cpp b/velox/exec/OrderBy.cpp
@@ -57,9 +57,10 @@ void OrderBy::addInput(RowVectorPtr input) {
 }
 
 void OrderBy::finish() {
+  Operator::finish();
+
   // No data.
   if (numRows_ == 0) {
-    isFinishing_ = true;
     finished_ = true;
     return;
   }
@@ -87,8 +88,6 @@ void OrderBy::finish() {
         }
         return false; // lhs == rhs.
       });
-
-  isFinishing_ = true;
 }
 
 RowVectorPtr OrderBy::getOutput() {

diff --git a/velox/exec/TableScan.h b/velox/exec/TableScan.h
@@ -37,7 +37,7 @@ class TableScan : public SourceOperator {
   }
 
   void finish() override {
-    isFinishing_ = true;
+    Operator::finish();
     close();
   }
 

diff --git a/velox/exec/TableWriter.h b/velox/exec/TableWriter.h
@@ -37,7 +37,7 @@ class TableWriter : public Operator {
   void addInput(RowVectorPtr input) override;
 
   void finish() override {
-    isFinishing_ = true;
+    Operator::finish();
     close();
   }
 

diff --git a/velox/exec/TopN.cpp b/velox/exec/TopN.cpp
@@ -111,8 +111,8 @@ RowVectorPtr TopN::getOutput() {
 }
 
 void TopN::finish() {
+  Operator::finish();
   if (topRows_.empty()) {
-    isFinishing_ = true;
     finished_ = true;
     return;
   }
@@ -121,6 +121,5 @@ void TopN::finish() {
     rows_[i - 1] = topRows_.top();
     topRows_.pop();
   }
-  isFinishing_ = true;
 }
 } // namespace facebook::velox::exec
diff --git a/velox/exec/Values.h b/velox/exec/Values.h
@@ -30,7 +30,7 @@ class Values : public SourceOperator {
   }
 
   void finish() override {
-    isFinishing_ = true;
+    Operator::finish();
     close();
   }