Merge remote-tracking branch 'upstream/master' into ncb/check-for-h3-column

base/daemon/BaseDaemon.cpp

@@ -50,7 +50,6 @@
 #include <Common/SymbolIndex.h>
 #include <Common/getExecutablePath.h>
 #include <Common/getHashOfLoadedBinary.h>
-#include <Common/setThreadName.h>
 #include <Common/Elf.h>
 #include <Common/setThreadName.h>
 #include <filesystem>

src/Processors/QueryPlan/ReadFromMergeTree.cpp

@@ -22,6 +22,7 @@
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
 #include <Storages/MergeTree/MergeTreeReadPool.h>
 #include <Storages/VirtualColumnUtils.h>
+#include <IO/Operators.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <base/logger_useful.h>

src/Storages/LiveView/StorageBlocks.h

@@ -52,7 +52,6 @@ public:
     }
 
 private:
-    Block res_block;
     Pipes pipes;
     QueryProcessingStage::Enum to_stage;
 };

website/templates/company/team.html

@@ -99,6 +99,19 @@
                     {{ _('Software Engineer') }}
                 </p>
 
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/ryadh/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/ryadh-dahimene.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Ryadh Dahimene') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Consulting Architect') }}
+                </p>
+
             </div>
             <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
 
@@ -203,6 +216,19 @@
                     {{ _('Account Executive, AMER') }}
                 </p>
 
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/yossi-kahlon-a7a5693/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/yossi-kahlon.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Yossi Kahlon') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Director, Engineering - Control Plane') }}
+                </p>
+
             </div>
             <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">