database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix es_scan_reader_test in debug mode (#1905)

Browse Source
This commit is contained in:
kangkaisen
2019-09-28 00:02:30 +08:00
committed by ZHAO Chun
parent ec3aa03c45
commit 1c229fbd92
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
be/src/exec/es/es_scan_reader.cpp
View File

@ -104,9 +104,6 @@ Status ESScanReader::get_next(bool* scan_eos, std::unique_ptr<ScrollParser>& scr
LOG(WARNING) << "request scroll search failure["
<< "http status" << status
<< ", response: " << (response.empty() ? "empty response" : response);
if (status == 404) {
return Status::InternalError("No search context found for " + _scroll_id);
}
return Status::InternalError("request scroll search failure: " + (response.empty() ? "empty response" : response));
}
}
@ -125,11 +122,7 @@ Status ESScanReader::get_next(bool* scan_eos, std::unique_ptr<ScrollParser>& scr
return Status::OK();
}
if (scroll_parser->get_size() < _batch_size) {
_eos = true;
} else {
_eos = false;
}
_eos = scroll_parser->get_size() < _batch_size;
*scan_eos = false;
return Status::OK();

7
be/test/exec/es_scan_reader_test.cpp
View File

@ -112,7 +112,7 @@ public:
end_search_result.AddMember("_scroll_id", scroll_id_value, allocator);
rapidjson::Value outer_hits(rapidjson::kObjectType);
outer_hits.AddMember("total", 10, allocator);
outer_hits.AddMember("total", 0, allocator);
end_search_result.AddMember("hits", outer_hits, allocator);
rapidjson::StringBuffer buffer;
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
@ -130,7 +130,7 @@ public:
search_result.AddMember("_scroll_id", scroll_id_value, allocator);
rapidjson::Value outer_hits(rapidjson::kObjectType);
outer_hits.AddMember("total", 10, allocator);
outer_hits.AddMember("total", 1, allocator);
rapidjson::Value inner_hits(rapidjson::kArrayType);
rapidjson::Value source_docuement(rapidjson::kObjectType);
source_docuement.AddMember("id", start, allocator);
@ -225,11 +225,12 @@ TEST_F(MockESServerTest, workflow) {
props[ESScanReader::KEY_QUERY] = ESScrollQueryBuilder::build(props, fields, predicates);
ESScanReader reader(target, props);
auto st = reader.open();
// ASSERT_TRUE(st.ok());
ASSERT_TRUE(st.ok());
bool eos = false;
std::unique_ptr<ScrollParser> parser = nullptr;
while(!eos){
st = reader.get_next(&eos, parser);
ASSERT_TRUE(st.ok());
if(eos) {
break;
}