diff --git a/be/src/exec/es/es_scroll_parser.cpp b/be/src/exec/es/es_scroll_parser.cpp
index 0190f7881ffa08..ebf593520356ab 100644
--- a/be/src/exec/es/es_scroll_parser.cpp
+++ b/be/src/exec/es/es_scroll_parser.cpp
@@ -201,7 +201,7 @@ Status get_date_value_int(const rapidjson::Value& col, PrimitiveType type, bool
                     cctz::parse("%Y-%m-%dT%H:%M:%E*S%Ez", str_date, cctz::utc_time_zone(), &tp);
             if (ok) {
                 success = dt_val.from_unixtime(std::chrono::system_clock::to_time_t(tp),
-                                               cctz::local_time_zone().name());
+                                               cctz::local_time_zone());
             }
         } else if (str_length == 19) {
             // YYYY-MM-DDTHH:MM:SS
@@ -211,7 +211,7 @@ Status get_date_value_int(const rapidjson::Value& col, PrimitiveType type, bool
                         cctz::parse("%Y-%m-%dT%H:%M:%S", str_date, cctz::utc_time_zone(), &tp);
                 if (ok) {
                     success = dt_val.from_unixtime(std::chrono::system_clock::to_time_t(tp),
-                                                   cctz::local_time_zone().name());
+                                                   cctz::local_time_zone());
                 }
             } else {
                 // YYYY-MM-DD HH:MM:SS
@@ -222,7 +222,7 @@ Status get_date_value_int(const rapidjson::Value& col, PrimitiveType type, bool
             // string long like "1677895728000"
             int64_t time_long = std::atol(str_date.c_str());
             if (time_long > 0) {
-                success = dt_val.from_unixtime(time_long / 1000, cctz::local_time_zone().name());
+                success = dt_val.from_unixtime(time_long / 1000, cctz::local_time_zone());
             }
         } else {
             // YYYY-MM-DD or others
@@ -234,7 +234,7 @@ Status get_date_value_int(const rapidjson::Value& col, PrimitiveType type, bool
         }
 
     } else {
-        if (!dt_val.from_unixtime(col.GetInt64() / 1000, cctz::local_time_zone().name())) {
+        if (!dt_val.from_unixtime(col.GetInt64() / 1000, cctz::local_time_zone())) {
             RETURN_ERROR_IF_CAST_FORMAT_ERROR(col, type);
         }
     }
@@ -632,19 +632,11 @@ Status ScrollParser::fill_columns(const TupleDescriptor* tuple_desc,
                 case TYPE_VARCHAR:
                 case TYPE_STRING: {
                     std::string val;
-                    if (pure_doc_value && !sub_col.Empty()) {
-                        if (!sub_col[0].IsString()) {
-                            val = json_value_to_string(sub_col[0]);
-                        } else {
-                            val = sub_col[0].GetString();
-                        }
+                    RETURN_ERROR_IF_COL_IS_ARRAY(sub_col, sub_type);
+                    if (!sub_col.IsString()) {
+                        val = json_value_to_string(sub_col);
                     } else {
-                        RETURN_ERROR_IF_COL_IS_ARRAY(sub_col, type);
-                        if (!sub_col.IsString()) {
-                            val = json_value_to_string(sub_col);
-                        } else {
-                            val = sub_col.GetString();
-                        }
+                        val = sub_col.GetString();
                     }
                     array.push_back(val);
                     break;
diff --git a/be/src/pipeline/pipeline_fragment_context.cpp b/be/src/pipeline/pipeline_fragment_context.cpp
index fe5e98dde81b52..3cd552e4792517 100644
--- a/be/src/pipeline/pipeline_fragment_context.cpp
+++ b/be/src/pipeline/pipeline_fragment_context.cpp
@@ -442,6 +442,7 @@ Status PipelineFragmentContext::_build_pipelines(ExecNode* node, PipelinePtr cur
     case TPlanNodeType::ODBC_SCAN_NODE:
     case TPlanNodeType::FILE_SCAN_NODE:
     case TPlanNodeType::META_SCAN_NODE:
+    case TPlanNodeType::ES_HTTP_SCAN_NODE:
     case TPlanNodeType::ES_SCAN_NODE: {
         OperatorBuilderPtr operator_t = std::make_shared<ScanOperatorBuilder>(node->id(), node);
         RETURN_IF_ERROR(cur_pipe->add_operator(operator_t));
diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java
index a0a805747a53e0..8dc8d4abea9574 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/QueryBuilders.java
@@ -224,6 +224,11 @@ public static QueryBuilder toEsDsl(Expr expr, List<Expr> notPushDownList, Map<St
         if (expr == null) {
             return null;
         }
+        // esquery functionCallExpr will be rewritten to castExpr in where clause rewriter,
+        // so we get the functionCallExpr here.
+        if (expr instanceof CastExpr) {
+            return toEsDsl(expr.getChild(0), notPushDownList, fieldsContext, builderOptions);
+        }
         // CompoundPredicate, `between` also converted to CompoundPredicate.
         if (expr instanceof CompoundPredicate) {
             return toCompoundEsDsl(expr, notPushDownList, fieldsContext, builderOptions);
diff --git a/regression-test/data/es_p0/test_es_query.out b/regression-test/data/es_p0/test_es_query.out
index 4da0342d8656c4..c55b4dce3f0808 100644
--- a/regression-test/data/es_p0/test_es_query.out
+++ b/regression-test/data/es_p0/test_es_query.out
@@ -47,6 +47,16 @@ true	1	128	32768	-1	0	1.0	1	1	1	2020-01-01T00:00	2020-01-01 12:00:00	a	d	192.168
 -- !sql67 --
 [1, 0, 1, 1]	[1, -2, -3, 4]	[2020-01-01 00:00:00, 2020-01-02 00:00:00]	["2020-01-01 12:00:00", "2020-01-02 13:01:01"]	[1, 2, 3, 4]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[32768, 32769, -32769, -32770]	["192.168.0.1", "127.0.0.1"]	["a", "b", "c"]	[-1, 0, 1, 2]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]	[1, 2, 3, 4]	[128, 129, -129, -130]	["d", "e", "f"]	[0, 1, 2, 3]	string1	text#1	3.14	2022-08-08T00:00
 
+-- !sql68 --
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01 00:00:00, 2020-01-02 00:00:00]	["2020-01-01 12:00:00", "2020-01-02 13:01:01"]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01 00:00:00, 2020-01-02 00:00:00]	["2020-01-01 12:00:00", "2020-01-02 13:01:01"]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01 00:00:00, 2020-01-02 00:00:00]	["2020-01-01 12:00:00", "2020-01-02 13:01:01"]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+
+-- !sql69 --
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01 00:00:00, 2020-01-02 00:00:00]	["2020-01-01 12:00:00", "2020-01-02 13:01:01"]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01 00:00:00, 2020-01-02 00:00:00]	["2020-01-01 12:00:00", "2020-01-02 13:01:01"]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01 00:00:00, 2020-01-02 00:00:00]	["2020-01-01 12:00:00", "2020-01-02 13:01:01"]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+
 -- !sql72 --
 [1, 0, 1, 1]	[1, -2, -3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	[1, 2, 3, 4]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[32768, 32769, -32769, -32770]	["192.168.0.1", "127.0.0.1"]	["a", "b", "c"]	[-1, 0, 1, 2]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]	[1, 2, 3, 4]	[128, 129, -129, -130]	["d", "e", "f"]	[0, 1, 2, 3]	string1	text#1	3.14	2022-08-08T00:00	2022-08-08T12:10:10	1659931810000	2022-08-08T12:10:10	2022-08-08T20:10:10
 
@@ -74,6 +84,18 @@ true	1	128	32768	-1	0	1.0	1.0	1.0	1.0	2020-01-01	2020-01-01T12:00	a	d	192.168.0.
 -- !sql77 --
 [1, 0, 1, 1]	[1, -2, -3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	[1, 2, 3, 4]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[32768, 32769, -32769, -32770]	["192.168.0.1", "127.0.0.1"]	["a", "b", "c"]	[-1, 0, 1, 2]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]	[1, 2, 3, 4]	[128, 129, -129, -130]	["d", "e", "f"]	[0, 1, 2, 3]	string1	text#1	3.14	2022-08-08T00:00	2022-08-08T12:10:10	1659931810000	2022-08-08T12:10:10	2022-08-08T20:10:10
 
+-- !sql78 --
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+
+-- !sql79 --
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+
 -- !sql81 --
 [1, 0, 1, 1]	[1, -2, -3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	[1, 2, 3, 4]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[32768, 32769, -32769, -32770]	["192.168.0.1", "127.0.0.1"]	["a", "b", "c"]	[-1, 0, 1, 2]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]	[1, 2, 3, 4]	[128, 129, -129, -130]	["d", "e", "f"]	[0, 1, 2, 3]	string1	text#1	3.14	2022-08-08T00:00	2022-08-08T12:10:10	1659931810000	2022-08-08T12:10:10	2022-08-08T20:10:10
 
@@ -98,3 +120,15 @@ true	1	128	32768	-1	0	1.0	1.0	1.0	1.0	2020-01-01	2020-01-01T12:00	a	d	192.168.0.
 -- !sql85 --
 [1, 0, 1, 1]	[1, -2, -3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	[1, 2, 3, 4]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[32768, 32769, -32769, -32770]	["192.168.0.1", "127.0.0.1"]	["a", "b", "c"]	[-1, 0, 1, 2]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]	[1, 2, 3, 4]	[128, 129, -129, -130]	["d", "e", "f"]	[0, 1, 2, 3]	string1	text#1	3.14	2022-08-08T00:00	2022-08-08T12:10:10	1659931810000	2022-08-08T12:10:10	2022-08-08T20:10:10
 
+-- !sql86 --
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+
+-- !sql87 --
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+[1, 0, 1, 1]	[1, -2, -3, 4]	[128, 129, -129, -130]	[32768, 32769, -32769, -32770]	[-1, 0, 1, 2]	[0, 1, 2, 3]	[1, 1.1, 1.2, 1.3]	[1, 2, 3, 4]	[1, 2, 3, 4]	[1, 2, 3, 4]	[2020-01-01, 2020-01-02]	[2020-01-01 12:00:00, 2020-01-02 13:01:01]	["a", "b", "c"]	["d", "e", "f"]	["192.168.0.1", "127.0.0.1"]	["{"name":"Andy","age":18}", "{"name":"Tim","age":28}"]
+
diff --git a/regression-test/suites/es_p0/test_es_query.groovy b/regression-test/suites/es_p0/test_es_query.groovy
index 41bd89b2978d5b..bf76bdf3a17889 100644
--- a/regression-test/suites/es_p0/test_es_query.groovy
+++ b/regression-test/suites/es_p0/test_es_query.groovy
@@ -146,6 +146,8 @@ suite("test_es_query", "p0,external,es") {
         order_qt_sql65 """select c_bool[1], c_byte[1], c_short[1], c_integer[1], c_long[1], c_unsigned_long[1], c_float[1], c_half_float[1], c_double[1], c_scaled_float[1], c_date[1], c_datetime[1], c_keyword[1], c_text[1], c_ip[1], c_person[1] from test1"""
         order_qt_sql66 """select c_bool[1], c_byte[1], c_short[1], c_integer[1], c_long[1], c_unsigned_long[1], c_float[1], c_half_float[1], c_double[1], c_scaled_float[1], c_date[1], c_datetime[1], c_keyword[1], c_text[1], c_ip[1], c_person[1] from test2_20220808"""
         order_qt_sql67 """select * from test1 where esquery(test2, '{"match":{"test2":"text#1"}}')"""
+        order_qt_sql68 """select c_bool, c_byte, c_short, c_integer, c_long, c_unsigned_long, c_float, c_half_float, c_double, c_scaled_float, c_date, c_datetime, c_keyword, c_text, c_ip, c_person from test1"""
+        order_qt_sql69 """select c_bool, c_byte, c_short, c_integer, c_long, c_unsigned_long, c_float, c_half_float, c_double, c_scaled_float, c_date, c_datetime, c_keyword, c_text, c_ip, c_person from test2_20220808"""
         sql """switch es7"""
         // order_qt_sql71 """show tables"""
         order_qt_sql72 """select * from test1 where test2='text#1'"""
@@ -154,12 +156,16 @@ suite("test_es_query", "p0,external,es") {
         order_qt_sql75 """select c_bool[1], c_byte[1], c_short[1], c_integer[1], c_long[1], c_unsigned_long[1], c_float[1], c_half_float[1], c_double[1], c_scaled_float[1], c_date[1], c_datetime[1], c_keyword[1], c_text[1], c_ip[1], c_person[1] from test1"""
         order_qt_sql76 """select c_bool[1], c_byte[1], c_short[1], c_integer[1], c_long[1], c_unsigned_long[1], c_float[1], c_half_float[1], c_double[1], c_scaled_float[1], c_date[1], c_datetime[1], c_keyword[1], c_text[1], c_ip[1], c_person[1] from test2"""
         order_qt_sql77 """select * from test1 where esquery(test2, '{"match":{"test2":"text#1"}}')"""
+        order_qt_sql78 """select c_bool, c_byte, c_short, c_integer, c_long, c_unsigned_long, c_float, c_half_float, c_double, c_scaled_float, c_date, c_datetime, c_keyword, c_text, c_ip, c_person from test1"""
+        order_qt_sql79 """select c_bool, c_byte, c_short, c_integer, c_long, c_unsigned_long, c_float, c_half_float, c_double, c_scaled_float, c_date, c_datetime, c_keyword, c_text, c_ip, c_person from test2"""
         sql """switch es8"""
         order_qt_sql81 """select * from test1 where test2='text#1'"""
         order_qt_sql82 """select * from test2_20220808 where test4 >= '2022-08-08 00:00:00' and test4 < '2022-08-08 23:59:59'"""
         order_qt_sql83 """select c_bool[1], c_byte[1], c_short[1], c_integer[1], c_long[1], c_unsigned_long[1], c_float[1], c_half_float[1], c_double[1], c_scaled_float[1], c_date[1], c_datetime[1], c_keyword[1], c_text[1], c_ip[1], c_person[1] from test1"""
         order_qt_sql84 """select c_bool[1], c_byte[1], c_short[1], c_integer[1], c_long[1], c_unsigned_long[1], c_float[1], c_half_float[1], c_double[1], c_scaled_float[1], c_date[1], c_datetime[1], c_keyword[1], c_text[1], c_ip[1], c_person[1] from test2"""
         order_qt_sql85 """select * from test1 where esquery(test2, '{"match":{"test2":"text#1"}}')"""
+        order_qt_sql86 """select c_bool, c_byte, c_short, c_integer, c_long, c_unsigned_long, c_float, c_half_float, c_double, c_scaled_float, c_date, c_datetime, c_keyword, c_text, c_ip, c_person from test1"""
+        order_qt_sql87 """select c_bool, c_byte, c_short, c_integer, c_long, c_unsigned_long, c_float, c_half_float, c_double, c_scaled_float, c_date, c_datetime, c_keyword, c_text, c_ip, c_person from test2"""
 
     }
 }