Skip to content

Commit 0a415e5

Browse files
committed
[fix](regression) Pin complete scan planning in delete-file EXPLAIN tests
### What problem does this PR solve? Issue Number: None Problem Summary: External scans now use batch mode by default. Batch EXPLAIN intentionally omits per-backend delete-file counts because only an initial subset of splits is planned. The Iceberg position-delete regression expected deleteFileNum from the default EXPLAIN and failed despite all result checks passing. Verify the approximate batch EXPLAIN separately, and request synchronous planning only in tests that assert complete delete-file detail. ### Release note None ### Check List (For Author) - Test: Manual test. Inspected the failed External Regression stacktrace and the FileScanNode/PluginDrivenScanNode EXPLAIN gate; git diff --check passed. External regression rerun is pending CI. - Behavior changed: No (test expectations only) - Does this need documentation: No
1 parent 1145d3d commit 0a415e5

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

‎regression-test/suites/external_table_p0/iceberg/test_iceberg_deletion_vector.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,19 +624,19 @@ s3.path-style-access=true
624624
// Cross-reader comparison protects against Doris accepting a DV/equality-delete result that
625625
// diverges from Spark, Trino, or Iceberg's Java reader.
626626
explain {
627-
sql("SELECT count(*) FROM dv_test;")
627+
sql("SELECT /*+ SET_VAR(enable_external_table_batch_mode=false) */ count(*) FROM dv_test;")
628628
verbose(true)
629629
contains "deleteFileNum"
630630
}
631631

632632
explain {
633-
sql("SELECT count(*) FROM dv_test_orc;")
633+
sql("SELECT /*+ SET_VAR(enable_external_table_batch_mode=false) */ count(*) FROM dv_test_orc;")
634634
verbose(true)
635635
contains "deleteFileNum"
636636
}
637637

638638
explain {
639-
sql("SELECT count(*) FROM dv_test_v2;")
639+
sql("SELECT /*+ SET_VAR(enable_external_table_batch_mode=false) */ count(*) FROM dv_test_v2;")
640640
verbose(true)
641641
contains "deleteFileNum"
642642
}

‎regression-test/suites/external_table_p0/iceberg/test_iceberg_position_delete.groovy‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ suite("test_iceberg_position_delete", "p0,external") {
170170
explain {
171171
sql ("select name from iceberg_position_gen_data where id != 5;")
172172
verbose (true)
173+
contains "(approximate)inputSplitNum"
174+
}
175+
explain {
176+
// Full per-backend delete-file counts require complete, synchronous split planning.
177+
sql ("select /*+ SET_VAR(enable_external_table_batch_mode=false) */ name "
178+
+ "from iceberg_position_gen_data where id != 5;")
179+
verbose (true)
173180
contains "deleteFileNum"
174181
}
175182
}

‎regression-test/suites/external_table_p0/paimon/test_paimon_deletion_vector_oss.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ suite("test_paimon_deletion_vector_oss", "p0,external") {
5555

5656
def test_explain_verbose = {
5757
explain {
58-
sql ("select * from deletion_vector_orc;")
58+
sql ("select /*+ SET_VAR(enable_external_table_batch_mode=false) */ * from deletion_vector_orc;")
5959
verbose (true)
6060
contains "deleteFileNum"
6161
}
@@ -69,4 +69,4 @@ suite("test_paimon_deletion_vector_oss", "p0,external") {
6969
sql """set force_jni_scanner=false"""
7070
}
7171

72-
}
72+
}

0 commit comments

Comments
 (0)