This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 3b9b23da68 [branch-1.2](test) fix some p0 (#17492)
3b9b23da68 is described below
commit 3b9b23da689fb1b9d49f5207f615a596f089dbd5
Author: Mingyu Chen <[email protected]>
AuthorDate: Tue Mar 7 20:13:11 2023 +0800
[branch-1.2](test) fix some p0 (#17492)
---
be/src/common/status.h | 4 +++-
.../data/query_p0/group_concat/test_group_concat.out | 19 -------------------
.../query_p0/group_concat/test_group_concat.groovy | 6 ------
.../cast_function/test_cast_function.groovy | 2 +-
.../string_functions/test_convert.groovy | 2 +-
5 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/be/src/common/status.h b/be/src/common/status.h
index c0f903aff7..466eabe395 100644
--- a/be/src/common/status.h
+++ b/be/src/common/status.h
@@ -13,6 +13,7 @@
#include "common/compiler_util.h"
#include "gen_cpp/Status_types.h" // for TStatus
+#include "service/backend_options.h"
#ifdef ENABLE_STACKTRACE
#include "util/stack_util.h"
#endif
@@ -460,7 +461,8 @@ private:
};
inline std::ostream& operator<<(std::ostream& ostr, const Status& status) {
- ostr << '[' << status.code_as_string() << ']' << (status._err_msg ?
status._err_msg->_msg : "");
+ ostr << '[' << status.code_as_string() << ']';
+ ostr << (status._err_msg ? status._err_msg->_msg : "");
#ifdef ENABLE_STACKTRACE
if (status->_err_msg && !status->_err_msg._stack.empty()) {
ostr << '\n' << status->_err_msg._stack;
diff --git a/regression-test/data/query_p0/group_concat/test_group_concat.out
b/regression-test/data/query_p0/group_concat/test_group_concat.out
index 8a742347a8..8caca13a7e 100644
--- a/regression-test/data/query_p0/group_concat/test_group_concat.out
+++ b/regression-test/data/query_p0/group_concat/test_group_concat.out
@@ -25,23 +25,4 @@ false
25699 1989
2147483647 255:1991:32767:32767
--- !select --
-\N \N
-103 255
-1001 1989, 1986
-1002 1989, 32767
-3021 1991, 32767, 1992
-5014 1985, 1991
-25699 1989
-2147483647 255, 1991, 32767, 32767
-
--- !select --
-\N \N
-103 255
-1001 1989:1986
-1002 1989:32767
-3021 1991:32767:1992
-5014 1985:1991
-25699 1989
-2147483647 255:1991:32767:32767
diff --git
a/regression-test/suites/query_p0/group_concat/test_group_concat.groovy
b/regression-test/suites/query_p0/group_concat/test_group_concat.groovy
index 1b4501ca8d..ad307c476a 100644
--- a/regression-test/suites/query_p0/group_concat/test_group_concat.groovy
+++ b/regression-test/suites/query_p0/group_concat/test_group_concat.groovy
@@ -31,11 +31,5 @@ suite("test_group_concat") {
qt_select """
SELECT abs(k3), group_concat(cast(abs(k2) as varchar), ":"
order by abs(k2), k1) FROM test_query_db.baseall group by abs(k3) order by
abs(k3)
"""
- qt_select """
- SELECT abs(k3), group_concat(distinct cast(abs(k2) as char)
order by abs(k1), k2) FROM test_query_db.baseall group by abs(k3) order by
abs(k3);
- """
- qt_select """
- SELECT abs(k3), group_concat(distinct cast(abs(k2) as char),
":" order by abs(k1), k2) FROM test_query_db.baseall group by abs(k3) order by
abs(k3);
- """
}
diff --git
a/regression-test/suites/query_p0/sql_functions/cast_function/test_cast_function.groovy
b/regression-test/suites/query_p0/sql_functions/cast_function/test_cast_function.groovy
index 7cdb3b0adf..58e6d5ad48 100644
---
a/regression-test/suites/query_p0/sql_functions/cast_function/test_cast_function.groovy
+++
b/regression-test/suites/query_p0/sql_functions/cast_function/test_cast_function.groovy
@@ -39,7 +39,7 @@ suite("test_cast_function") {
end as bitmap
) is NULL
"""
- exception "errCode = 2, detailMessage = [INVALID_ARGUMENT]Conversion
from UInt8 to BitMap is not supported"
+ exception "Conversion from UInt8 to BitMap is not supported"
}
sql """ SET enable_vectorized_engine = FALSE; """
diff --git
a/regression-test/suites/query_p0/sql_functions/string_functions/test_convert.groovy
b/regression-test/suites/query_p0/sql_functions/string_functions/test_convert.groovy
index 3b5a1d25ad..10362a3822 100644
---
a/regression-test/suites/query_p0/sql_functions/string_functions/test_convert.groovy
+++
b/regression-test/suites/query_p0/sql_functions/string_functions/test_convert.groovy
@@ -18,7 +18,7 @@
suite("test_convert") {
test {
sql "select convert('a' using utf8);"
- exception "errCode = 2, detailMessage = Not supported"
+ exception "Not supported: convert to character set utf8"
}
qt_convert_const_to_gbk """select convert("a" using gbk), convert("丝"
using gbk);"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
