fix tsan fail in unit test JoinExecutorTestRunner.MultiJoin (pingca…

…p#6770) close pingcap#6765
guo-shaoge · Feb 10, 2023 · 76e725e · 76e725e
1 parent c6493d4
commit 76e725e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/dbms/src/Interpreters/Join.cpp b/dbms/src/Interpreters/Join.cpp
@@ -2136,6 +2136,7 @@ bool Join::needReturnNonJoinedData() const
 
 void Join::joinTotals(Block & block) const
 {
+    std::shared_lock lock(rwlock);
     Block totals_without_keys = totals;
 
     if (totals_without_keys)

diff --git a/dbms/src/Interpreters/Join.h b/dbms/src/Interpreters/Join.h
@@ -122,8 +122,16 @@ class Join
 
     /** Keep "totals" (separate part of dataset, see WITH TOTALS) to use later.
       */
-    void setTotals(const Block & block) { totals = block; }
-    bool hasTotals() const { return static_cast<bool>(totals); };
+    void setTotals(const Block & block)
+    {
+        std::unique_lock lock(rwlock);
+        totals = block;
+    }
+    bool hasTotals() const
+    {
+        std::shared_lock lock(rwlock);
+        return static_cast<bool>(totals);
+    };
 
     void joinTotals(Block & block) const;