You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by zh...@apache.org on 2023/06/29 12:47:32 UTC
[doris] branch master updated: [fix](unique key) agg_function is NONE when properties is null (#21337)
This is an automated email from the ASF dual-hosted git repository.
zhangchen 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 c7286c620b [fix](unique key) agg_function is NONE when properties is null (#21337)
c7286c620b is described below
commit c7286c620bca7fdfcd53de3e3e514d5416cf91cf
Author: zhannngchen <48...@users.noreply.github.com>
AuthorDate: Thu Jun 29 20:47:13 2023 +0800
[fix](unique key) agg_function is NONE when properties is null (#21337)
---
.../org/apache/doris/analysis/CreateTableStmt.java | 2 +-
.../apache/doris/analysis/CreateTableStmtTest.java | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java
index 5ec43781eb..c737fa2d4c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java
@@ -411,7 +411,7 @@ public class CreateTableStmt extends DdlStmt {
PropertyAnalyzer.ENABLE_UNIQUE_KEY_MERGE_ON_WRITE + " property only support unique key table");
}
if (keysDesc.getKeysType() == KeysType.UNIQUE_KEYS) {
- enableUniqueKeyMergeOnWrite = true;
+ enableUniqueKeyMergeOnWrite = false;
if (properties != null) {
// `analyzeXXX` would modify `properties`, which will be used later,
// so we just clone a properties map here.
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
index 4086b207e6..9138248c01 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
@@ -147,6 +147,27 @@ public class CreateTableStmtTest {
cols.remove(col4);
}
+ @Test
+ public void testCreateTableUniqueKeyNoProperties() throws UserException {
+ // setup
+ ColumnDef col3 = new ColumnDef("col3", new TypeDef(ScalarType.createType(PrimitiveType.BIGINT)));
+ col3.setIsKey(false);
+ cols.add(col3);
+ ColumnDef col4 = new ColumnDef("col4", new TypeDef(ScalarType.createType(PrimitiveType.STRING)));
+ col4.setIsKey(false);
+ cols.add(col4);
+ // test normal case
+ CreateTableStmt stmt = new CreateTableStmt(false, false, tblName, cols, "olap",
+ new KeysDesc(KeysType.UNIQUE_KEYS, colsName), null,
+ new HashDistributionDesc(10, Lists.newArrayList("col1")), null, null, "");
+ stmt.analyze(analyzer);
+ Assert.assertEquals(col3.getAggregateType(), AggregateType.REPLACE);
+ Assert.assertEquals(col4.getAggregateType(), AggregateType.REPLACE);
+ // clear
+ cols.remove(col3);
+ cols.remove(col4);
+ }
+
@Test
public void testCreateTableUniqueKeyMoW() throws UserException {
// setup
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org