From 3a59ee1c5dae62f523037a29807c550a6d052f82 Mon Sep 17 00:00:00 2001
From: Jibing-Li <64681310+Jibing-Li@users.noreply.github.com>
Date: Wed, 21 Aug 2024 17:37:01 +0800
Subject: [PATCH] [fix](auditlog)Record return row count in audit log for
 internal query. (#39616) (#39702)

backport: https://github.com/apache/doris/pull/39616
---
 .../src/main/java/org/apache/doris/qe/StmtExecutor.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 9f349891ce..ba79ed73b8 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
@@ -3138,9 +3138,12 @@ public class StmtExecutor {
                         LOG.info("Result rows for query {} is {}", DebugUtil.printId(queryId), resultRows.size());
                         return resultRows;
                     } else {
-                        if (LOG.isDebugEnabled() && batch.getBatch() != null && batch.getBatch().rows != null) {
-                            LOG.debug("Batch size for query {} is {}",
-                                    DebugUtil.printId(queryId), batch.getBatch().rows.size());
+                        if (batch.getBatch().getRows() != null) {
+                            context.updateReturnRows(batch.getBatch().getRows().size());
+                            if (LOG.isDebugEnabled()) {
+                                LOG.debug("Batch size for query {} is {}",
+                                        DebugUtil.printId(queryId), batch.getBatch().rows.size());
+                            }
                         }
                         resultRows.addAll(convertResultBatchToResultRows(batch.getBatch()));
                         if (LOG.isDebugEnabled()) {