From 11767587c9f03bd1ef4cff19ab3f3245e6f6133d Mon Sep 17 00:00:00 2001
From: "shixin.ruan" <shixin@shixin.ruan>
Date: Wed, 24 Jun 2026 18:26:46 +0900
Subject: [PATCH] <fix>[search]: fix zql field query total

Use entity alias for simple return-with-total counts so nullable
selected fields do not turn totals into zero. Keep explicit
count(field) and distinct(field) behavior unchanged. Add
CountGroupByCase coverage for nullable first selected field.

Resolves: ZSTAC-78110

Change-Id: I3b437bc686c345ba17baf256a338ce88209571f8
(cherry picked from commit 0dfe389e6d5560dbc8e899a4330de039c84e2791)
---
 .../ast/visitors/plugin/SimpleCountPlugin.java   | 16 ++++++++--------
 .../test/integration/zql/CountGroupByCase.groovy |  8 ++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/search/src/main/java/org/zstack/zql/ast/visitors/plugin/SimpleCountPlugin.java b/search/src/main/java/org/zstack/zql/ast/visitors/plugin/SimpleCountPlugin.java
index 6627311adb9..10ebab413b4 100644
--- a/search/src/main/java/org/zstack/zql/ast/visitors/plugin/SimpleCountPlugin.java
+++ b/search/src/main/java/org/zstack/zql/ast/visitors/plugin/SimpleCountPlugin.java
@@ -1,10 +1,10 @@
 package org.zstack.zql.ast.visitors.plugin;
 
-import org.apache.commons.lang.StringUtils;
 import org.zstack.header.zql.ASTNode;
 
 import java.util.List;
-import java.util.stream.Collectors;
+
+import static org.zstack.zql.ast.visitors.constants.MySqlKeyword.isDistinct;
 
 public class SimpleCountPlugin extends AbstractQueryVisitorPlugin {
     public SimpleCountPlugin() {
@@ -24,13 +24,13 @@ public String selectTarget() {
         String queryTarget;
         List<String> fieldNames = super.targetFields();
 
-        if (fieldNames.isEmpty()) {
-            queryTarget = entityAlias;
-        } else {
+        if (getClauseType() == ClauseType.COUNT || isDistinct(node.getTarget().getFunction())) {
             // TODO: Compatibility changes: hql count do not support multiple fields, even if distinct modified.
-            queryTarget = String.format("%s.%s", inventory.simpleInventoryName(), fieldNames.get(0));
+            queryTarget = fieldNames.isEmpty() ? entityAlias : String.format("%s.%s", inventory.simpleInventoryName(), fieldNames.get(0));
+            return String.format("count(%s)", String.format(functions(), queryTarget));
+        } else {
+            queryTarget = entityAlias;
+            return String.format("count(%s)", queryTarget);
         }
-
-        return String.format("count(%s)", String.format(functions(), queryTarget));
     }
 }
diff --git a/test/src/test/groovy/org/zstack/test/integration/zql/CountGroupByCase.groovy b/test/src/test/groovy/org/zstack/test/integration/zql/CountGroupByCase.groovy
index 72cf1d6ebb8..e37785f7674 100644
--- a/test/src/test/groovy/org/zstack/test/integration/zql/CountGroupByCase.groovy
+++ b/test/src/test/groovy/org/zstack/test/integration/zql/CountGroupByCase.groovy
@@ -36,6 +36,7 @@ class CountGroupByCase extends SubCase {
         env.create {
             testCountGroupBy()
             testQuery()
+            testFieldQueryTotalWithNullableFirstField()
             testGroupLimit()
             testEmpty()
         }
@@ -80,6 +81,13 @@ class CountGroupByCase extends SubCase {
         assert ret2.total == 102
     }
 
+    void testFieldQueryTotalWithNullableFirstField() {
+        def ret = ZQL.fromString("query instanceoffering.description,uuid return with (total) limit 100").getSingleResult() as ZQLQueryReturn
+        assert ret.inventories.size() == 100
+        assert ret.total == 102
+        assert ret.inventories.every { it.description == null }
+    }
+
     void testGroupLimit() {
         def ret = ZQL.fromString("count instanceoffering group by name,cpuNum limit 2").getSingleResult() as ZQLQueryReturn
         assert ret.inventoryCounts.size() == 2