alexjo2144 commented on code in PR #4537: URL: https://github.com/apache/iceberg/pull/4537#discussion_r876220290
########## core/src/main/java/org/apache/iceberg/stats/BlobMetadata.java: ########## @@ -0,0 +1,70 @@ +/* + * 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.stats; + +import java.util.List; +import javax.annotation.Nullable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; + +public class BlobMetadata { + private final String type; + private final List<Integer> columns; Review Comment: this is called `columnsCovered` in the Blob class. Maybe unify the field names? ########## core/src/main/java/org/apache/iceberg/stats/BlobMetadata.java: ########## @@ -0,0 +1,70 @@ +/* + * 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.stats; + +import java.util.List; +import javax.annotation.Nullable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; + +public class BlobMetadata { + private final String type; Review Comment: Should we have an enum for the Blob types? ########## core/src/main/java/org/apache/iceberg/stats/StatsFiles.java: ########## @@ -0,0 +1,68 @@ +/* + * 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.stats; + +import java.util.Map; +import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; + +public final class StatsFiles { + private StatsFiles() { + } + + public static WriteBuilder write(OutputFile outputFile) { + return new WriteBuilder(outputFile); + } + + public static class WriteBuilder { Review Comment: Does it buy you anything to have this as a nested class? It's the only thing in the StatsFile class ########## core/src/main/java/org/apache/iceberg/stats/FileMetadata.java: ########## @@ -0,0 +1,46 @@ +/* + * 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.stats; + +import java.util.List; +import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; + +public class FileMetadata { + private final List<BlobMetadata> blobs; + private final Map<String, String> properties; + + public FileMetadata(List<BlobMetadata> blobs, Map<String, String> properties) { + Preconditions.checkNotNull(blobs, "blobs is null"); + Preconditions.checkNotNull(properties, "properties is null"); Review Comment: The spec file says `properties` is optional, so should it be nullable here? ########## core/src/main/java/org/apache/iceberg/stats/StatsFormat.java: ########## @@ -0,0 +1,162 @@ +/* + * 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.stats; + +import io.airlift.compress.Compressor; +import io.airlift.compress.zstd.ZstdCompressor; +import io.airlift.compress.zstd.ZstdDecompressor; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.function.Function; +import java.util.stream.Stream; +import javax.annotation.Nullable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableTable; +import org.apache.iceberg.relocated.com.google.common.collect.Table; +import org.apache.iceberg.util.ByteBuffers; + +public final class StatsFormat { + private StatsFormat() { + } + + enum Flag { + FOOTER_PAYLOAD_COMPRESSED(0, 0), + /**/; + + private static final Table<Integer, Integer, Flag> byByteAndBit = Stream.of(values()) + .collect(ImmutableTable.toImmutableTable(Flag::byteNumber, Flag::bitNumber, Function.identity())); + + private final int byteNumber; + private final int bitNumber; + + Flag(int byteNumber, int bitNumber) { + this.byteNumber = byteNumber; + this.bitNumber = bitNumber; + } + + @Nullable + static Flag fromBit(int byteNumber, int bitNumber) { + return byByteAndBit.get(byteNumber, bitNumber); + } + + public int byteNumber() { + return byteNumber; + } + + public int bitNumber() { + return bitNumber; + } + } + + static final int FOOTER_MAGIC_OFFSET = 0; + static final int FOOTER_STRUCT_LENGTH = 12; + static final int FOOTER_STRUCT_PAYLOAD_SIZE_OFFSET = 0; + static final int FOOTER_STRUCT_FLAGS_OFFSET = 4; + static final int FOOTER_STRUCT_FLAGS_LENGTH = 4; + static final int FOOTER_STRUCT_MAGIC_OFFSET = 8; + static final StatsCompressionCodec FOOTER_COMPRESSION_CODEC = StatsCompressionCodec.LZ4; + + public static final String CREATED_BY_PROPERTY = "created-by"; + + static byte[] getMagic() { + return new byte[] {0x50, 0x46, 0x42, 0x31}; + } + + static void writeIntegerLittleEndian(OutputStream outputStream, int value) throws IOException { + outputStream.write(0xFF & value); + outputStream.write(0xFF & value >> 8); + outputStream.write(0xFF & value >> 16); + outputStream.write(0xFF & value >> 24); + } + + static int readIntegerLittleEndian(byte[] data, int offset) { + return Byte.toUnsignedInt(data[offset]) | + (Byte.toUnsignedInt(data[offset + 1]) << 8) | + (Byte.toUnsignedInt(data[offset + 2]) << 16) | + (Byte.toUnsignedInt(data[offset + 3]) << 24); + } + + static ByteBuffer compress(StatsCompressionCodec codec, ByteBuffer input) { + if (codec == StatsCompressionCodec.NONE) { + return input.duplicate(); + } + Compressor compressor = createCompressor(codec); + ByteBuffer output = ByteBuffer.allocate(compressor.maxCompressedLength(input.remaining())); + compressor.compress(input.duplicate(), output); + output.flip(); + return output; + } + + private static Compressor createCompressor(StatsCompressionCodec codec) { + switch (codec) { + case NONE: + break; Review Comment: Won't think fall through to the `throw UnsupportedOperationException`? ########## core/src/main/java/org/apache/iceberg/stats/StatsFormat.java: ########## @@ -0,0 +1,162 @@ +/* + * 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.stats; + +import io.airlift.compress.Compressor; +import io.airlift.compress.zstd.ZstdCompressor; +import io.airlift.compress.zstd.ZstdDecompressor; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.function.Function; +import java.util.stream.Stream; +import javax.annotation.Nullable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableTable; +import org.apache.iceberg.relocated.com.google.common.collect.Table; +import org.apache.iceberg.util.ByteBuffers; + +public final class StatsFormat { + private StatsFormat() { + } + + enum Flag { + FOOTER_PAYLOAD_COMPRESSED(0, 0), + /**/; + + private static final Table<Integer, Integer, Flag> byByteAndBit = Stream.of(values()) + .collect(ImmutableTable.toImmutableTable(Flag::byteNumber, Flag::bitNumber, Function.identity())); + + private final int byteNumber; + private final int bitNumber; + + Flag(int byteNumber, int bitNumber) { + this.byteNumber = byteNumber; Review Comment: Is it worth verifying both are positive and bitNumber < 8? ########## core/src/main/java/org/apache/iceberg/stats/StatsFormat.java: ########## @@ -0,0 +1,162 @@ +/* + * 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.stats; + +import io.airlift.compress.Compressor; +import io.airlift.compress.zstd.ZstdCompressor; +import io.airlift.compress.zstd.ZstdDecompressor; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.function.Function; +import java.util.stream.Stream; +import javax.annotation.Nullable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableTable; +import org.apache.iceberg.relocated.com.google.common.collect.Table; +import org.apache.iceberg.util.ByteBuffers; + +public final class StatsFormat { + private StatsFormat() { + } + + enum Flag { + FOOTER_PAYLOAD_COMPRESSED(0, 0), + /**/; + + private static final Table<Integer, Integer, Flag> byByteAndBit = Stream.of(values()) + .collect(ImmutableTable.toImmutableTable(Flag::byteNumber, Flag::bitNumber, Function.identity())); + + private final int byteNumber; + private final int bitNumber; + + Flag(int byteNumber, int bitNumber) { + this.byteNumber = byteNumber; + this.bitNumber = bitNumber; + } + + @Nullable + static Flag fromBit(int byteNumber, int bitNumber) { + return byByteAndBit.get(byteNumber, bitNumber); + } + + public int byteNumber() { + return byteNumber; + } + + public int bitNumber() { + return bitNumber; + } + } + + static final int FOOTER_MAGIC_OFFSET = 0; + static final int FOOTER_STRUCT_LENGTH = 12; + static final int FOOTER_STRUCT_PAYLOAD_SIZE_OFFSET = 0; + static final int FOOTER_STRUCT_FLAGS_OFFSET = 4; + static final int FOOTER_STRUCT_FLAGS_LENGTH = 4; + static final int FOOTER_STRUCT_MAGIC_OFFSET = 8; + static final StatsCompressionCodec FOOTER_COMPRESSION_CODEC = StatsCompressionCodec.LZ4; + + public static final String CREATED_BY_PROPERTY = "created-by"; + + static byte[] getMagic() { + return new byte[] {0x50, 0x46, 0x42, 0x31}; + } + + static void writeIntegerLittleEndian(OutputStream outputStream, int value) throws IOException { + outputStream.write(0xFF & value); + outputStream.write(0xFF & value >> 8); Review Comment: Maybe worth putting some parenthesis in for clarity -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
