TanYuxin-tyx commented on code in PR #22804: URL: https://github.com/apache/flink/pull/22804#discussion_r1247346519
########## flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/hybrid/tiered/tier/disk/DiskCacheManager.java: ########## @@ -0,0 +1,174 @@ +/* + * 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.io.network.buffer.Buffer; +import org.apache.flink.runtime.io.network.partition.hybrid.tiered.common.TieredStoragePartitionId; +import org.apache.flink.runtime.io.network.partition.hybrid.tiered.file.PartitionFileWriter; +import org.apache.flink.runtime.io.network.partition.hybrid.tiered.storage.TieredStorageMemoryManager; +import org.apache.flink.util.concurrent.FutureUtils; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +/** + * The {@link DiskCacheManager} is responsible for managing cached buffers before flushing to files. + */ +class DiskCacheManager { + + private final TieredStoragePartitionId partitionId; + + private final int numSubpartitions; + + private final PartitionFileWriter partitionFileWriter; + + private final SubpartitionDiskCacheManager[] subpartitionCacheManagers; + + /** Whether the current flush process has completed. */ + private CompletableFuture<Void> hasFlushCompleted; + + DiskCacheManager( + TieredStoragePartitionId partitionId, + int numSubpartitions, + TieredStorageMemoryManager storageMemoryManager, + PartitionFileWriter partitionFileWriter) { + this.partitionId = partitionId; + this.numSubpartitions = numSubpartitions; + this.partitionFileWriter = partitionFileWriter; + this.subpartitionCacheManagers = new SubpartitionDiskCacheManager[numSubpartitions]; + this.hasFlushCompleted = FutureUtils.completedVoidFuture(); + + for (int subpartitionId = 0; subpartitionId < numSubpartitions; ++subpartitionId) { + subpartitionCacheManagers[subpartitionId] = new SubpartitionDiskCacheManager(); + } + storageMemoryManager.listenBufferReclaimRequest(this::notifyFlushCachedBuffers); + } + + // ------------------------------------------------------------------------ + // Called by DiskTierProducerAgent + // ------------------------------------------------------------------------ + + /** + * Append buffer to {@link DiskCacheManager}. + * + * @param buffer to be managed by this class. + * @param subpartitionId the subpartition of this record. + */ + void append(Buffer buffer, int subpartitionId) { + subpartitionCacheManagers[subpartitionId].append(buffer); + } + + /** + * Append the end-of-segment event to {@link DiskCacheManager}, which indicates the segment has + * finished. + * + * @param record the end-of-segment event + * @param subpartitionId target subpartition of this record. + * @param dataType the type of this record. In other words, is it data or event. + */ + void appendEndOfSegmentEvent(ByteBuffer record, int subpartitionId, Buffer.DataType dataType) { Review Comment: Fixed. ########## 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. -- 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]
