openinx commented on a change in pull request #2566: URL: https://github.com/apache/iceberg/pull/2566#discussion_r630646966
########## File path: flink/src/main/java/org/apache/iceberg/flink/data/vectorized/ConstantColumnVectors.java ########## @@ -0,0 +1,216 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.flink.data.vectorized; + +import org.apache.flink.table.data.DecimalData; +import org.apache.flink.table.data.TimestampData; +import org.apache.flink.table.data.binary.BinaryStringData; +import org.apache.flink.table.data.vector.BooleanColumnVector; +import org.apache.flink.table.data.vector.BytesColumnVector; +import org.apache.flink.table.data.vector.DecimalColumnVector; +import org.apache.flink.table.data.vector.DoubleColumnVector; +import org.apache.flink.table.data.vector.FloatColumnVector; +import org.apache.flink.table.data.vector.IntColumnVector; +import org.apache.flink.table.data.vector.LongColumnVector; +import org.apache.flink.table.data.vector.TimestampColumnVector; + +class ConstantColumnVectors { + private ConstantColumnVectors() { + } + + static IntOrcColumnVector ints(Object constant) { + return new IntOrcColumnVector(constant); + } + + static LongOrcColumnVector longs(Object constant) { + return new LongOrcColumnVector(constant); + } + + static BooleanOrcColumnVector booleans(Object constant) { + return new BooleanOrcColumnVector(constant); + } + + static DoubleOrcColumnVector doubles(Object constant) { + return new DoubleOrcColumnVector(constant); + } + + static FloatOrcColumnVector floats(Object constant) { + return new FloatOrcColumnVector(constant); + } + + static DecimalOrcColumnVector decimals(Object constant) { + return new DecimalOrcColumnVector(constant); + } + + static TimestampOrcColumnVector timestamps(Object constant) { + return new TimestampOrcColumnVector(constant); + } + + static BytesOrcColumnVector bytes(Object constant) { + return new BytesOrcColumnVector(constant); + } + + private static class IntOrcColumnVector implements IntColumnVector { + + private Object constant; + + private IntOrcColumnVector(Object constant) { + this.constant = constant; + } + + @Override + public boolean isNullAt(int i) { + return false; Review comment: If the `constant` instance is null, then this method should return `true`, right ? So the correct way is: `return constant == null` here ? ########## File path: flink/src/main/java/org/apache/iceberg/flink/data/vectorized/ConstantColumnVectors.java ########## @@ -0,0 +1,216 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.flink.data.vectorized; + +import org.apache.flink.table.data.DecimalData; +import org.apache.flink.table.data.TimestampData; +import org.apache.flink.table.data.binary.BinaryStringData; +import org.apache.flink.table.data.vector.BooleanColumnVector; +import org.apache.flink.table.data.vector.BytesColumnVector; +import org.apache.flink.table.data.vector.DecimalColumnVector; +import org.apache.flink.table.data.vector.DoubleColumnVector; +import org.apache.flink.table.data.vector.FloatColumnVector; +import org.apache.flink.table.data.vector.IntColumnVector; +import org.apache.flink.table.data.vector.LongColumnVector; +import org.apache.flink.table.data.vector.TimestampColumnVector; + +class ConstantColumnVectors { + private ConstantColumnVectors() { + } + + static IntOrcColumnVector ints(Object constant) { Review comment: The `IntOrcColumnVector` could also be used for parquet vectorized reader , right ? So maybe it's better to name it as `ConstantIntColumnVector`. Besides, we don't need to expose the `IntOrcColumnVector` to the package classes, using the `ColumnVector` interface is enough I think. ########## File path: flink/src/main/java/org/apache/iceberg/flink/data/vectorized/VectorizedFlinkOrcReaders.java ########## @@ -0,0 +1,278 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.flink.data.vectorized; + +import java.util.List; +import java.util.Map; +import org.apache.flink.orc.nohive.vector.OrcNoHiveBytesVector; +import org.apache.flink.orc.nohive.vector.OrcNoHiveDecimalVector; +import org.apache.flink.orc.nohive.vector.OrcNoHiveDoubleVector; +import org.apache.flink.orc.nohive.vector.OrcNoHiveLongVector; +import org.apache.flink.orc.nohive.vector.OrcNoHiveTimestampVector; +import org.apache.flink.table.data.ArrayData; +import org.apache.flink.table.data.ColumnarArrayData; +import org.apache.flink.table.data.ColumnarRowData; +import org.apache.flink.table.data.vector.ArrayColumnVector; +import org.apache.flink.table.data.vector.ColumnVector; +import org.apache.flink.table.data.vector.RowColumnVector; +import org.apache.flink.table.data.vector.VectorizedColumnBatch; +import org.apache.iceberg.MetadataColumns; +import org.apache.iceberg.Schema; +import org.apache.iceberg.orc.OrcBatchReader; +import org.apache.iceberg.orc.OrcSchemaWithTypeVisitor; +import org.apache.iceberg.types.Type; +import org.apache.iceberg.types.Types; +import org.apache.orc.TypeDescription; +import org.apache.orc.storage.ql.exec.vector.BytesColumnVector; +import org.apache.orc.storage.ql.exec.vector.DecimalColumnVector; +import org.apache.orc.storage.ql.exec.vector.DoubleColumnVector; +import org.apache.orc.storage.ql.exec.vector.ListColumnVector; +import org.apache.orc.storage.ql.exec.vector.LongColumnVector; +import org.apache.orc.storage.ql.exec.vector.StructColumnVector; +import org.apache.orc.storage.ql.exec.vector.TimestampColumnVector; +import org.apache.orc.storage.ql.exec.vector.VectorizedRowBatch; + +public class VectorizedFlinkOrcReaders { + private VectorizedFlinkOrcReaders() { + } + + public static OrcBatchReader<VectorizedColumnBatch> buildReader(Schema expectedSchema, TypeDescription fileSchema, + Map<Integer, ?> idToConstant) { + Converter converter = OrcSchemaWithTypeVisitor.visit(expectedSchema, fileSchema, new ReadBuilder(idToConstant)); + + return new OrcBatchReader<VectorizedColumnBatch>() { + private long batchOffsetInFile; + + @Override + public VectorizedColumnBatch read(VectorizedRowBatch batch) { + FlinkRowColumnVector cv = (FlinkRowColumnVector) converter.convert( + new StructColumnVector(batch.size, batch.cols), batch.size, batchOffsetInFile); + + VectorizedColumnBatch columnarBatch = new VectorizedColumnBatch(cv.getFieldVectors()); + columnarBatch.setNumRows(batch.size); + return columnarBatch; + } + + @Override + public void setBatchContext(long batchOffsetInFile) { + this.batchOffsetInFile = batchOffsetInFile; + } + }; + } + + private interface Converter { + ColumnVector convert(org.apache.orc.storage.ql.exec.vector.ColumnVector columnVector, int batchSize, + long batchOffsetInFile); + } + + private static class ReadBuilder extends OrcSchemaWithTypeVisitor<Converter> { + private final Map<Integer, ?> idToConstant; + + private ReadBuilder(Map<Integer, ?> idToConstant) { + this.idToConstant = idToConstant; + } + + @Override + public Converter record(Types.StructType iStruct, TypeDescription record, List<String> names, + List<Converter> fields) { + return new StructConverter(iStruct, fields, idToConstant); + } + + @Override + public Converter list(Types.ListType iList, TypeDescription array, Converter element) { + return new StructConverter.ArrayConverter(element); + } + + @Override + public Converter map(Types.MapType iMap, TypeDescription map, Converter key, Converter value) { + throw new UnsupportedOperationException(); + } + + @Override + public Converter primitive(Type.PrimitiveType iPrimitive, TypeDescription primitive) { + return (vector, batchSize, batchOffsetInFile) -> { + if (vector instanceof LongColumnVector) { + return new OrcNoHiveLongVector((LongColumnVector) vector); + } else if (vector instanceof DoubleColumnVector) { + return new OrcNoHiveDoubleVector((DoubleColumnVector) vector); + } else if (vector instanceof BytesColumnVector) { + return new OrcNoHiveBytesVector((BytesColumnVector) vector); + } else if (vector instanceof DecimalColumnVector) { + return new OrcNoHiveDecimalVector((DecimalColumnVector) vector); + } else if (vector instanceof TimestampColumnVector) { + return new OrcNoHiveTimestampVector((TimestampColumnVector) vector); + } else { + throw new UnsupportedOperationException( + "Unsupported vector: " + vector.getClass().getName()); + } + }; + } + } + + private static class LongOrcColumnVector implements org.apache.flink.table.data.vector.LongColumnVector { + private long batchOffsetInFile; + + LongOrcColumnVector(long batchOffsetInFile) { + this.batchOffsetInFile = batchOffsetInFile; + } + + @Override + public boolean isNullAt(int i) { + return false; + } + + @Override + public long getLong(int i) { + return batchOffsetInFile + i; + } + } + + private static class StructConverter implements Converter { + private final Types.StructType structType; + private final List<Converter> fieldConverters; + private final Map<Integer, ?> idToConstant; + + private StructConverter(Types.StructType structType, List<Converter> fieldConverters, + Map<Integer, ?> idToConstant) { + this.structType = structType; + this.fieldConverters = fieldConverters; + this.idToConstant = idToConstant; + } + + @Override + public ColumnVector convert(org.apache.orc.storage.ql.exec.vector.ColumnVector vector, int batchSize, + long batchOffsetInFile) { + StructColumnVector structVector = (StructColumnVector) vector; + List<Types.NestedField> fields = structType.fields(); + ColumnVector[] fieldVectors = new ColumnVector[fields.size()]; + for (int pos = 0; pos < fields.size(); pos++) { + Types.NestedField field = fields.get(pos); + if (idToConstant.containsKey(field.fieldId())) { + fieldVectors[pos] = getConstantVectors(field.type(), idToConstant.get(field.fieldId())); + } else if (field.equals(MetadataColumns.ROW_POSITION)) { + fieldVectors[pos] = new LongOrcColumnVector(batchOffsetInFile); + } else { + fieldVectors[pos] = fieldConverters.get(pos) + .convert(structVector.fields[pos], batchSize, batchOffsetInFile); + } + } + + return new FlinkRowColumnVector(fieldVectors, structVector); + } + + private ColumnVector getConstantVectors(Type type, Object constant) { + if (type.isPrimitiveType()) { + Type.TypeID typeID = type.typeId(); + switch (typeID) { + case INTEGER: + case DATE: + case TIME: + return ConstantColumnVectors.ints(constant); + + case LONG: + return ConstantColumnVectors.longs(constant); + + case BOOLEAN: + return ConstantColumnVectors.booleans(constant); + + case DOUBLE: + return ConstantColumnVectors.doubles(constant); + + case FLOAT: + return ConstantColumnVectors.floats(constant); + + case DECIMAL: + return ConstantColumnVectors.decimals(constant); + + case TIMESTAMP: + return ConstantColumnVectors.timestamps(constant); + + case STRING: + return ConstantColumnVectors.bytes(constant); + + default: + throw new UnsupportedOperationException("Unsupported data type for constant."); Review comment: For the iceberg data type `UUID`, `FIXED`, `BINARY` cases, we should return `ConstantColumnVectors.bytes(constant)`. The correct mapping relationships (iceberg data types <=> flink data types <=> orc data types) are [here](https://github.com/apache/iceberg/blob/90225d6c9413016d611e2ce5eff37db1bc1b4fc5/flink/src/main/java/org/apache/iceberg/flink/data/FlinkOrcReader.java#L87). ########## File path: flink/src/main/java/org/apache/iceberg/flink/data/vectorized/VectorizedFlinkOrcReaders.java ########## @@ -0,0 +1,278 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.flink.data.vectorized; + +import java.util.List; +import java.util.Map; +import org.apache.flink.orc.nohive.vector.OrcNoHiveBytesVector; +import org.apache.flink.orc.nohive.vector.OrcNoHiveDecimalVector; +import org.apache.flink.orc.nohive.vector.OrcNoHiveDoubleVector; +import org.apache.flink.orc.nohive.vector.OrcNoHiveLongVector; +import org.apache.flink.orc.nohive.vector.OrcNoHiveTimestampVector; +import org.apache.flink.table.data.ArrayData; +import org.apache.flink.table.data.ColumnarArrayData; +import org.apache.flink.table.data.ColumnarRowData; +import org.apache.flink.table.data.vector.ArrayColumnVector; +import org.apache.flink.table.data.vector.ColumnVector; +import org.apache.flink.table.data.vector.RowColumnVector; +import org.apache.flink.table.data.vector.VectorizedColumnBatch; +import org.apache.iceberg.MetadataColumns; +import org.apache.iceberg.Schema; +import org.apache.iceberg.orc.OrcBatchReader; +import org.apache.iceberg.orc.OrcSchemaWithTypeVisitor; +import org.apache.iceberg.types.Type; +import org.apache.iceberg.types.Types; +import org.apache.orc.TypeDescription; +import org.apache.orc.storage.ql.exec.vector.BytesColumnVector; +import org.apache.orc.storage.ql.exec.vector.DecimalColumnVector; +import org.apache.orc.storage.ql.exec.vector.DoubleColumnVector; +import org.apache.orc.storage.ql.exec.vector.ListColumnVector; +import org.apache.orc.storage.ql.exec.vector.LongColumnVector; +import org.apache.orc.storage.ql.exec.vector.StructColumnVector; +import org.apache.orc.storage.ql.exec.vector.TimestampColumnVector; +import org.apache.orc.storage.ql.exec.vector.VectorizedRowBatch; + +public class VectorizedFlinkOrcReaders { + private VectorizedFlinkOrcReaders() { + } + + public static OrcBatchReader<VectorizedColumnBatch> buildReader(Schema expectedSchema, TypeDescription fileSchema, + Map<Integer, ?> idToConstant) { + Converter converter = OrcSchemaWithTypeVisitor.visit(expectedSchema, fileSchema, new ReadBuilder(idToConstant)); + + return new OrcBatchReader<VectorizedColumnBatch>() { + private long batchOffsetInFile; + + @Override + public VectorizedColumnBatch read(VectorizedRowBatch batch) { + FlinkRowColumnVector cv = (FlinkRowColumnVector) converter.convert( + new StructColumnVector(batch.size, batch.cols), batch.size, batchOffsetInFile); + + VectorizedColumnBatch columnarBatch = new VectorizedColumnBatch(cv.getFieldVectors()); + columnarBatch.setNumRows(batch.size); + return columnarBatch; + } + + @Override + public void setBatchContext(long batchOffsetInFile) { + this.batchOffsetInFile = batchOffsetInFile; + } + }; + } + + private interface Converter { + ColumnVector convert(org.apache.orc.storage.ql.exec.vector.ColumnVector columnVector, int batchSize, + long batchOffsetInFile); + } + + private static class ReadBuilder extends OrcSchemaWithTypeVisitor<Converter> { + private final Map<Integer, ?> idToConstant; + + private ReadBuilder(Map<Integer, ?> idToConstant) { + this.idToConstant = idToConstant; + } + + @Override + public Converter record(Types.StructType iStruct, TypeDescription record, List<String> names, + List<Converter> fields) { + return new StructConverter(iStruct, fields, idToConstant); + } + + @Override + public Converter list(Types.ListType iList, TypeDescription array, Converter element) { + return new StructConverter.ArrayConverter(element); + } + + @Override + public Converter map(Types.MapType iMap, TypeDescription map, Converter key, Converter value) { + throw new UnsupportedOperationException(); + } + + @Override + public Converter primitive(Type.PrimitiveType iPrimitive, TypeDescription primitive) { + return (vector, batchSize, batchOffsetInFile) -> { + if (vector instanceof LongColumnVector) { + return new OrcNoHiveLongVector((LongColumnVector) vector); + } else if (vector instanceof DoubleColumnVector) { + return new OrcNoHiveDoubleVector((DoubleColumnVector) vector); + } else if (vector instanceof BytesColumnVector) { + return new OrcNoHiveBytesVector((BytesColumnVector) vector); + } else if (vector instanceof DecimalColumnVector) { + return new OrcNoHiveDecimalVector((DecimalColumnVector) vector); + } else if (vector instanceof TimestampColumnVector) { + return new OrcNoHiveTimestampVector((TimestampColumnVector) vector); + } else { + throw new UnsupportedOperationException( + "Unsupported vector: " + vector.getClass().getName()); + } + }; + } + } + + private static class LongOrcColumnVector implements org.apache.flink.table.data.vector.LongColumnVector { + private long batchOffsetInFile; + + LongOrcColumnVector(long batchOffsetInFile) { + this.batchOffsetInFile = batchOffsetInFile; + } + + @Override + public boolean isNullAt(int i) { + return false; + } + + @Override + public long getLong(int i) { + return batchOffsetInFile + i; + } + } + + private static class StructConverter implements Converter { + private final Types.StructType structType; + private final List<Converter> fieldConverters; + private final Map<Integer, ?> idToConstant; + + private StructConverter(Types.StructType structType, List<Converter> fieldConverters, + Map<Integer, ?> idToConstant) { + this.structType = structType; + this.fieldConverters = fieldConverters; + this.idToConstant = idToConstant; + } + + @Override + public ColumnVector convert(org.apache.orc.storage.ql.exec.vector.ColumnVector vector, int batchSize, + long batchOffsetInFile) { + StructColumnVector structVector = (StructColumnVector) vector; + List<Types.NestedField> fields = structType.fields(); + ColumnVector[] fieldVectors = new ColumnVector[fields.size()]; + for (int pos = 0; pos < fields.size(); pos++) { + Types.NestedField field = fields.get(pos); + if (idToConstant.containsKey(field.fieldId())) { + fieldVectors[pos] = getConstantVectors(field.type(), idToConstant.get(field.fieldId())); + } else if (field.equals(MetadataColumns.ROW_POSITION)) { + fieldVectors[pos] = new LongOrcColumnVector(batchOffsetInFile); + } else { + fieldVectors[pos] = fieldConverters.get(pos) + .convert(structVector.fields[pos], batchSize, batchOffsetInFile); + } + } + + return new FlinkRowColumnVector(fieldVectors, structVector); + } + + private ColumnVector getConstantVectors(Type type, Object constant) { + if (type.isPrimitiveType()) { + Type.TypeID typeID = type.typeId(); + switch (typeID) { + case INTEGER: + case DATE: + case TIME: + return ConstantColumnVectors.ints(constant); + + case LONG: + return ConstantColumnVectors.longs(constant); + + case BOOLEAN: + return ConstantColumnVectors.booleans(constant); + + case DOUBLE: + return ConstantColumnVectors.doubles(constant); + + case FLOAT: + return ConstantColumnVectors.floats(constant); + + case DECIMAL: + return ConstantColumnVectors.decimals(constant); + + case TIMESTAMP: + return ConstantColumnVectors.timestamps(constant); + + case STRING: + return ConstantColumnVectors.bytes(constant); Review comment: In this case, we should return a `ColumnVector` with the `StringData` data type, because we will need to convert the ORC backend `bytes` to flink's `StringData` so that apache flink could recognize it as flink's `String`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
