Merge branch 'master' into qualified_table_column_in_test

pingcap · Aug 16, 2022 · f9f4141 · f9f4141
2 parents 8504906 + a89c8b6
commit f9f4141
Show file tree

Hide file tree

Showing 58 changed files with 569 additions and 5,311 deletions.
diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy
diff --git a/dbms/src/DataStreams/IProfilingBlockInputStream.h b/dbms/src/DataStreams/IProfilingBlockInputStream.h
@@ -54,7 +54,7 @@ class IProfilingBlockInputStream : public IBlockInputStream
 
     Block read() override final;
 
-    Block read(FilterPtr & res_filter, bool return_filter) override final;
+    Block read(FilterPtr & res_filter, bool return_filter) override;
 
     /** The default implementation calls readPrefixImpl() on itself, and then readPrefix() recursively for all children.
       * There are cases when you do not want `readPrefix` of children to be called synchronously, in this function,

diff --git a/dbms/src/DataStreams/SharedQueryBlockInputStream.h b/dbms/src/DataStreams/SharedQueryBlockInputStream.h
@@ -112,7 +112,10 @@ class SharedQueryBlockInputStream : public IProfilingBlockInputStream
     }
 
 protected:
-    Block readImpl() override
+    /// The BlockStreamProfileInfo of SharedQuery is useless,
+    /// and it will trigger tsan UT fail because of data race.
+    /// So overriding method `read` here.
+    Block read(FilterPtr &, bool) override
     {
         std::unique_lock lock(mutex);
 
@@ -134,6 +137,10 @@ class SharedQueryBlockInputStream : public IProfilingBlockInputStream
 
         return block;
     }
+    Block readImpl() override
+    {
+        throw Exception("Unsupport");
+    }
 
     void fetchBlocks()
     {

diff --git a/dbms/src/Databases/DatabaseDictionary.cpp b/dbms/src/Databases/DatabaseDictionary.cpp
diff --git a/dbms/src/Databases/DatabaseDictionary.h b/dbms/src/Databases/DatabaseDictionary.h