This is an automated cherry-pick of #5948

Signed-off-by: ti-chi-bot <[email protected]>
pingcap · Sep 19, 2022 · 83363c2 · 83363c2
1 parent d16dde3
commit 83363c2
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/dbms/src/Storages/DeltaMerge/DeltaIndex.h b/dbms/src/Storages/DeltaMerge/DeltaIndex.h
@@ -145,10 +145,20 @@ class DeltaIndex
 
     String toString()
     {
+<<<<<<< HEAD
         std::stringstream s;
         s << "{placed rows:" << placed_rows << ", deletes:" << placed_deletes << ", delta tree: " << delta_tree->numEntries() << "|"
           << delta_tree->numInserts() << "|" << delta_tree->numDeletes() << "}";
         return s.str();
+=======
+        std::scoped_lock lock(mutex);
+        return fmt::format("<placed_rows={} placed_deletes={} tree_entries={} tree_inserts={} tree_deletes={}>",
+                           placed_rows,
+                           placed_deletes,
+                           delta_tree->numEntries(),
+                           delta_tree->numInserts(),
+                           delta_tree->numDeletes());
+>>>>>>> f01f4b1ad7 (Fix data race of DeltaIndex::toString  (#5948))
     }
 
     UInt64 getId() const { return id; }