-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(s3stream): block cache merge the same block inflight read
Signed-off-by: Robin Han <[email protected]>
- Loading branch information
Showing
9 changed files
with
313 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
s3stream/src/main/java/com/automq/stream/s3/cache/DataBlockReadAccumulator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * 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 com.automq.stream.s3.cache; | ||
|
|
||
| import com.automq.stream.s3.ObjectReader; | ||
| import org.apache.commons.lang3.tuple.Pair; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.function.BiConsumer; | ||
| import java.util.function.Consumer; | ||
|
|
||
| /** | ||
| * Accumulate inflight data block read requests to one real read request. | ||
| */ | ||
| public class DataBlockReadAccumulator { | ||
| private final Map<Pair<String, Integer>, DataBlockRecords> inflightDataBlockReads = new ConcurrentHashMap<>(); | ||
| private final Consumer<DataBlockRecords> dataBlockConsumer; | ||
|
|
||
| public DataBlockReadAccumulator(Consumer<DataBlockRecords> dataBlockConsumer) { | ||
| this.dataBlockConsumer = dataBlockConsumer; | ||
| } | ||
|
|
||
| public CompletableFuture<DataBlockRecords> readDataBlock(ObjectReader reader, ObjectReader.DataBlockIndex blockIndex) { | ||
| CompletableFuture<DataBlockRecords> cf = new CompletableFuture<>(); | ||
| BiConsumer<DataBlockRecords, Throwable> listener = (rst, ex) -> { | ||
| if (ex != null) { | ||
| cf.completeExceptionally(ex); | ||
| } else { | ||
| cf.complete(rst); | ||
| } | ||
| }; | ||
| Pair<String, Integer> key = Pair.of(reader.objectKey(), blockIndex.blockId()); | ||
| synchronized (inflightDataBlockReads) { | ||
| DataBlockRecords records = inflightDataBlockReads.get(key); | ||
| if (records == null) { | ||
| records = new DataBlockRecords(); | ||
| records.registerListener(listener); | ||
| inflightDataBlockReads.put(key, records); | ||
| DataBlockRecords finalRecords = records; | ||
| reader.read(blockIndex).whenComplete((rst, ex) -> { | ||
| synchronized (inflightDataBlockReads) { | ||
| inflightDataBlockReads.remove(key, finalRecords); | ||
| } | ||
| finalRecords.complete(rst, ex); | ||
| dataBlockConsumer.accept(finalRecords); | ||
| finalRecords.release(); | ||
| }); | ||
| } else { | ||
| records.registerListener(listener); | ||
| } | ||
| } | ||
| return cf; | ||
| } | ||
| } |
80 changes: 80 additions & 0 deletions
80
s3stream/src/main/java/com/automq/stream/s3/cache/DataBlockRecords.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * 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 com.automq.stream.s3.cache; | ||
|
|
||
| import com.automq.stream.s3.ObjectReader; | ||
| import com.automq.stream.s3.model.StreamRecordBatch; | ||
| import com.automq.stream.utils.CloseableIterator; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
| import java.util.function.BiConsumer; | ||
|
|
||
| public class DataBlockRecords { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(DataBlockRecords.class); | ||
| final AtomicInteger refCount = new AtomicInteger(1); | ||
| private final List<BiConsumer<DataBlockRecords, Throwable>> listeners = new LinkedList<>(); | ||
| private List<StreamRecordBatch> records = Collections.emptyList(); | ||
|
|
||
| public void registerListener(BiConsumer<DataBlockRecords, Throwable> listener) { | ||
| retain(); | ||
| listeners.add(listener); | ||
| } | ||
|
|
||
| public void complete(ObjectReader.DataBlock dataBlock, Throwable ex) { | ||
| if (ex == null) { | ||
| records = new ArrayList<>(dataBlock.recordCount()); | ||
| try (CloseableIterator<StreamRecordBatch> it = dataBlock.iterator()) { | ||
| while (it.hasNext()) { | ||
| records.add(it.next()); | ||
| } | ||
| } catch (Throwable e) { | ||
| LOGGER.error("parse data block fail", e); | ||
| ex = e; | ||
| } | ||
| } | ||
| Throwable finalEx = ex; | ||
| listeners.forEach(listener -> { | ||
| try { | ||
| listener.accept(this, finalEx); | ||
| } catch (Throwable e) { | ||
| release(); | ||
| LOGGER.error("DataBlockRecords fail to notify listener {}", listener, e); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| public List<StreamRecordBatch> records() { | ||
| return Collections.unmodifiableList(records); | ||
| } | ||
|
|
||
| void retain() { | ||
| refCount.incrementAndGet(); | ||
| } | ||
|
|
||
| void release() { | ||
| if (refCount.decrementAndGet() == 0) { | ||
| records.forEach(StreamRecordBatch::release); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.