[FIX](complextype) fxi array nested struct literal apache#26270 (apac…

…he#26778)

be/src/olap/rowset/segment_v2/column_reader.cpp

@@ -87,6 +87,7 @@ Status ColumnReader::create(const ColumnReaderOptions& opts, const ColumnMetaPB&
  case FieldType::OLAP_FIELD_TYPE_STRUCT: {
  // not support empty struct
  DCHECK(meta.children_columns_size() >= 1);
+ num_rows = meta.children_columns(0).num_rows();
  // create struct column reader
  std::unique_ptr<ColumnReader> struct_reader(
  new ColumnReader(opts, meta, num_rows, file_reader));

fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java

@@ -163,6 +163,16 @@ public static boolean canCastTo(ArrayType type, ArrayType targetType) {
  return Type.canCastTo(type.getItemType(), targetType.getItemType());
  }
 
+ public static Type getAssignmentCompatibleType(ArrayType t1, ArrayType t2, boolean strict) {
+ Type itemCompatibleType = Type.getAssignmentCompatibleType(t1.getItemType(), t2.getItemType(), strict);
+
+ if (itemCompatibleType.isInvalid()) {
+ return ScalarType.INVALID;
+ }
+
+ return new ArrayType(itemCompatibleType, t1.getContainsNull() || t2.getContainsNull());
+ }
+
  @Override
  public void toThrift(TTypeDesc container) {
  TTypeNode node = new TTypeNode();

fe/fe-common/src/main/java/org/apache/doris/catalog/MapType.java

@@ -198,6 +198,21 @@ public static boolean canCastTo(MapType type, MapType targetType) {
  || targetType.getValueType().isStringType() && type.getValueType().isStringType());
  }
 
+ public static Type getAssignmentCompatibleType(MapType t1, MapType t2, boolean strict) {
+ Type keyCompatibleType = Type.getAssignmentCompatibleType(t1.getKeyType(), t2.getKeyType(), strict);
+ if (keyCompatibleType.isInvalid()) {
+ return ScalarType.INVALID;
+ }
+ Type valCompatibleType = Type.getAssignmentCompatibleType(t1.getValueType(), t2.getValueType(), strict);
+ if (valCompatibleType.isInvalid()) {
+ return ScalarType.INVALID;
+ }
+
+ return new MapType(keyCompatibleType, valCompatibleType,
+ t1.getIsKeyContainsNull() || t2.getIsKeyContainsNull(),
+ t1.getIsValueContainsNull() || t2.getIsValueContainsNull());
+ }
+
  @Override
  public boolean supportSubType(Type subType) {
  for (Type supportedType : Type.getMapSubTypes()) {

fe/fe-common/src/main/java/org/apache/doris/catalog/StructType.java

@@ -29,6 +29,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.annotations.SerializedName;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -110,6 +111,29 @@ public static boolean canCastTo(StructType type, StructType targetType) {
  return true;
  }
 
+ public static Type getAssignmentCompatibleType(StructType t1, StructType t2, boolean strict) {
+ ArrayList<StructField> fieldsLeft = t1.getFields();
+ ArrayList<StructField> fieldsRight = t2.getFields();
+ ArrayList<StructField> fieldsRes = new ArrayList<>();
+
+ for (int i = 0; i < t1.getFields().size(); ++i) {
+ StructField leftField = fieldsLeft.get(i);
+ StructField rightField = fieldsRight.get(i);
+ Type itemCompatibleType = Type.getAssignmentCompatibleType(leftField.getType(), rightField.getType(),
+ strict);
+ if (itemCompatibleType.isInvalid()) {
+ return ScalarType.INVALID;
+ }
+ fieldsRes.add(new StructField(StringUtils.isEmpty(leftField.getName()) ? rightField.getName()
+ : leftField.getName(),
+ itemCompatibleType, StringUtils.isEmpty(leftField.getComment()) ? rightField.getComment()
+ : leftField.getComment(), leftField.getContainsNull() || rightField.getContainsNull()));
+
+ }
+
+ return new StructType(fieldsRes);
+ }
+
  @Override
  public boolean isSupported() {
  for (StructField f : fields) {

fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java

@@ -746,19 +746,14 @@ public static Type getAssignmentCompatibleType(Type t1, Type t2, boolean strict)
  }
 
  if (t1.isArrayType() && t2.isArrayType()) {
- ArrayType arrayType1 = (ArrayType) t1;
- ArrayType arrayType2 = (ArrayType) t2;
- Type itemCompatibleType = Type.getAssignmentCompatibleType(arrayType1.getItemType(),
- arrayType2.getItemType(), strict);
-
- if (itemCompatibleType.isInvalid()) {
- return itemCompatibleType;
- }
-
- return new ArrayType(itemCompatibleType, arrayType1.getContainsNull() || arrayType2.getContainsNull());
- } else if (t1.isArrayType() && t2.isNull()) {
+ return ArrayType.getAssignmentCompatibleType((ArrayType) t1, (ArrayType) t2, strict);
+ } else if (t1.isMapType() && t2.isMapType()) {
+ return MapType.getAssignmentCompatibleType((MapType) t1, (MapType) t2, strict);
+ } else if (t1.isStructType() && t2.isStructType()) {
+ return StructType.getAssignmentCompatibleType((StructType) t1, (StructType) t2, strict);
+ } else if (t1.isComplexType() && t2.isNull()) {
  return t1;
- } else if (t1.isNull() && t2.isArrayType()) {
+ } else if (t1.isNull() && t2.isComplexType()) {
  return t2;
  }
 
@@ -1963,17 +1958,15 @@ public static boolean matchExactType(Type type1, Type type2, boolean ignorePreci
  } else if (type2.isArrayType()) {
  // For types array, we also need to check contains null for case like
  // cast(array<not_null(int)> as array<int>)
- if (!((ArrayType) type2).getContainsNull() == ((ArrayType) type1).getContainsNull()) {
+ if (((ArrayType) type2).getContainsNull() != ((ArrayType) type1).getContainsNull()) {
  return false;
  }
  return matchExactType(((ArrayType) type2).getItemType(), ((ArrayType) type1).getItemType());
  } else if (type2.isMapType()) {
- // For types array, we also need to check contains null for case like
- // cast(array<not_null(int)> as array<int>)
- if (!((MapType) type2).getIsKeyContainsNull() == ((MapType) type1).getIsKeyContainsNull()) {
+ if (((MapType) type2).getIsKeyContainsNull() != ((MapType) type1).getIsKeyContainsNull()) {
  return false;
  }
- if (!((MapType) type2).getIsValueContainsNull() == ((MapType) type1).getIsValueContainsNull()) {
+ if (((MapType) type2).getIsValueContainsNull() != ((MapType) type1).getIsValueContainsNull()) {
  return false;
  }
  return matchExactType(((MapType) type2).getKeyType(), ((MapType) type1).getKeyType())