[doris] 02/02: rebase

[eldenmoon]

This is an automated email from the ASF dual-hosted git repository.

eldenmoon pushed a commit to branch fix-json
in repository https://gitbox.apache.org/repos/asf/doris.git

commit fc2ac5f6ae41f21291e201e032b5fe488d11c4f1
Author: eldenmoon <15605149...@163.com>
AuthorDate: Thu Jul 20 10:56:52 2023 +0800

    rebase
---
 regression-test/data/load_p0/stream_load/test_json_load.out      | 6 ++----
 regression-test/suites/load_p0/stream_load/test_json_load.groovy | 7 ++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/regression-test/data/load_p0/stream_load/test_json_load.out 
b/regression-test/data/load_p0/stream_load/test_json_load.out
index 07032bcf83..ad68ffa129 100644
--- a/regression-test/data/load_p0/stream_load/test_json_load.out
+++ b/regression-test/data/load_p0/stream_load/test_json_load.out
@@ -199,11 +199,9 @@
 10     hefei   23456710
 200    changsha        3456789
 
-<<<<<<< HEAD
 -- !select1 --
 John   30      New York        
{"email":"j...@example.com","phone":"+1-123-456-7890"}
-=======
--- !select21 --
+
+-- !select22 --
 11324  1321313082437   1678834024274   20230315        
{"base_mac_value_null":24,"base_1_value_respiratoryrate":11,"base_3_value_heartrate":51,"base_3_status_onoroutofbed":3,"base_null_count_circulation":84,"base_1_status_onoroutofbed":3,"base_1_value_heartrate":51,"base_3_value_respiratoryrate":11,"base_3_value_bodyactivityenergy":43652,"base_2_value_respiratoryrate":11,"base_2_value_bodyactivityenergy":28831,"base_2_status_onoroutofbed":3,"base_1_value_bodyactivityenergy":56758,"base_2_value_heart
 [...]
->>>>>>> 7de147ac54 ([Fix](json reader) fix rapidjson `array->PushBack` may 
take ownership original document)
 
diff --git a/regression-test/suites/load_p0/stream_load/test_json_load.groovy 
b/regression-test/suites/load_p0/stream_load/test_json_load.groovy
index 4933a8d52f..c982196bb1 100644
--- a/regression-test/suites/load_p0/stream_load/test_json_load.groovy
+++ b/regression-test/suites/load_p0/stream_load/test_json_load.groovy
@@ -590,6 +590,7 @@ suite("test_json_load", "p0") {
 
     // case22: nested and it's member with jsonpath
     try {
+        testTable = "test_json_load"
         sql "DROP TABLE IF EXISTS ${testTable}"
         sql """CREATE TABLE IF NOT EXISTS ${testTable}
         (
@@ -605,10 +606,10 @@ suite("test_json_load", "p0") {
             "replication_num" = "1"
         );
         """
-
-        load_json_data.call('with_jsonpath', '', 'true', 'json', """productid, 
deviceid, data, datatimestamp, 
dt=from_unixtime(substr(datatimestamp,1,10),'%Y%m%d')""",
+1
+        load_json_data.call("${testTable}", 'with_jsonpath', '', 'true', 
'json', """productid, deviceid, data, datatimestamp, 
dt=from_unixtime(substr(datatimestamp,1,10),'%Y%m%d')""",
                 
'["$.productid","$.deviceid","$.data","$.data.datatimestamp"]', '', '', '', 
'with_jsonpath.json')
-        qt_select21 "select * from ${testTable}"
+        qt_select22 "select * from ${testTable}"
 
     } finally {
         try_sql("DROP TABLE IF EXISTS ${testTable}")


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org