From 156c523da14f54eeba0299371668c31720586f17 Mon Sep 17 00:00:00 2001 From: lidezhu <47731263+lidezhu@users.noreply.github.com> Date: Mon, 14 Feb 2022 18:09:38 +0800 Subject: [PATCH 1/3] This is an automated cherry-pick of #4021 Signed-off-by: ti-chi-bot --- dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp b/dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp index 035e832e3a7..d225d28d5c2 100644 --- a/dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp +++ b/dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp @@ -1265,6 +1265,11 @@ void DAGQueryBlockInterpreter::executeRemoteQueryImpl(DAGPipeline & pipeline, dag_req.SerializeToString(&(req->data)); req->tp = pingcap::coprocessor::ReqType::DAG; req->start_ts = context.getSettingsRef().read_tso; +<<<<<<< HEAD +======= + req->schema_version = context.getSettingsRef().schema_version; + bool has_enforce_encode_type = dag_req.has_force_encode_type() && dag_req.force_encode_type(); +>>>>>>> 14c57400d8 (set request schema version when do remote read (#4021)) pingcap::kv::Cluster * cluster = context.getTMTContext().getKVCluster(); pingcap::kv::Backoffer bo(pingcap::kv::copBuildTaskMaxBackoff); From 675b6fcf012accef6c9b47fa7e8f9effae3d7429 Mon Sep 17 00:00:00 2001 From: lidezhu <47731263+lidezhu@users.noreply.github.com> Date: Mon, 14 Feb 2022 18:21:52 +0800 Subject: [PATCH 2/3] Update DAGQueryBlockInterpreter.cpp --- dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp b/dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp index d225d28d5c2..4f8d445b1b8 100644 --- a/dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp +++ b/dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp @@ -1265,11 +1265,7 @@ void DAGQueryBlockInterpreter::executeRemoteQueryImpl(DAGPipeline & pipeline, dag_req.SerializeToString(&(req->data)); req->tp = pingcap::coprocessor::ReqType::DAG; req->start_ts = context.getSettingsRef().read_tso; -<<<<<<< HEAD -======= req->schema_version = context.getSettingsRef().schema_version; - bool has_enforce_encode_type = dag_req.has_force_encode_type() && dag_req.force_encode_type(); ->>>>>>> 14c57400d8 (set request schema version when do remote read (#4021)) pingcap::kv::Cluster * cluster = context.getTMTContext().getKVCluster(); pingcap::kv::Backoffer bo(pingcap::kv::copBuildTaskMaxBackoff); From e8d8a3e2391caf263da462ded231db96f5df8a0c Mon Sep 17 00:00:00 2001 From: lidezhu Date: Tue, 22 Feb 2022 19:51:25 +0800 Subject: [PATCH 3/3] update client-c --- contrib/client-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/client-c b/contrib/client-c index 1325209da01..0c834b9fe18 160000 --- a/contrib/client-c +++ b/contrib/client-c @@ -1 +1 @@ -Subproject commit 1325209da019f5d6e2a17b18a3b4e1f4a49f0852 +Subproject commit 0c834b9fe189841e078046b7b66d4960acc339fc