This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new fc0b4b9ced7 [fix](explain) fix NPE when explain verbose with partition
batch mode (#40969) (#41231)
fc0b4b9ced7 is described below
commit fc0b4b9ced7dfa4ed94eaf8b5a94e2d33d4c1a19
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Tue Sep 24 21:10:13 2024 +0800
[fix](explain) fix NPE when explain verbose with partition batch mode
(#40969) (#41231)
bp #40969
---
.../main/java/org/apache/doris/datasource/FileScanNode.java | 2 +-
.../suites/external_table_p0/hive/test_hive_partitions.groovy | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java
index c94ffc8d29f..a8392a948ed 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java
@@ -131,7 +131,7 @@ public abstract class FileScanNode extends ExternalScanNode
{
output.append(prefix).append("partition=").append(selectedPartitionNum).append("/").append(totalPartitionNum)
.append("\n");
- if (detailLevel == TExplainLevel.VERBOSE) {
+ if (detailLevel == TExplainLevel.VERBOSE && !isBatchMode()) {
output.append(prefix).append("backends:").append("\n");
Multimap<Long, TFileRangeDesc> scanRangeLocationsMap =
ArrayListMultimap.create();
// 1. group by backend id
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_partitions.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_partitions.groovy
index 67d565fc2c1..0e41adc3127 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_partitions.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_partitions.groovy
@@ -91,7 +91,16 @@ suite("test_hive_partitions",
"p0,external,hive,external_docker,external_docker_
q01()
- sql """drop catalog if exists ${catalog_name}"""
+ sql """set num_partitions_in_batch_mode=1"""
+ explain {
+ sql ("select * from partition_table")
+ verbose (true)
+
+ contains "(approximate)inputSplitNum=60"
+ }
+ sql """unset variable num_partitions_in_batch_mode"""
+
+ // sql """drop catalog if exists ${catalog_name}"""
} finally {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
