diff --git a/be/src/runtime/stream_load/stream_load_executor.cpp b/be/src/runtime/stream_load/stream_load_executor.cpp index 2fc93d356879cb..ec83141893af8f 100644 --- a/be/src/runtime/stream_load/stream_load_executor.cpp +++ b/be/src/runtime/stream_load/stream_load_executor.cpp @@ -99,6 +99,7 @@ Status StreamLoadExecutor::execute_plan_fragment(std::shared_ptrbrief(); + ctx->number_loaded_rows = 0; // cancel body_sink, make sender known it if (ctx->body_sink != nullptr) { ctx->body_sink->cancel(status->to_string()); diff --git a/regression-test/suites/insert_p0/insert_group_commit_into_max_filter_ratio.groovy b/regression-test/suites/insert_p0/insert_group_commit_into_max_filter_ratio.groovy index 1377ac1415a473..fb936fdc54faff 100644 --- a/regression-test/suites/insert_p0/insert_group_commit_into_max_filter_ratio.groovy +++ b/regression-test/suites/insert_p0/insert_group_commit_into_max_filter_ratio.groovy @@ -117,7 +117,7 @@ suite("insert_group_commit_into_max_filter_ratio") { assertTrue(json.GroupCommit) // assertTrue(json.Label.startsWith("group_commit_")) assertEquals(total_rows, json.NumberTotalRows) - assertEquals(loaded_rows, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(filtered_rows, json.NumberFilteredRows) assertEquals(unselected_rows, json.NumberUnselectedRows) if (filtered_rows > 0) { diff --git a/regression-test/suites/json_p0/test_json_load_and_function.groovy b/regression-test/suites/json_p0/test_json_load_and_function.groovy index 167dfb4e9bc9e8..6875a2acfdb54c 100644 --- a/regression-test/suites/json_p0/test_json_load_and_function.groovy +++ b/regression-test/suites/json_p0/test_json_load_and_function.groovy @@ -57,7 +57,7 @@ suite("test_json_load_and_function", "p0") { assertEquals("fail", json.Status.toLowerCase()) assertTrue(json.Message.contains("too many filtered rows")) assertEquals(25, json.NumberTotalRows) - assertEquals(18, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(7, json.NumberFilteredRows) assertTrue(json.LoadBytes > 0) log.info("url: " + json.ErrorURL) diff --git a/regression-test/suites/json_p0/test_json_load_unique_key_and_function.groovy b/regression-test/suites/json_p0/test_json_load_unique_key_and_function.groovy index d316ca17837c4e..4050a48c1feaac 100644 --- a/regression-test/suites/json_p0/test_json_load_unique_key_and_function.groovy +++ b/regression-test/suites/json_p0/test_json_load_unique_key_and_function.groovy @@ -52,7 +52,7 @@ suite("test_json_unique_load_and_function", "p0") { assertEquals("fail", json.Status.toLowerCase()) assertTrue(json.Message.contains("too many filtered rows")) assertEquals(75, json.NumberTotalRows) - assertEquals(54, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(21, json.NumberFilteredRows) assertTrue(json.LoadBytes > 0) } diff --git a/regression-test/suites/jsonb_p0/test_jsonb_load_and_function.groovy b/regression-test/suites/jsonb_p0/test_jsonb_load_and_function.groovy index cb1b8f4262a1c8..d46ed00b3ba63f 100644 --- a/regression-test/suites/jsonb_p0/test_jsonb_load_and_function.groovy +++ b/regression-test/suites/jsonb_p0/test_jsonb_load_and_function.groovy @@ -57,7 +57,7 @@ suite("test_jsonb_load_and_function", "p0") { assertEquals("fail", json.Status.toLowerCase()) assertTrue(json.Message.contains("too many filtered rows")) assertEquals(25, json.NumberTotalRows) - assertEquals(18, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(7, json.NumberFilteredRows) assertTrue(json.LoadBytes > 0) log.info("url: " + json.ErrorURL) diff --git a/regression-test/suites/jsonb_p0/test_jsonb_load_unique_key_and_function.groovy b/regression-test/suites/jsonb_p0/test_jsonb_load_unique_key_and_function.groovy index 551003e85ecc8f..b3873d4eaac90d 100644 --- a/regression-test/suites/jsonb_p0/test_jsonb_load_unique_key_and_function.groovy +++ b/regression-test/suites/jsonb_p0/test_jsonb_load_unique_key_and_function.groovy @@ -53,7 +53,7 @@ suite("test_jsonb_unique_load_and_function", "p0") { assertEquals("fail", json.Status.toLowerCase()) assertTrue(json.Message.contains("too many filtered rows")) assertEquals(75, json.NumberTotalRows) - assertEquals(54, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(21, json.NumberFilteredRows) assertTrue(json.LoadBytes > 0) } diff --git a/regression-test/suites/load_p0/stream_load/load_json_column_exclude_schema_without_jsonpath.groovy b/regression-test/suites/load_p0/stream_load/load_json_column_exclude_schema_without_jsonpath.groovy index 06c8135840bece..d7c1064de4f102 100644 --- a/regression-test/suites/load_p0/stream_load/load_json_column_exclude_schema_without_jsonpath.groovy +++ b/regression-test/suites/load_p0/stream_load/load_json_column_exclude_schema_without_jsonpath.groovy @@ -73,8 +73,8 @@ suite("test_load_json_column_exclude_schema_without_jsonpath", "p0") { log.info("Stream load result: ${result}".toString()) def json = parseJson(result) assertEquals("fail", json.Status.toLowerCase()) - assertEquals(json.NumberTotalRows, json.NumberLoadedRows + json.NumberFilteredRows) - assertTrue(json.NumberLoadedRows == 30); + assertTrue(json.NumberTotalRows == 60) + assertTrue(json.NumberLoadedRows == 0) assertTrue(json.NumberFilteredRows == 30); } } diff --git a/regression-test/suites/load_p0/stream_load/test_csv_with_none_utf8_data.groovy b/regression-test/suites/load_p0/stream_load/test_csv_with_none_utf8_data.groovy index bca699f7433e53..43494c332a2ef0 100644 --- a/regression-test/suites/load_p0/stream_load/test_csv_with_none_utf8_data.groovy +++ b/regression-test/suites/load_p0/stream_load/test_csv_with_none_utf8_data.groovy @@ -60,7 +60,7 @@ suite("test_csv_with_none_utf8_data", "p0") { assertEquals("fail", json.Status.toLowerCase()) assertTrue(json.Message.contains("too many filtered rows")) assertEquals(4, json.NumberTotalRows) - assertEquals(2, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) assertTrue(json.LoadBytes > 0) log.info("url: " + json.ErrorURL) diff --git a/regression-test/suites/load_p0/stream_load/test_stream_load.groovy b/regression-test/suites/load_p0/stream_load/test_stream_load.groovy index f84ac60a21ad6c..9783f178c3a2ad 100644 --- a/regression-test/suites/load_p0/stream_load/test_stream_load.groovy +++ b/regression-test/suites/load_p0/stream_load/test_stream_load.groovy @@ -837,7 +837,7 @@ suite("test_stream_load", "p0") { def json = parseJson(result) assertEquals("fail", json.Status.toLowerCase()) assertEquals(5, json.NumberTotalRows) - assertEquals(3, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) assertEquals(0, json.NumberUnselectedRows) } @@ -941,7 +941,7 @@ suite("test_stream_load", "p0") { def json = parseJson(result) assertEquals("fail", json.Status.toLowerCase()) assertEquals(5, json.NumberTotalRows) - assertEquals(3, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) assertEquals(0, json.NumberUnselectedRows) } diff --git a/regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy b/regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy index ca0256d49af8b0..7244cd24f4ac47 100644 --- a/regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy +++ b/regression-test/suites/load_p0/stream_load/test_stream_load_move_memtable.groovy @@ -712,7 +712,7 @@ suite("test_stream_load_move_memtable", "p0") { def json = parseJson(result) assertEquals("fail", json.Status.toLowerCase()) assertEquals(5, json.NumberTotalRows) - assertEquals(3, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) assertEquals(0, json.NumberUnselectedRows) } @@ -818,7 +818,7 @@ suite("test_stream_load_move_memtable", "p0") { def json = parseJson(result) assertEquals("fail", json.Status.toLowerCase()) assertEquals(5, json.NumberTotalRows) - assertEquals(3, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) assertEquals(0, json.NumberUnselectedRows) } diff --git a/regression-test/suites/load_p0/stream_load/test_stream_load_properties.groovy b/regression-test/suites/load_p0/stream_load/test_stream_load_properties.groovy index 1e4e207821b546..f88218995fdc14 100644 --- a/regression-test/suites/load_p0/stream_load/test_stream_load_properties.groovy +++ b/regression-test/suites/load_p0/stream_load/test_stream_load_properties.groovy @@ -284,7 +284,7 @@ suite("test_stream_load_properties", "p0,nonConcurrent") { def json = parseJson(result) assertEquals("fail", json.Status.toLowerCase()) assertEquals(20, json.NumberTotalRows) - assertEquals(loadedRows[i], json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(filteredRows[i], json.NumberFilteredRows) assertEquals(0, json.NumberUnselectedRows) } diff --git a/regression-test/suites/nereids_function_p0/scalar_function/J.groovy b/regression-test/suites/nereids_function_p0/scalar_function/J.groovy index 1ac7da34ac4591..67132d23df01ef 100644 --- a/regression-test/suites/nereids_function_p0/scalar_function/J.groovy +++ b/regression-test/suites/nereids_function_p0/scalar_function/J.groovy @@ -57,7 +57,7 @@ suite("nereids_scalar_fn_J") { assertEquals("fail", json.Status.toLowerCase()) assertTrue(json.Message.contains("too many filtered rows")) assertEquals(25, json.NumberTotalRows) - assertEquals(18, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(7, json.NumberFilteredRows) assertTrue(json.LoadBytes > 0) log.info("url: " + json.ErrorURL) diff --git a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy index 5fad6b4aca114d..fe47a5ebc89450 100644 --- a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy +++ b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy @@ -117,7 +117,7 @@ suite("test_partial_update_strict_mode", "p0") { assertEquals("Fail", json.Status) assertTrue(json.Message.contains("[DATA_QUALITY_ERROR]too many filtered rows")) assertEquals(3, json.NumberTotalRows) - assertEquals(1, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) } } @@ -166,7 +166,6 @@ suite("test_partial_update_strict_mode", "p0") { assertEquals("Fail", json.Status) assertTrue(json.Message.contains("[DATA_QUALITY_ERROR]too many filtered rows")) assertEquals(3, json.NumberTotalRows) - assertEquals(1, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) } } diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update.groovy index 9d2410a11d2a3a..ea3dde5bf5b3f2 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update.groovy @@ -176,7 +176,7 @@ suite("test_primary_key_partial_update", "p0") { assertEquals("Fail", json.Status) assertTrue(json.Message.contains("[DATA_QUALITY_ERROR]too many filtered rows")) assertEquals(3, json.NumberTotalRows) - assertEquals(1, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) } } diff --git a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_strict_mode.groovy b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_strict_mode.groovy index 5fad6b4aca114d..fe47a5ebc89450 100644 --- a/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_strict_mode.groovy +++ b/regression-test/suites/unique_with_mow_p0/partial_update/test_partial_update_strict_mode.groovy @@ -117,7 +117,7 @@ suite("test_partial_update_strict_mode", "p0") { assertEquals("Fail", json.Status) assertTrue(json.Message.contains("[DATA_QUALITY_ERROR]too many filtered rows")) assertEquals(3, json.NumberTotalRows) - assertEquals(1, json.NumberLoadedRows) + assertEquals(0, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) } } @@ -166,7 +166,6 @@ suite("test_partial_update_strict_mode", "p0") { assertEquals("Fail", json.Status) assertTrue(json.Message.contains("[DATA_QUALITY_ERROR]too many filtered rows")) assertEquals(3, json.NumberTotalRows) - assertEquals(1, json.NumberLoadedRows) assertEquals(2, json.NumberFilteredRows) } }