You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by zh...@apache.org on 2019/09/27 16:02:35 UTC
[incubator-doris] branch master updated: Fix es_scan_reader_test in
debug mode (#1905)
This is an automated email from the ASF dual-hosted git repository.
zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 1c229fb Fix es_scan_reader_test in debug mode (#1905)
1c229fb is described below
commit 1c229fbd924d3464464ee2e1f1dc8d9c60e40abf
Author: kangkaisen <ka...@apache.org>
AuthorDate: Sat Sep 28 00:02:30 2019 +0800
Fix es_scan_reader_test in debug mode (#1905)
---
be/src/exec/es/es_scan_reader.cpp | 9 +--------
be/test/exec/es_scan_reader_test.cpp | 7 ++++---
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/be/src/exec/es/es_scan_reader.cpp b/be/src/exec/es/es_scan_reader.cpp
index 574a504..8fb1b36 100644
--- a/be/src/exec/es/es_scan_reader.cpp
+++ b/be/src/exec/es/es_scan_reader.cpp
@@ -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();
diff --git a/be/test/exec/es_scan_reader_test.cpp b/be/test/exec/es_scan_reader_test.cpp
index 2da96c0..c45c8d1 100644
--- a/be/test/exec/es_scan_reader_test.cpp
+++ b/be/test/exec/es_scan_reader_test.cpp
@@ -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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org