This is an automated email from the ASF dual-hosted git repository.
w41ter 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 6454ee65899 branch-2.1: [Fix](ccr) Incorrectly generated sql with NONE
aggregate type #45452 (#45489)
6454ee65899 is described below
commit 6454ee65899dd7d161d79667646f323d782dd374
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 23 16:48:29 2024 +0800
branch-2.1: [Fix](ccr) Incorrectly generated sql with NONE aggregate type
#45452 (#45489)
Cherry-picked from #45452
Co-authored-by: Uniqueyou <[email protected]>
---
fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java | 2 +-
.../src/test/java/org/apache/doris/analysis/ColumnDefTest.java | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java
index 69564d1f93e..17986662058 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java
@@ -572,7 +572,7 @@ public class ColumnDef {
sb.append("`").append(name).append("` ");
sb.append(typeDef.toSql()).append(" ");
- if (aggregateType != null) {
+ if (aggregateType != null && aggregateType != AggregateType.NONE) {
sb.append(aggregateType.name()).append(" ");
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnDefTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnDefTest.java
index 9649b8523d6..5ef11dc6a4f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnDefTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnDefTest.java
@@ -38,6 +38,7 @@ public class ColumnDefTest {
private TypeDef stringCol;
private TypeDef floatCol;
private TypeDef booleanCol;
+ private TypeDef bitmapCol;
private ConnectContext ctx;
@Before
@@ -46,6 +47,7 @@ public class ColumnDefTest {
stringCol = new TypeDef(ScalarType.createChar(10));
floatCol = new TypeDef(ScalarType.createType(PrimitiveType.FLOAT));
booleanCol = new TypeDef(ScalarType.createType(PrimitiveType.BOOLEAN));
+ bitmapCol = new TypeDef(ScalarType.createType(PrimitiveType.BITMAP));
ctx = new ConnectContext();
new MockUp<ConnectContext>() {
@@ -80,6 +82,12 @@ public class ColumnDefTest {
Assert.assertEquals("10", column.getDefaultValue());
Assert.assertEquals(AggregateType.SUM, column.getAggregateType());
Assert.assertEquals("`col` float SUM NOT NULL DEFAULT \"10\" COMMENT
\"\"", column.toSql());
+
+ // agg none
+ column = new ColumnDef("col", bitmapCol, false, AggregateType.NONE,
false, DefaultValue.BITMAP_EMPTY_DEFAULT_VALUE, "");
+
+ Assert.assertEquals(AggregateType.NONE, column.getAggregateType());
+ Assert.assertEquals("`col` bitmap NOT NULL DEFAULT BITMAP_EMPTY
COMMENT \"\"", column.toSql());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
