TanYuxin-tyx commented on code in PR #22804: URL: https://github.com/apache/flink/pull/22804#discussion_r1247480184
########## flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/tier/disk/SubpartitionDiskCacheManagerTest.java: ########## @@ -0,0 +1,81 @@ +/* + * 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.flink.runtime.io.network.partition.hybrid.tiered.tier.disk; + +import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.runtime.event.AbstractEvent; +import org.apache.flink.runtime.io.network.api.EndOfSegmentEvent; +import org.apache.flink.runtime.io.network.api.serialization.EventSerializer; +import org.apache.flink.runtime.io.network.buffer.Buffer; +import org.apache.flink.runtime.io.network.buffer.BufferBuilderTestUtils; + +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNoException; + +/** Tests for {@link SubpartitionDiskCacheManager}. */ +class SubpartitionDiskCacheManagerTest { + + @Test + void testAppendBuffer() { + int bufferBytes = 5; + SubpartitionDiskCacheManager subpartitionDiskCacheManager = + new SubpartitionDiskCacheManager(); + Buffer buffer = BufferBuilderTestUtils.buildSomeBuffer(bufferBytes); + subpartitionDiskCacheManager.append(buffer); + List<Tuple2<Buffer, Integer>> bufferAndIndexes = + subpartitionDiskCacheManager.removeAllBuffers(); + + assertThat(bufferAndIndexes).hasSize(1); + assertThat(bufferAndIndexes.get(0)).isNotNull(); + assertThat(bufferAndIndexes.get(0).f0.readableBytes()).isEqualTo(bufferBytes); + } + + @Test + void testAppendEndOfSegmentRecord() throws IOException { + SubpartitionDiskCacheManager subpartitionDiskCacheManager = + new SubpartitionDiskCacheManager(); + subpartitionDiskCacheManager.appendEndOfSegmentEvent( + EventSerializer.toSerializedEvent(EndOfSegmentEvent.INSTANCE), + Buffer.DataType.END_OF_SEGMENT); + List<Tuple2<Buffer, Integer>> bufferAndIndexes = + subpartitionDiskCacheManager.removeAllBuffers(); + + assertThat(bufferAndIndexes).hasSize(1); + assertThat(bufferAndIndexes.get(0)).isNotNull(); + Buffer buffer = bufferAndIndexes.get(0).f0; + assertThat(buffer.isBuffer()).isFalse(); + AbstractEvent event = + EventSerializer.fromSerializedEvent( + buffer.readOnlySlice().getNioBufferReadable(), getClass().getClassLoader()); + assertThat(event).isInstanceOf(EndOfSegmentEvent.class); + } + + @Test + void testRelease() { + SubpartitionDiskCacheManager subpartitionDiskCacheManager = + new SubpartitionDiskCacheManager(); + subpartitionDiskCacheManager.append(BufferBuilderTestUtils.buildSomeBuffer()); + assertThatNoException().isThrownBy(subpartitionDiskCacheManager::release); Review Comment: Added the check. ########## flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/tier/disk/SubpartitionDiskCacheManager.java: ########## @@ -0,0 +1,130 @@ +/* + * 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.flink.runtime.io.network.partition.hybrid.tiered.tier.disk; + +import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.core.memory.MemorySegment; +import org.apache.flink.core.memory.MemorySegmentFactory; +import org.apache.flink.runtime.io.network.buffer.Buffer; +import org.apache.flink.runtime.io.network.buffer.Buffer.DataType; +import org.apache.flink.runtime.io.network.buffer.FreeingBufferRecycler; +import org.apache.flink.runtime.io.network.buffer.NetworkBuffer; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Deque; +import java.util.LinkedList; +import java.util.List; + +import static org.apache.flink.util.Preconditions.checkArgument; +import static org.apache.flink.util.Preconditions.checkState; + +/** + * The {@link SubpartitionDiskCacheManager} is responsible to manage the cached buffers in a single + * subpartition. + */ +class SubpartitionDiskCacheManager { + + /** + * All the buffers. The first field of the tuple is the buffer, while the second field of the + * buffer is the buffer index. + * + * <p>Note that this field can be accessed by the task thread or the write IO thread, so the + * thread safety should be ensured. + */ + private final Deque<Tuple2<Buffer, Integer>> allBuffers = new LinkedList<>(); + + /** + * Record the buffer index in the {@link SubpartitionDiskCacheManager}. Each time a new buffer + * is added to the {@code allBuffers}, this field is increased by one. + */ + private int bufferIndex; Review Comment: Fixed and added the doc. -- 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]
