dbtsai commented on code in PR #17236: URL: https://github.com/apache/iceberg/pull/17236#discussion_r3876657821
########## aws/src/test/java/org/apache/iceberg/aws/s3/TestAnalyticsAcceleratorInputStreamWrapper.java: ########## @@ -0,0 +1,89 @@ +/* + * 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.aws.s3; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.Map; +import org.apache.iceberg.io.FileIOMetricsContext; +import org.apache.iceberg.metrics.Counter; +import org.apache.iceberg.metrics.DefaultMetricsContext; +import org.apache.iceberg.metrics.MetricsContext; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.junit.jupiter.api.Test; +import software.amazon.s3.analyticsaccelerator.S3SeekableInputStream; + +public class TestAnalyticsAcceleratorInputStreamWrapper { + + @Test + public void testReadTracksMetrics() throws IOException { + S3SeekableInputStream delegate = mock(S3SeekableInputStream.class); + // first a single-byte read, then a buffered read of 8 bytes, then a zero-length read, then EOF + when(delegate.read()).thenReturn(1); + when(delegate.read(any(byte[].class), anyInt(), anyInt())) + .thenReturn(8) + .thenReturn(0) + .thenReturn(-1); + + CachingMetricsContext metrics = new CachingMetricsContext(); + Counter readBytes = metrics.counter(FileIOMetricsContext.READ_BYTES, MetricsContext.Unit.BYTES); + Counter readOperations = metrics.counter(FileIOMetricsContext.READ_OPERATIONS); + + try (AnalyticsAcceleratorInputStreamWrapper in = + new AnalyticsAcceleratorInputStreamWrapper(delegate, metrics)) { + assertThat(in.read()).isEqualTo(1); + assertThat(readBytes.value()).isEqualTo(1); + assertThat(readOperations.value()).isEqualTo(1); + + assertThat(in.read(new byte[16], 0, 16)).isEqualTo(8); + assertThat(readBytes.value()).isEqualTo(9); + assertThat(readOperations.value()).isEqualTo(2); + + // a zero-length read counts neither bytes nor an operation + assertThat(in.read(new byte[16], 0, 0)).isEqualTo(0); + assertThat(readBytes.value()).isEqualTo(9); + assertThat(readOperations.value()).isEqualTo(2); + + // an EOF read counts neither bytes nor an operation + assertThat(in.read(new byte[16], 0, 16)).isEqualTo(-1); + assertThat(readBytes.value()).isEqualTo(9); + assertThat(readOperations.value()).isEqualTo(2); + } + } + + /** + * A {@link MetricsContext} that returns the same {@link Counter} instance for a given name, so + * that tests can observe the counters the stream under test increments. {@link + * DefaultMetricsContext} allocates a fresh counter on every {@code counter(...)} call. + */ + private static class CachingMetricsContext extends DefaultMetricsContext { + private final Map<String, org.apache.iceberg.metrics.Counter> counters = + Maps.newConcurrentMap(); Review Comment: Correction to my note above: I had to keep `Maps.newConcurrentMap()` rather than `new ConcurrentHashMap<>()`. Iceberg's `RegexpSingleline` checkstyle rule ("Prefer using Maps.newConcurrentMap() instead") fails the build on a bare `new ConcurrentHashMap<>()`, including in test sources, so the Guava factory is the convention-compliant choice here. The helper is still consolidated into one shared `org.apache.iceberg.metrics.CachingMetricsContext` (dropping the four duplicates); it just uses the Maps factory. Let me know if you'd prefer I keep separate per-module helpers instead. -- 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]
