This is an automated email from the ASF dual-hosted git repository. gkoszyk pushed a commit to branch move_batch_to_common in repository https://gitbox.apache.org/repos/asf/iggy.git
commit c00e10a55e8f7e9bb86fbcc1ea693101c3c04d62 Author: numinex <[email protected]> AuthorDate: Mon Feb 9 12:18:19 2026 +0100 v4 --- Cargo.lock | 1 - core/common/src/lib.rs | 2 +- core/common/src/types/message/messages_batch_mut.rs | 2 +- core/common/src/types/message/mod.rs | 2 +- core/server/Cargo.toml | 1 - core/server/src/http/http_shard_wrapper.rs | 2 +- core/server/src/shard/system/messages.rs | 2 +- core/server/src/streaming/partitions/helpers.rs | 5 +---- core/server/src/streaming/partitions/local_partition.rs | 4 +--- core/server/src/streaming/partitions/ops.rs | 2 +- core/server/src/streaming/segments/types/mod.rs | 3 +-- 11 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 906117550..ed1d8aecc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8291,7 +8291,6 @@ dependencies = [ "metadata", "mimalloc", "mime_guess", - "moka", "nix 0.31.1", "opentelemetry", "opentelemetry-appender-tracing", diff --git a/core/common/src/lib.rs b/core/common/src/lib.rs index ee61e7747..ce88d2b55 100644 --- a/core/common/src/lib.rs +++ b/core/common/src/lib.rs @@ -35,7 +35,6 @@ pub mod locking; pub use alloc::buffer::PooledBuffer; pub use alloc::memory_pool::{MEMORY_POOL, MemoryPool, MemoryPoolConfigOther, memory_pool}; pub use certificates::generate_self_signed_certificate; -pub use deduplication::MessageDeduplicator; pub use commands::consumer_groups::*; pub use commands::consumer_offsets::*; pub use commands::messages::*; @@ -47,6 +46,7 @@ pub use commands::system::get_cluster_metadata::*; pub use commands::system::*; pub use commands::topics::*; pub use commands::users::*; +pub use deduplication::MessageDeduplicator; pub use sender::{ QuicSender, Sender, SenderKind, TcpSender, TcpTlsSender, WebSocketSender, WebSocketTlsSender, }; diff --git a/core/common/src/types/message/messages_batch_mut.rs b/core/common/src/types/message/messages_batch_mut.rs index 41449b18a..3857f2667 100644 --- a/core/common/src/types/message/messages_batch_mut.rs +++ b/core/common/src/types/message/messages_batch_mut.rs @@ -18,12 +18,12 @@ use super::indexes_mut::IggyIndexesMut; use super::message_view_mut::IggyMessageViewMutIterator; -use crate::{MessageDeduplicator, PooledBuffer, random_id}; use crate::{ BytesSerializable, IGGY_MESSAGE_HEADER_SIZE, INDEX_SIZE, IggyByteSize, IggyError, IggyIndexView, IggyMessage, IggyMessageView, IggyMessageViewIterator, IggyMessagesBatch, IggyTimestamp, MAX_PAYLOAD_SIZE, MAX_USER_HEADERS_SIZE, Sizeable, Validatable, }; +use crate::{MessageDeduplicator, PooledBuffer, random_id}; use bytes::{BufMut, BytesMut}; use lending_iterator::prelude::*; use std::ops::{Deref, Index}; diff --git a/core/common/src/types/message/mod.rs b/core/common/src/types/message/mod.rs index 23fe79e9a..5b8222bd4 100644 --- a/core/common/src/types/message/mod.rs +++ b/core/common/src/types/message/mod.rs @@ -62,8 +62,8 @@ pub use messages_batch::IggyMessagesBatch; pub use messages_batch_mut::IggyMessagesBatchMut; pub use messages_batch_set::IggyMessagesBatchSet; pub use partitioning::Partitioning; -pub use poll_metadata::IggyPollMetadata; pub use partitioning_kind::PartitioningKind; +pub use poll_metadata::IggyPollMetadata; pub use polled_messages::PolledMessages; pub use polling_kind::PollingKind; pub use polling_strategy::PollingStrategy; diff --git a/core/server/Cargo.toml b/core/server/Cargo.toml index f07b1823e..bf41a1392 100644 --- a/core/server/Cargo.toml +++ b/core/server/Cargo.toml @@ -76,7 +76,6 @@ left-right = { workspace = true } metadata = { workspace = true } mimalloc = { workspace = true, optional = true } mime_guess = { workspace = true, optional = true } -moka = { workspace = true } nix = { workspace = true } opentelemetry = { workspace = true } opentelemetry-appender-tracing = { workspace = true } diff --git a/core/server/src/http/http_shard_wrapper.rs b/core/server/src/http/http_shard_wrapper.rs index 043900138..b83e485e1 100644 --- a/core/server/src/http/http_shard_wrapper.rs +++ b/core/server/src/http/http_shard_wrapper.rs @@ -23,13 +23,13 @@ use iggy_common::{ }; use send_wrapper::SendWrapper; -use iggy_common::IggyPollMetadata; use crate::shard::system::messages::PollingArgs; use crate::state::command::EntryCommand; use crate::streaming::segments::{IggyMessagesBatchMut, IggyMessagesBatchSet}; use crate::streaming::topics; use crate::streaming::users::user::User; use crate::{shard::IggyShard, streaming::session::Session}; +use iggy_common::IggyPollMetadata; use iggy_common::PersonalAccessToken; /// A wrapper around IggyShard that is safe to use in HTTP handlers. diff --git a/core/server/src/shard/system/messages.rs b/core/server/src/shard/system/messages.rs index f94a2c862..9736e3333 100644 --- a/core/server/src/shard/system/messages.rs +++ b/core/server/src/shard/system/messages.rs @@ -17,7 +17,6 @@ */ use super::COMPONENT; -use iggy_common::IggyPollMetadata; use crate::shard::IggyShard; use crate::shard::transmission::frame::ShardResponse; use crate::shard::transmission::message::{ @@ -27,6 +26,7 @@ use crate::streaming::partitions::journal::Journal; use crate::streaming::polling_consumer::PollingConsumer; use crate::streaming::segments::{IggyIndexesMut, IggyMessagesBatchMut, IggyMessagesBatchSet}; use err_trail::ErrContext; +use iggy_common::IggyPollMetadata; use iggy_common::PooledBuffer; use iggy_common::sharding::IggyNamespace; use iggy_common::{ diff --git a/core/server/src/streaming/partitions/helpers.rs b/core/server/src/streaming/partitions/helpers.rs index e03080cf2..89f4e73c1 100644 --- a/core/server/src/streaming/partitions/helpers.rs +++ b/core/server/src/streaming/partitions/helpers.rs @@ -15,10 +15,7 @@ // specific language governing permissions and limitations // under the License. -use crate::{ - configs::system::SystemConfig, - streaming::deduplication::MessageDeduplicator, -}; +use crate::{configs::system::SystemConfig, streaming::deduplication::MessageDeduplicator}; pub fn create_message_deduplicator(config: &SystemConfig) -> Option<MessageDeduplicator> { if !config.message_deduplication.enabled { diff --git a/core/server/src/streaming/partitions/local_partition.rs b/core/server/src/streaming/partitions/local_partition.rs index decbd799e..4eeba5dbb 100644 --- a/core/server/src/streaming/partitions/local_partition.rs +++ b/core/server/src/streaming/partitions/local_partition.rs @@ -24,9 +24,7 @@ use super::{ consumer_group_offsets::ConsumerGroupOffsets, consumer_offsets::ConsumerOffsets, journal::MemoryMessageJournal, log::SegmentedLog, }; -use crate::streaming::{ - deduplication::MessageDeduplicator, stats::PartitionStats, -}; +use crate::streaming::{deduplication::MessageDeduplicator, stats::PartitionStats}; use iggy_common::IggyTimestamp; use std::sync::{Arc, atomic::AtomicU64}; use tokio::sync::Mutex as TokioMutex; diff --git a/core/server/src/streaming/partitions/ops.rs b/core/server/src/streaming/partitions/ops.rs index 5c52fe4c1..aa481b7b6 100644 --- a/core/server/src/streaming/partitions/ops.rs +++ b/core/server/src/streaming/partitions/ops.rs @@ -23,10 +23,10 @@ use super::journal::Journal; use super::local_partitions::LocalPartitions; -use iggy_common::IggyPollMetadata; use crate::shard::system::messages::PollingArgs; use crate::streaming::polling_consumer::PollingConsumer; use crate::streaming::segments::IggyMessagesBatchSet; +use iggy_common::IggyPollMetadata; use iggy_common::sharding::IggyNamespace; use iggy_common::{IggyError, PollingKind}; use std::cell::RefCell; diff --git a/core/server/src/streaming/segments/types/mod.rs b/core/server/src/streaming/segments/types/mod.rs index 27fe76e00..fe00aca5f 100644 --- a/core/server/src/streaming/segments/types/mod.rs +++ b/core/server/src/streaming/segments/types/mod.rs @@ -17,6 +17,5 @@ */ pub use iggy_common::{ - IggyMessageHeaderViewMut, IggyMessageViewMut, IggyMessagesBatchMut, - IggyMessagesBatchSet, + IggyMessageHeaderViewMut, IggyMessageViewMut, IggyMessagesBatchMut, IggyMessagesBatchSet, };
