This is an automated email from the ASF dual-hosted git repository.
lijibing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 7fe006ff07b [fix](statistics)Fix batch is null bug. (#36398)
7fe006ff07b is described below
commit 7fe006ff07bf09f34871c8520a2fdca6a57752db
Author: Jibing-Li <64681310+jibing...@users.noreply.github.com>
AuthorDate: Mon Jun 17 22:24:38 2024 +0800
[fix](statistics)Fix batch is null bug. (#36398)
This PR changed result sink logic:
https://github.com/apache/doris/pull/36053
Need to change the show column stats get row batch logic to avoid NPE.
---
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index 5d8958a53d7..b32109ced5f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -3346,9 +3346,14 @@ public class StmtExecutor {
try {
while (true) {
batch = coord.getNext();
- if (batch == null || batch.isEos()) {
+ Preconditions.checkNotNull(batch, "Batch is Null.");
+ if (batch.isEos()) {
return resultRows;
} else {
+ // For null and not EOS batch, continue to get the
next batch.
+ if (batch.getBatch() == null) {
+ continue;
+ }
resultRows.addAll(convertResultBatchToResultRows(batch.getBatch()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
