Revert "[pick](nestedtype)support nested type with agg replace_if_not…

…_null apache#38304 (apache#38716)" This reverts commit ba2d3dd.
mongo360 · Aug 27, 2024 · 945ebe9 · 945ebe9
1 parent 917306c
commit 945ebe9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 377 deletions.
diff --git a/be/src/vec/columns/column_nullable.h b/be/src/vec/columns/column_nullable.h
@@ -353,6 +353,8 @@ class ColumnNullable final : public COWHelper<IColumn, ColumnNullable> {
 
         if (!nullable_rhs.is_null_at(row)) {
             nested_column->replace_column_data(*nullable_rhs.nested_column, row, self_row);
+        } else {
+            nested_column->replace_column_data_default(self_row);
         }
     }
 

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
@@ -494,12 +494,11 @@ public void analyze(Analyzer analyzer) throws UserException, AnalysisException {
             columnDef.analyze(engineName.equals("olap"));
 
             if (columnDef.getType().isComplexType() && engineName.equals("olap")) {
-                if (columnDef.getAggregateType() != null && columnDef.getAggregateType() != AggregateType.NONE
-                        && columnDef.getAggregateType() != AggregateType.REPLACE
-                        && columnDef.getAggregateType() != AggregateType.REPLACE_IF_NOT_NULL) {
-                    throw new AnalysisException(
-                            columnDef.getType().getPrimitiveType() + " column can't support aggregation "
-                                    + columnDef.getAggregateType());
+                if (columnDef.getAggregateType() != null
+                        && columnDef.getAggregateType() != AggregateType.NONE
+                        && columnDef.getAggregateType() != AggregateType.REPLACE) {
+                    throw new AnalysisException(columnDef.getType().getPrimitiveType()
+                            + " column can't support aggregation " + columnDef.getAggregateType());
                 }
                 if (columnDef.isKey()) {
                     throw new AnalysisException(columnDef.getType().getPrimitiveType()

diff --git a/...ssion-test/data/datatype_p0/nested_types/ddl/create_nestedtypes_with_replaceIfNOtNull.out b/...ssion-test/data/datatype_p0/nested_types/ddl/create_nestedtypes_with_replaceIfNOtNull.out