[GitHub] [iceberg] ggershinsky commented on a diff in pull request #6450: Core: Key metadata in Avro format

["ggershinsky (via GitHub)" <gi...@apache.org>]

ggershinsky commented on code in PR #6450:
URL: https://github.com/apache/iceberg/pull/6450#discussion_r1161488329


##########
core/src/main/java/org/apache/iceberg/encryption/KeyMetadataDecoder.java:
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.encryption;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import org.apache.avro.AvroRuntimeException;
+import org.apache.avro.Schema;
+import org.apache.avro.io.BinaryDecoder;
+import org.apache.avro.io.DatumReader;
+import org.apache.avro.io.DecoderFactory;
+import org.apache.avro.message.BadHeaderException;
+import org.apache.avro.message.MessageDecoder;
+import org.apache.avro.message.MissingSchemaException;
+import org.apache.iceberg.avro.AvroSchemaUtil;
+import org.apache.iceberg.avro.ProjectionDatumReader;
+import org.apache.iceberg.data.avro.DataReader;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
+import org.apache.iceberg.relocated.com.google.common.collect.MapMaker;
+
+public class KeyMetadataDecoder<D> extends MessageDecoder.BaseDecoder<D> {
+  private final org.apache.iceberg.Schema readSchema;
+  private final Map<Byte, RawDecoder<D>> decoders = new MapMaker().makeMap();
+  private final byte[] versionBuffer;
+
+  /**
+   * Creates a new decoder that constructs datum instances described by an {@link
+   * org.apache.iceberg.Schema Iceberg schema}.
+   *
+   * <p>The {@code readSchema} is as used the expected schema (read schema). Datum instances created
+   * by this class will are described by the expected schema.
+   *
+   * @param readSchema the schema used to construct datum instances
+   */
+  public KeyMetadataDecoder(byte currentSchemaVersion, org.apache.iceberg.Schema readSchema) {
+    this.readSchema = readSchema;
+    addSchema(currentSchemaVersion, this.readSchema);
+    this.versionBuffer = new byte[1];
+  }
+
+  /**
+   * Adds an {@link org.apache.iceberg.Schema Iceberg schema} that can be used to decode buffers.
+   *
+   * @param writeSchema a schema to use when decoding buffers
+   */
+  public void addSchema(byte schemaVersion, org.apache.iceberg.Schema writeSchema) {
+    decoders.put(
+        schemaVersion,
+        new KeyMetadataDecoder.RawDecoder<>(
+            readSchema, AvroSchemaUtil.convert(writeSchema, "key_metadata")));
+  }
+
+  @Override
+  public D decode(InputStream stream, D reuse) throws IOException {
+    try {
+      if (!readFully(stream, versionBuffer)) {

Review Comment:
   Agreed. It was a copy/paste from the source. But a simple read is better for a single byte.



-- 
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: issues-unsubscribe@iceberg.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org