Commit b6941b9
committed
[fix](fe) Restrict multi distinct count variant check
### What problem does this PR solve?
Issue Number: close #25672
Related PR: None
Problem Summary: The previous variant fix made MultiDistinctCount reuse the full COUNT DISTINCT argument check, which also rejects complex types. Existing P0 cases use multi_distinct_count on ARRAY values, so that broader check caused regressions. Keep the existing COUNT DISTINCT complex-type validation for Count, but make MultiDistinctCount only apply the new VARIANT rejection.
### Release note
None
### Check List (For Author)
- Test: Unit Test
- `./run-fe-ut.sh --run org.apache.doris.nereids.trees.expressions.functions.agg.CountTest`
- Behavior changed: No
- Does this need documentation: No1 parent c6d04c1 commit b6941b9
3 files changed
Lines changed: 18 additions & 5 deletions
File tree
- fe/fe-core/src
- main/java/org/apache/doris/nereids/trees/expressions/functions/agg
- test/java/org/apache/doris/nereids/trees/expressions/functions/agg
Lines changed: 8 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
102 | 110 | | |
103 | 111 | | |
104 | 112 | | |
105 | 113 | | |
106 | 114 | | |
107 | 115 | | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | 116 | | |
112 | 117 | | |
113 | 118 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
| 23 | + | |
22 | 24 | | |
23 | 25 | | |
24 | 26 | | |
| |||
42 | 44 | | |
43 | 45 | | |
44 | 46 | | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
45 | 53 | | |
0 commit comments