Merge remote-tracking branch 'upstream/master' into new-proxy-tikv-se…

…rver
pingcap · Jul 12, 2022 · 8443892 · 8443892
2 parents 389badd + 34d7570
commit 8443892
Show file tree

Hide file tree

Showing 67 changed files with 2,460 additions and 958 deletions.
diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Check License Header
-        uses: apache/skywalking-eyes@main
+        uses: apache/skywalking-eyes@v0.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -239,10 +239,8 @@ else ()
     set (CMAKE_CXX_STANDARD_REQUIRED ON)
 endif ()
 
-if (NOT ARCH_ARM)
-    set (CMAKE_CXX_FLAGS_RELWITHDEBINFO      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")
-    set (CMAKE_C_FLAGS_RELWITHDEBINFO        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3")
-endif ()
+set (CMAKE_CXX_FLAGS_RELWITHDEBINFO      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")
+set (CMAKE_C_FLAGS_RELWITHDEBINFO        "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3")
 
 option (DEBUG_WITHOUT_DEBUG_INFO "Set to ON to build dev target without debug info (remove flag `-g` in order to accelerate compiling speed and reduce target binary size)" OFF)
 if (DEBUG_WITHOUT_DEBUG_INFO)

diff --git a/contrib/kvproto b/contrib/kvproto
diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy
diff --git a/contrib/tipb b/contrib/tipb
diff --git a/dbms/src/Common/MPMCQueue.h b/dbms/src/Common/MPMCQueue.h
@@ -15,6 +15,7 @@
 #pragma once
 
 #include <Common/SimpleIntrusiveNode.h>
+#include <Common/nocopyable.h>
 #include <common/defines.h>
 #include <common/types.h>
 
@@ -74,6 +75,11 @@ class MPMCQueue
             destruct(getObj(read_pos));
     }
 
+    // Cannot to use copy/move constructor,
+    // because MPMCQueue maybe used by different threads.
+    // Copy and move it is dangerous.
+    DISALLOW_COPY_AND_MOVE(MPMCQueue);
+
     /// Block until:
     /// 1. Pop succeeds with a valid T: return true.
     /// 2. The queue is cancelled or finished: return false.

diff --git a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp
@@ -24,7 +24,7 @@ namespace DB
 {
 ParallelAggregatingBlockInputStream::ParallelAggregatingBlockInputStream(
     const BlockInputStreams & inputs,
-    const BlockInputStreamPtr & additional_input_at_end,
+    const BlockInputStreams & additional_inputs_at_end,
     const Aggregator::Params & params_,
     const FileProviderPtr & file_provider_,
     bool final_,
@@ -41,11 +41,10 @@ ParallelAggregatingBlockInputStream::ParallelAggregatingBlockInputStream(
     , keys_size(params.keys_size)
     , aggregates_size(params.aggregates_size)
     , handler(*this)
-    , processor(inputs, additional_input_at_end, max_threads, handler, log)
+    , processor(inputs, additional_inputs_at_end, max_threads, handler, log)
 {
     children = inputs;
-    if (additional_input_at_end)
-        children.push_back(additional_input_at_end);
+    children.insert(children.end(), additional_inputs_at_end.begin(), additional_inputs_at_end.end());
 }
 
 

diff --git a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h
@@ -36,7 +36,7 @@ class ParallelAggregatingBlockInputStream : public IProfilingBlockInputStream
       */
     ParallelAggregatingBlockInputStream(
         const BlockInputStreams & inputs,
-        const BlockInputStreamPtr & additional_input_at_end,
+        const BlockInputStreams & additional_inputs_at_end,
         const Aggregator::Params & params_,
         const FileProviderPtr & file_provider_,
         bool final_,
+59 −78		pkg/gcpb/gcpb.pb.go
+1,969 −512		pkg/kvrpcpb/kvrpcpb.pb.go
+1,115 −0		pkg/logbackuppb/logbackuppb.pb.go
+148 −38		pkg/mpp/mpp.pb.go
+132 −90		pkg/raft_serverpb/raft_serverpb.pb.go
+1 −1		proto/gcpb.proto
+80 −4		proto/kvrpcpb.proto
+43 −0		proto/logbackuppb.proto
+1 −0		proto/mpp.proto
+3 −0		proto/raft_serverpb.proto
+0 −1		Cargo.lock
+1 −1		components/proxy_server/Cargo.toml
+3 −0		components/proxy_server/src/config.rs
+3 −2		components/proxy_server/src/lib.rs
+7 −3		components/proxy_server/src/proxy.rs
+4 −5		components/proxy_server/src/run.rs
+102 −0		components/proxy_server/src/setup.rs
+1 −1		components/proxy_server/src/util.rs
+2 −0		components/raftstore/src/engine_store_ffi/mod.rs
+2 −0		components/raftstore/src/engine_store_ffi/observer.rs
+2 −0		components/raftstore/src/engine_store_ffi/read_index_helper.rs
+2 −0		components/raftstore/src/engine_store_ffi/utils.rs
+0 −1		components/server/src/lib.rs
+1 −1		mock-engine-store/Cargo.toml
+21 −0		mock-engine-store/src/lib.rs
+1 −2		new-mock-engine-store/Cargo.toml
+1 −1		new-mock-engine-store/src/config.rs
+21 −0		new-mock-engine-store/src/lib.rs
+4 −2		new-mock-engine-store/src/mock_cluster.rs
+1 −1		new-mock-engine-store/src/node.rs
+1 −1		new-mock-engine-store/src/transport_simulate.rs
+1 −1		tests/Cargo.toml
+5 −7		tests/proxy/normal.rs
+2 −2		tests/proxy/proxy.rs
+7 −0		go-tipb/analyze.pb.go
+213 −143		go-tipb/executor.pb.go
+2,493 −0		go-tipb/explain.pb.go
+371 −317		go-tipb/expression.pb.go
+2 −0		proto/executor.proto
+106 −0		proto/explain.proto
+16 −0		proto/expression.proto