stevenzwu commented on code in PR #7791: URL: https://github.com/apache/iceberg/pull/7791#discussion_r1240396863
########## core/src/test/java/org/apache/iceberg/data/avro/TestDecoderResolver.java: ########## @@ -0,0 +1,167 @@ +/* + * 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.data.avro; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Set; +import java.util.concurrent.TimeUnit; +import org.apache.avro.Schema; +import org.apache.avro.io.Decoder; +import org.apache.avro.io.DecoderFactory; +import org.apache.avro.io.ResolvingDecoder; +import org.apache.iceberg.ManifestFile; +import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.awaitility.Awaitility; +import org.junit.Before; +import org.junit.Test; + +public class TestDecoderResolver { Review Comment: nice test ########## core/src/test/java/org/apache/iceberg/data/avro/TestDecoderResolver.java: ########## @@ -0,0 +1,167 @@ +/* + * 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.data.avro; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Set; +import java.util.concurrent.TimeUnit; +import org.apache.avro.Schema; +import org.apache.avro.io.Decoder; +import org.apache.avro.io.DecoderFactory; +import org.apache.avro.io.ResolvingDecoder; +import org.apache.iceberg.ManifestFile; +import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.awaitility.Awaitility; +import org.junit.Before; +import org.junit.Test; + +public class TestDecoderResolver { + + @Before + public void before() { + DecoderResolver.DECODER_CACHES.get().clear(); + } + + @Test + public void testDecoderCachingReadSchemaSameAsFileSchema() throws Exception { + Decoder dummyDecoder = DecoderFactory.get().binaryDecoder(new byte[] {}, null); + Schema fileSchema = avroSchema(); + ResolvingDecoder resolvingDecoder = + DecoderResolver.resolve(dummyDecoder, fileSchema, fileSchema); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(1); + assertThat(DecoderResolver.DECODER_CACHES.get().get(fileSchema).size()).isEqualTo(1); + checkCached(fileSchema, fileSchema); + + // Equal but new one + Schema fileSchema1 = avroSchema(); + assertThat(fileSchema1).isEqualTo(fileSchema); + ResolvingDecoder resolvingDecoder1 = + DecoderResolver.resolve(dummyDecoder, fileSchema1, fileSchema1); + assertThat(resolvingDecoder1).isNotSameAs(resolvingDecoder); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(2); + assertThat(DecoderResolver.DECODER_CACHES.get().get(fileSchema1).size()).isEqualTo(1); + checkCached(fileSchema1, fileSchema1); + + // New one + Schema fileSchema2 = avroSchema("manifest_path", "manifest_length"); + ResolvingDecoder resolvingDecoder2 = + DecoderResolver.resolve(dummyDecoder, fileSchema2, fileSchema2); + assertThat(resolvingDecoder2).isNotSameAs(resolvingDecoder); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(3); + assertThat(DecoderResolver.DECODER_CACHES.get().get(fileSchema2).size()).isEqualTo(1); + checkCached(fileSchema2, fileSchema2); + + checkCachedSize(3); + + fileSchema = null; + checkCachedSize(2); + + fileSchema1 = null; + checkCachedSize(1); + + fileSchema2 = null; + checkCachedSize(0); + } + + @Test + public void testDecoderCachingReadSchemaNotSameAsFileSchema() throws Exception { + Decoder dummyDecoder = DecoderFactory.get().binaryDecoder(new byte[] {}, null); + Schema fileSchema = avroSchema(); + Schema readSchema = avroSchema("manifest_path", "manifest_length", "partition_spec_id"); + ResolvingDecoder resolvingDecoder = + DecoderResolver.resolve(dummyDecoder, readSchema, fileSchema); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(1); + assertThat(DecoderResolver.DECODER_CACHES.get().get(readSchema).size()).isEqualTo(1); + checkCached(readSchema, fileSchema); + + // Equal but new one + Schema fileSchema1 = avroSchema(); + Schema readSchema1 = avroSchema("manifest_path", "manifest_length", "partition_spec_id"); + assertThat(fileSchema1).isEqualTo(fileSchema); + assertThat(readSchema1).isEqualTo(readSchema); + ResolvingDecoder resolvingDecoder1 = + DecoderResolver.resolve(dummyDecoder, readSchema1, fileSchema1); + assertThat(resolvingDecoder1).isNotSameAs(resolvingDecoder); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(2); + assertThat(DecoderResolver.DECODER_CACHES.get().get(readSchema1).size()).isEqualTo(1); + checkCached(readSchema1, fileSchema1); + + // New read schema + Schema readSchema2 = avroSchema("manifest_path", "manifest_length"); + ResolvingDecoder resolvingDecoder2 = + DecoderResolver.resolve(dummyDecoder, readSchema2, fileSchema); + assertThat(resolvingDecoder2).isNotSameAs(resolvingDecoder); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(3); + assertThat(DecoderResolver.DECODER_CACHES.get().get(readSchema2).size()).isEqualTo(1); + checkCached(readSchema2, fileSchema); + + checkCachedSize(3); + + readSchema = null; + checkCachedSize(2); + + readSchema1 = null; + checkCachedSize(1); + + readSchema2 = null; + checkCachedSize(0); + } + + private Schema avroSchema(String... columns) { + if (columns.length == 0) { + return AvroSchemaUtil.convert(ManifestFile.schema(), "manifest_file"); + } else { + return AvroSchemaUtil.convert(ManifestFile.schema().select(columns), "manifest_file"); + } + } + + private void checkCached(Schema readSchema, Schema fileSchema) { + assertThat(DecoderResolver.DECODER_CACHES.get().containsKey(readSchema)).isTrue(); Review Comment: nit: should we change to style like `assertThat(DecoderResolver.DECODER_CACHES.get()).containsKey(readSchema)` ########## core/src/test/java/org/apache/iceberg/data/avro/TestDecoderResolver.java: ########## @@ -0,0 +1,167 @@ +/* + * 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.data.avro; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Set; +import java.util.concurrent.TimeUnit; +import org.apache.avro.Schema; +import org.apache.avro.io.Decoder; +import org.apache.avro.io.DecoderFactory; +import org.apache.avro.io.ResolvingDecoder; +import org.apache.iceberg.ManifestFile; +import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.awaitility.Awaitility; +import org.junit.Before; +import org.junit.Test; + +public class TestDecoderResolver { + + @Before + public void before() { + DecoderResolver.DECODER_CACHES.get().clear(); + } + + @Test + public void testDecoderCachingReadSchemaSameAsFileSchema() throws Exception { + Decoder dummyDecoder = DecoderFactory.get().binaryDecoder(new byte[] {}, null); + Schema fileSchema = avroSchema(); + ResolvingDecoder resolvingDecoder = + DecoderResolver.resolve(dummyDecoder, fileSchema, fileSchema); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(1); + assertThat(DecoderResolver.DECODER_CACHES.get().get(fileSchema).size()).isEqualTo(1); + checkCached(fileSchema, fileSchema); + + // Equal but new one + Schema fileSchema1 = avroSchema(); + assertThat(fileSchema1).isEqualTo(fileSchema); + ResolvingDecoder resolvingDecoder1 = + DecoderResolver.resolve(dummyDecoder, fileSchema1, fileSchema1); + assertThat(resolvingDecoder1).isNotSameAs(resolvingDecoder); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(2); + assertThat(DecoderResolver.DECODER_CACHES.get().get(fileSchema1).size()).isEqualTo(1); + checkCached(fileSchema1, fileSchema1); + + // New one + Schema fileSchema2 = avroSchema("manifest_path", "manifest_length"); + ResolvingDecoder resolvingDecoder2 = + DecoderResolver.resolve(dummyDecoder, fileSchema2, fileSchema2); + assertThat(resolvingDecoder2).isNotSameAs(resolvingDecoder); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(3); + assertThat(DecoderResolver.DECODER_CACHES.get().get(fileSchema2).size()).isEqualTo(1); + checkCached(fileSchema2, fileSchema2); + + checkCachedSize(3); + + fileSchema = null; + checkCachedSize(2); + + fileSchema1 = null; + checkCachedSize(1); + + fileSchema2 = null; + checkCachedSize(0); + } + + @Test + public void testDecoderCachingReadSchemaNotSameAsFileSchema() throws Exception { + Decoder dummyDecoder = DecoderFactory.get().binaryDecoder(new byte[] {}, null); + Schema fileSchema = avroSchema(); + Schema readSchema = avroSchema("manifest_path", "manifest_length", "partition_spec_id"); + ResolvingDecoder resolvingDecoder = + DecoderResolver.resolve(dummyDecoder, readSchema, fileSchema); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(1); + assertThat(DecoderResolver.DECODER_CACHES.get().get(readSchema).size()).isEqualTo(1); + checkCached(readSchema, fileSchema); + + // Equal but new one + Schema fileSchema1 = avroSchema(); + Schema readSchema1 = avroSchema("manifest_path", "manifest_length", "partition_spec_id"); + assertThat(fileSchema1).isEqualTo(fileSchema); + assertThat(readSchema1).isEqualTo(readSchema); + ResolvingDecoder resolvingDecoder1 = + DecoderResolver.resolve(dummyDecoder, readSchema1, fileSchema1); + assertThat(resolvingDecoder1).isNotSameAs(resolvingDecoder); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(2); + assertThat(DecoderResolver.DECODER_CACHES.get().get(readSchema1).size()).isEqualTo(1); + checkCached(readSchema1, fileSchema1); + + // New read schema + Schema readSchema2 = avroSchema("manifest_path", "manifest_length"); + ResolvingDecoder resolvingDecoder2 = + DecoderResolver.resolve(dummyDecoder, readSchema2, fileSchema); + assertThat(resolvingDecoder2).isNotSameAs(resolvingDecoder); + + assertThat(DecoderResolver.DECODER_CACHES.get().size()).isEqualTo(3); + assertThat(DecoderResolver.DECODER_CACHES.get().get(readSchema2).size()).isEqualTo(1); + checkCached(readSchema2, fileSchema); + + checkCachedSize(3); + + readSchema = null; + checkCachedSize(2); + + readSchema1 = null; + checkCachedSize(1); + + readSchema2 = null; + checkCachedSize(0); + } + + private Schema avroSchema(String... columns) { + if (columns.length == 0) { + return AvroSchemaUtil.convert(ManifestFile.schema(), "manifest_file"); + } else { + return AvroSchemaUtil.convert(ManifestFile.schema().select(columns), "manifest_file"); + } + } + + private void checkCached(Schema readSchema, Schema fileSchema) { + assertThat(DecoderResolver.DECODER_CACHES.get().containsKey(readSchema)).isTrue(); + assertThat(DecoderResolver.DECODER_CACHES.get().get(readSchema).containsKey(fileSchema)) + .isTrue(); + } + + private int getActualSize() { + // The size of keys included the GCed keys + Set<Schema> keys = DecoderResolver.DECODER_CACHES.get().keySet(); + Set<Schema> identityKeys = Sets.newIdentityHashSet(); + identityKeys.addAll(keys); + return identityKeys.size(); + } + + private void checkCachedSize(int expected) { Review Comment: wondering if this can be flaky on CI builds where servers are quite often overloaded. we can keep an eye on this. not a concern right now. -- 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]
