[FLASH-1131] Proxy merge tikv 3.1 & Support raft cmd AdminCmdType::Sp…

…lit (#665) (#667) - Proxy merge pingcap/release-3.1 until (tikv#7543) - Raft cmd `AdminCmdType::Split` has been deprecated but it was reused in latest tikv. issue tikv/tikv#7653 Signed-off-by: Tong Zhigao <[email protected]>
pingcap · Apr 26, 2020 · 2d30a83 · 2d30a83
1 parent c102a62
commit 2d30a83
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy
diff --git a/dbms/src/Storages/Transaction/Region.cpp b/dbms/src/Storages/Transaction/Region.cpp
@@ -303,6 +303,7 @@ void RegionRaftCommandDelegate::handleAdminRaftCmd(const raft_cmdpb::AdminReques
 
             break;
         }
+        case raft_cmdpb::AdminCmdType::Split:
         case raft_cmdpb::AdminCmdType::BatchSplit:
         {
             result.ori_region_range = meta.makeRaftCommandDelegate().regionState().getRange();

diff --git a/release-centos7/build/build-tiflash-ci.sh b/release-centos7/build/build-tiflash-ci.sh
@@ -41,7 +41,7 @@ mkdir -p ${SRCPATH}/libs/libtiflash-proxy
 # upload: curl -F builds/pingcap/tiflash-proxy/{commit-hash}/libtiflash_proxy.so=@libtiflash_proxy.so http://fileserver.pingcap.net/upload
 
 curl -o "${SRCPATH}/libs/libtiflash-proxy/libtiflash_proxy.so" \
-http://fileserver.pingcap.net/download/builds/pingcap/tiflash-proxy/3b0917ef6237e7321cf202b9c586139c9a4061d9/libtiflash_proxy.so
+http://fileserver.pingcap.net/download/builds/pingcap/tiflash-proxy/146b2b417dd15b9ad6ae877fca3e0469b3a91829/libtiflash_proxy.so
 chmod 0731 "${SRCPATH}/libs/libtiflash-proxy/libtiflash_proxy.so"
 
 build_dir="$SRCPATH/release-centos7/build-release"
+6 −0		CHANGELOG.md
+2 −2		Cargo.lock
+2 −0		components/tikv_util/src/future_pool/builder.rs
+7 −0		components/tikv_util/src/future_pool/metrics.rs
+16 −3		components/tikv_util/src/future_pool/mod.rs
+28 −15		src/coprocessor/endpoint.rs
+0 −135		src/coprocessor/local_metrics.rs
+7 −0		src/coprocessor/metrics.rs
+0 −1		src/coprocessor/mod.rs
+4 −0		src/coprocessor/readpool_impl.rs
+71 −13		src/coprocessor/tracker.rs
+15 −12		src/raftstore/store/fsm/apply.rs
+9 −3		src/raftstore/store/fsm/store.rs
+1 −1		src/server/raft_client.rs
+93 −0		tests/integrations/raftstore/test_merge.rs
-Original file line number
+Diff line change
@@ Expand Up @@
                 break;
             }
+            case raft_cmdpb::AdminCmdType::Split:
             case raft_cmdpb::AdminCmdType::BatchSplit:
             {
                 result.ori_region_range = meta.makeRaftCommandDelegate().regionState().getRange();
@@ Expand Down @@