From 6f17280be31a395d1caac856c8692ad73e60556c Mon Sep 17 00:00:00 2001 From: xufei Date: Tue, 14 Jun 2022 13:36:12 +0800 Subject: [PATCH] resolve conflict Signed-off-by: xufei --- .../src/Flash/Coprocessor/CoprocessorReader.h | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dbms/src/Flash/Coprocessor/CoprocessorReader.h b/dbms/src/Flash/Coprocessor/CoprocessorReader.h index 88dbb7c68f1..93362d82529 100644 --- a/dbms/src/Flash/Coprocessor/CoprocessorReader.h +++ b/dbms/src/Flash/Coprocessor/CoprocessorReader.h @@ -127,28 +127,16 @@ class CoprocessorReader std::shared_ptr resp = std::make_shared(); if (resp->ParseFromString(data)) { -<<<<<<< HEAD + if (resp->has_error()) + { + return {nullptr, true, resp->error().DebugString(), false}; + } if (has_enforce_encode_type && resp->encode_type() != tipb::EncodeType::TypeCHBlock) return {nullptr, true, "Encode type of coprocessor response is not CHBlock, " "maybe the version of some TiFlash node in the cluster is not match with this one", false}; auto rows = decodeChunks(resp, block_queue, expected_types, schema); return {resp, false, "", false, rows}; -======= - if (resp->has_error()) - { - return {nullptr, true, resp->error().DebugString(), false}; - } - else if (has_enforce_encode_type && resp->encode_type() != tipb::EncodeType::TypeCHBlock && resp->chunks_size() > 0) - return { - nullptr, - true, - "Encode type of coprocessor response is not CHBlock, " - "maybe the version of some TiFlash node in the cluster is not match with this one", - false}; - auto detail = decodeChunks(resp, block_queue, header, schema); - return {resp, false, "", false, detail}; ->>>>>>> d37a43d596 (avoid false alert of wrong encode type in CoprocesorReader (#3730)) } else {