Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions checkstyle/import-control-core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<allow pkg="org.apache.kafka.image" />
<allow pkg="org.apache.kafka.clients" />
<allow pkg="org.apache.kafka.controller" />
<allow pkg="org.apache.kafka.raft" />
</subpackage>

<subpackage name="testkit">
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/kafka/log/s3/DefaultS3Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.automq.elasticstream.client.api.StreamClient;
import kafka.log.s3.cache.DefaultS3BlockCache;
import kafka.log.s3.cache.S3BlockCache;
import kafka.log.s3.metadata.StreamMetadataManager;
import kafka.log.s3.network.ControllerRequestSender;
import kafka.log.s3.objects.ControllerObjectManager;
import kafka.log.s3.objects.ObjectManager;
Expand Down Expand Up @@ -60,7 +61,7 @@ public DefaultS3Client(BrokerServer brokerServer, KafkaConfig config, S3Operator
this.requestSender = new ControllerRequestSender(brokerServer);
this.streamManager = new ControllerStreamManager(this.requestSender, config);
this.objectManager = new ControllerObjectManager(this.requestSender, this.metadataManager, this.config);
this.blockCache = new DefaultS3BlockCache(config.s3CacheSize() * 1024L * 1024, objectManager, operator);
this.blockCache = new DefaultS3BlockCache(config.s3CacheSize(), objectManager, operator);
this.storage = new S3Storage(config, new MemoryWriteAheadLog(), objectManager, blockCache, operator);
this.streamClient = new S3StreamClient(this.streamManager, this.storage);
this.kvClient = new ControllerKVClient(this.requestSender);
Expand Down
340 changes: 0 additions & 340 deletions core/src/main/scala/kafka/log/s3/StreamMetadataManager.java

This file was deleted.

Loading