Fix rebase error

facebookincubator · Sep 27, 2024 · 69a29bb · 69a29bb
1 parent d6f02db
commit 69a29bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/velox/exec/HashBuild.cpp b/velox/exec/HashBuild.cpp
@@ -407,12 +407,12 @@ void HashBuild::addInput(RowVectorPtr input) {
           *lookup_,
           input,
           activeRows_,
-          false,
           BaseHashTable::kNoSpillInputStartPartitionBit);
       if (lookup_->rows.empty()) {
         return;
       }
-      table_->groupProbe(*lookup_);
+      table_->groupProbe(
+          *lookup_, BaseHashTable::kNoSpillInputStartPartitionBit);
       return;
     }
   }
@@ -808,7 +808,7 @@ bool HashBuild::finishHashBuild() {
                            : BaseHashTable::kNoSpillInputStartPartitionBit,
         allowParallelJoinBuild ? operatorCtx_->task()->queryCtx()->executor()
                                : nullptr,
-        dropDuplicates_,);
+        dropDuplicates_);
   }
   stats_.wlock()->addRuntimeStat(
       BaseHashTable::kBuildWallNanos,

diff --git a/velox/exec/HashTable.cpp b/velox/exec/HashTable.cpp
@@ -1746,7 +1746,7 @@ void HashTable<ignoreNullKeys>::prepareJoinTable(
     // Call analyze to insert all unique values in row container to the
     // table hashers' uniqueValues_;
     if (!analyze()) {
-      setHashMode(HashMode::kHash, 0);
+      setHashMode(HashMode::kHash, 0, spillInputStartPartitionBit);
     }
   }
   otherTables_.reserve(tables.size());
@@ -1782,7 +1782,7 @@ void HashTable<ignoreNullKeys>::prepareJoinTable(
           // Before merging with the current hashers, all values in the row
           // containers of other table need to be inserted into uniqueValues_.
           if (!other->analyze()) {
-            other->setHashMode(HashMode::kHash, 0);
+            other->setHashMode(HashMode::kHash, 0, spillInputStartPartitionBit);
             useValueIds = false;
             break;
           }