vrozov commented on a change in pull request #1383: DRILL-6613: Refactor MaterializedField URL: https://github.com/apache/drill/pull/1383#discussion_r203416964
########## File path: exec/vector/src/main/java/org/apache/drill/exec/record/MaterializedField.java ########## @@ -49,39 +54,79 @@ private MaterializedField(String name, MajorType type, LinkedHashSet<Materialize this.children = children; } + private MaterializedField(String name, MajorType type, int size) { + this(name, type, new LinkedHashSet<>(size)); + } + + private <T> void copyFrom(Collection<T> source, Function<T, MaterializedField> transformation) { + Preconditions.checkState(children.isEmpty()); + source.forEach(child -> children.add(transformation.apply(child))); + } + + public static MaterializedField create(String name, MajorType type) { + return new MaterializedField(name, type, 0); + } + public static MaterializedField create(SerializedField serField) { - LinkedHashSet<MaterializedField> children = new LinkedHashSet<>(); - for (SerializedField sf : serField.getChildList()) { - children.add(MaterializedField.create(sf)); + MaterializedField field = new MaterializedField(serField.getNamePart().getName(), serField.getMajorType(), serField.getChildCount()); + if (OFFSETS_FIELD.equals(field)) { + return OFFSETS_FIELD; } - return new MaterializedField(serField.getNamePart().getName(), serField.getMajorType(), children); + field.copyFrom(serField.getChildList(), MaterializedField::create); + return field; } - /** - * Create and return a serialized field based on the current state. - */ - public SerializedField getSerializedField() { - SerializedField.Builder serializedFieldBuilder = getAsBuilder(); - for(MaterializedField childMaterializedField : getChildren()) { - serializedFieldBuilder.addChild(childMaterializedField.getSerializedField()); + public MaterializedField copy() { + return copy(getName(), getType()); + } + + public MaterializedField copy(MajorType type) { + return copy(name, type); + } Review comment: Please see my comment regarding `clone()`, copy constructor and a builder design pattern. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services