Fix conflict

StarRocks · Aug 7, 2024 · 68ea690 · 68ea690
1 parent 476d799
commit 68ea690
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/be/test/exec/json_parser_test.cpp b/be/test/exec/json_parser_test.cpp
@@ -519,15 +519,9 @@ PARALLEL_TEST(JsonParserTest, test_document_stream_parser_invalid_type_array) {
     simdjson::ondemand::object row;
     st = parser->get_current(&row);
     ASSERT_TRUE(st.is_data_quality_error());
-<<<<<<< HEAD
     ASSERT_TRUE(st.get_error_msg().find(
                         "The value is array type in json document stream, you can set strip_outer_array=true "
-                        "to parse each element of the array as individual rows, "
-                        "value: [{\"key\":1},{\"key\":2}]") != std::string::npos);
-=======
-    ASSERT_TRUE(st.message().find("The value is array type in json document stream, you can set strip_outer_array=true "
-                                  "to parse each element of the array as individual rows") != std::string::npos);
->>>>>>> e7d9dc06da ([BugFix] Remove json value from error message (#49526))
+                        "to parse each element of the array as individual rows") != std::string::npos);
 }
 
 PARALLEL_TEST(JsonParserTest, test_document_stream_parser_invalid_type_not_object) {
@@ -545,13 +539,8 @@ PARALLEL_TEST(JsonParserTest, test_document_stream_parser_invalid_type_not_objec
     simdjson::ondemand::object row;
     st = parser->get_current(&row);
     ASSERT_TRUE(st.is_data_quality_error());
-<<<<<<< HEAD
-    ASSERT_TRUE(st.get_error_msg().find("The value should be object type in json document stream, value: 1") !=
+    ASSERT_TRUE(st.get_error_msg().find("The value should be object type in json document stream") !=
                 std::string::npos);
-=======
-    ASSERT_TRUE(st.message().find("The value should be object type in json document stream") != std::string::npos);
->>>>>>> e7d9dc06da ([BugFix] Remove json value from error message (#49526))
-}
 
 PARALLEL_TEST(JsonParserTest, test_document_stream_parser_with_jsonroot_invalid_type_array) {
     // ndjson with ' ', '/t', '\n'