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

[Doris on Es] Fix lte and gte error expression (#2851)

Browse Source 
LE should LTE
GE should GTE
This commit is contained in:
Yunfeng,Wu
2020-02-06 20:52:14 +08:00
committed by GitHub
parent f77cfcdb61
commit b35e8153c0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
be/src/exec/es/es_query_builder.cpp
View File

@ -82,13 +82,13 @@ void RangeQueryBuilder::to_json(rapidjson::Document* document, rapidjson::Value*
op_node.AddMember("lt", value, allocator);
break;
case TExprOpcode::LE:
op_node.AddMember("le", value, allocator);
op_node.AddMember("lte", value, allocator);
break;
case TExprOpcode::GT:
op_node.AddMember("gt", value, allocator);
break;
case TExprOpcode::GE:
op_node.AddMember("ge", value, allocator);
op_node.AddMember("gte", value, allocator);
break;
default:
break;

6
be/test/exec/es_query_builder_test.cpp
View File

@ -75,7 +75,7 @@ TEST_F(BooleanQueryBuilderTest, range_query) {
range_value.Accept(writer);
std::string actual_json = buffer.GetString();
//LOG(INFO) << "range query" << actual_json;
ASSERT_STREQ("{\"range\":{\"k\":{\"ge\":\"a\"}}}", actual_json.c_str());
ASSERT_STREQ("{\"range\":{\"k\":{\"gte\":\"a\"}}}", actual_json.c_str());
}
TEST_F(BooleanQueryBuilderTest, es_query) {
@ -248,7 +248,7 @@ TEST_F(BooleanQueryBuilderTest, bool_query) {
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
bool_query_value.Accept(writer);
std::string actual_json = buffer.GetString();
std::string expected_json = "{\"bool\":{\"should\":[{\"wildcard\":{\"content\":\"a*e*g?\"}},{\"bool\":{\"must_not\":{\"exists\":{\"field\":\"f1\"}}}},{\"range\":{\"k\":{\"ge\":\"a\"}}},{\"term\":{\"content\":\"wyf\"}}]}}";
std::string expected_json = "{\"bool\":{\"should\":[{\"wildcard\":{\"content\":\"a*e*g?\"}},{\"bool\":{\"must_not\":{\"exists\":{\"field\":\"f1\"}}}},{\"range\":{\"k\":{\"gte\":\"a\"}}},{\"term\":{\"content\":\"wyf\"}}]}}";
//LOG(INFO) << "bool query" << actual_json;
ASSERT_STREQ(expected_json.c_str(), actual_json.c_str());
}
@ -332,7 +332,7 @@ TEST_F(BooleanQueryBuilderTest, compound_bool_query) {
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
compound_bool_value.Accept(writer);
std::string actual_bool_json = buffer.GetString();
std::string expected_json = "{\"bool\":{\"filter\":[{\"bool\":{\"should\":[{\"wildcard\":{\"content\":\"a*e*g?\"}},{\"bool\":{\"must_not\":{\"exists\":{\"field\":\"f1\"}}}}]}},{\"bool\":{\"should\":[{\"range\":{\"k\":{\"ge\":\"a\"}}}]}},{\"bool\":{\"should\":[{\"bool\":{\"must_not\":[{\"term\":{\"content\":\"wyf\"}}]}}]}},{\"bool\":{\"should\":[{\"bool\":{\"must_not\":[{\"terms\":{\"fv\":[\"8.0\",\"16.0\"]}}]}}]}}]}}";
std::string expected_json = "{\"bool\":{\"filter\":[{\"bool\":{\"should\":[{\"wildcard\":{\"content\":\"a*e*g?\"}},{\"bool\":{\"must_not\":{\"exists\":{\"field\":\"f1\"}}}}]}},{\"bool\":{\"should\":[{\"range\":{\"k\":{\"gte\":\"a\"}}}]}},{\"bool\":{\"should\":[{\"bool\":{\"must_not\":[{\"term\":{\"content\":\"wyf\"}}]}}]}},{\"bool\":{\"should\":[{\"bool\":{\"must_not\":[{\"terms\":{\"fv\":[\"8.0\",\"16.0\"]}}]}}]}}]}}";
//LOG(INFO) << "compound bool query" << actual_bool_json;
ASSERT_STREQ(expected_json.c_str(), actual_bool_json.c_str());
}