cgivre commented on a change in pull request #1778: Drill-7233: Format Plugin for HDF5 URL: https://github.com/apache/drill/pull/1778#discussion_r347715490
########## File path: contrib/format-hdf5/src/main/java/org/apache/drill/exec/store/hdf5/writers/HDF5IntDataWriter.java ########## @@ -0,0 +1,126 @@ +/* + * 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.drill.exec.store.hdf5.writers; + +import ch.systemsx.cisd.hdf5.IHDF5Reader; +import org.apache.drill.common.types.TypeProtos; +import org.apache.drill.exec.physical.resultSet.RowSetLoader; +import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.record.metadata.MetadataUtils; +import org.apache.drill.exec.store.hdf5.HDF5Utils; +import org.apache.drill.exec.vector.accessor.ScalarWriter; + +import java.util.ArrayList; + +public class HDF5IntDataWriter extends HDF5DataWriter { + + private int[] data; + + private ArrayList<Integer> listData; + + private ScalarWriter rowWriter; + + private final boolean flattenMatrix = false; + + // TODO Deal with Long Ints + + // This constructor is used when the data is a 1D column. The column is inferred from the datapath + public HDF5IntDataWriter(IHDF5Reader reader, RowSetLoader columnWriter, String datapath) { + super(reader, columnWriter, datapath); + data = reader.readIntArray(datapath); + listData = new ArrayList<>(); + + for (int datum : data) { + listData.add(new Integer(datum)); + } + + fieldName = HDF5Utils.getNameFromPath(datapath); + ColumnMetadata colSchema = MetadataUtils.newScalar(fieldName, TypeProtos.MinorType.INT, TypeProtos.DataMode.OPTIONAL); + int index = columnWriter.addColumn(colSchema); + rowWriter = columnWriter.scalar(index); + } + + // This constructor is used when the data is part of a 2D array. In this case the column name is provided in the constructor + public HDF5IntDataWriter(IHDF5Reader reader, RowSetLoader columnWriter, String datapath, String fieldName, int currentColumn) { + super(reader, columnWriter, datapath, fieldName, currentColumn); + listData = new ArrayList<>(); + // Get dimensions + long[] dimensions = reader.object().getDataSetInformation(datapath).getDimensions(); + int[][] tempData; + if( dimensions.length == 2) { + tempData = transpose(reader.readIntMatrix(datapath)); + } else { + tempData = transpose(reader.int32().readMDArray(datapath).toMatrix()); + } + data = tempData[currentColumn]; + for (int datum : data) { + listData.add(datum); + } + + ColumnMetadata colSchema = MetadataUtils.newScalar(fieldName, TypeProtos.MinorType.INT, TypeProtos.DataMode.OPTIONAL); + int index = columnWriter.addColumn(colSchema); + rowWriter = columnWriter.scalar(index); + } + + public HDF5IntDataWriter(IHDF5Reader reader, RowSetLoader columnWriter, String fieldName, ArrayList<Integer> data) { + super(reader, columnWriter, null); + this.fieldName = fieldName; + this.listData = data; + + ColumnMetadata colSchema = MetadataUtils.newScalar(fieldName, TypeProtos.MinorType.INT, TypeProtos.DataMode.OPTIONAL); + int index = columnWriter.addColumn(colSchema); + rowWriter = columnWriter.scalar(index); + } + + + public boolean write() { + if (counter > listData.size()) { + return false; + } else { + rowWriter.setInt(listData.get(counter)); + counter++; Review comment: Fixed ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services
