You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iggy.apache.org by gk...@apache.org on 2025/07/14 10:58:22 UTC
(iggy) branch upstream_master created (now 8cfea1d8)
This is an automated email from the ASF dual-hosted git repository.
gkoszyk pushed a change to branch upstream_master
in repository https://gitbox.apache.org/repos/asf/iggy.git
at 8cfea1d8 temp
This branch includes the following new commits:
new 8cfea1d8 temp
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(iggy) 01/01: temp
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gkoszyk pushed a commit to branch upstream_master
in repository https://gitbox.apache.org/repos/asf/iggy.git
commit 8cfea1d87752c37c1c9b237fe4a3231491deac4a
Author: numminex <g....@gmail.com>
AuthorDate: Mon Jul 14 12:58:04 2025 +0200
temp
---
.github/workflows/ci-check-go-sdk.yml | 2 +-
Cargo.lock | 2 +-
core/sdk/src/clients/binary_consumer_group.rs | 2 +-
core/sdk/src/clients/client.rs | 6 +++---
core/sdk/src/clients/consumer.rs | 10 +++++-----
core/sdk/src/clients/consumer_builder.rs | 7 +++----
core/sdk/src/clients/producer.rs | 6 +++---
core/sdk/src/clients/producer_builder.rs | 6 +++---
8 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/ci-check-go-sdk.yml b/.github/workflows/ci-check-go-sdk.yml
index 9b7f5207..3d11c56c 100644
--- a/.github/workflows/ci-check-go-sdk.yml
+++ b/.github/workflows/ci-check-go-sdk.yml
@@ -60,4 +60,4 @@ jobs:
uses: golangci/golangci-lint-action@v8
with:
version: v2.1
- working-directory: ${{ matrix.module }}
+ working-directory: ${{ matrix.module }}
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index fce0c066..2bb4e91b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7603,7 +7603,7 @@ dependencies = [
"futures-util",
"hashbrown 0.15.4",
"hashlink",
- "indexmap 2.10.0",
+ "indexmap 2.9.0",
"log",
"memchr",
"once_cell",
diff --git a/core/sdk/src/clients/binary_consumer_group.rs b/core/sdk/src/clients/binary_consumer_group.rs
index e3ea34ff..59298131 100644
--- a/core/sdk/src/clients/binary_consumer_group.rs
+++ b/core/sdk/src/clients/binary_consumer_group.rs
@@ -20,7 +20,7 @@ use crate::prelude::IggyClient;
use async_dropper::AsyncDrop;
use async_trait::async_trait;
use iggy_binary_protocol::{ConsumerGroupClient, UserClient};
-use iggy_common::locking::IggyRwLockFn;
+use iggy_common::locking::IggySharedMutFn;
use iggy_common::{ConsumerGroup, ConsumerGroupDetails, Identifier, IggyError};
#[async_trait]
diff --git a/core/sdk/src/clients/client.rs b/core/sdk/src/clients/client.rs
index 0482a2b8..df8fd0c8 100644
--- a/core/sdk/src/clients/client.rs
+++ b/core/sdk/src/clients/client.rs
@@ -46,7 +46,7 @@ use tracing::{debug, error, info};
#[derive(Debug)]
#[allow(dead_code)]
pub struct IggyClient {
- pub(crate) client: IggyRwLock<ClientWrapper>,
+ pub(crate) client: IggySharedMut<ClientWrapper>,
partitioner: Option<Arc<dyn Partitioner>>,
pub(crate) encryptor: Option<Arc<EncryptorKind>>,
}
@@ -73,7 +73,7 @@ impl IggyClient {
/// Creates a new `IggyClient` with the provided client implementation for the specific transport.
pub fn new(client: ClientWrapper) -> Self {
- let client = IggyRwLock::new(client);
+ let client = IggySharedMut::new(client);
IggyClient {
client,
partitioner: None,
@@ -117,7 +117,7 @@ impl IggyClient {
}
/// Returns the underlying client implementation for the specific transport.
- pub fn client(&self) -> IggyRwLock<ClientWrapper> {
+ pub fn client(&self) -> IggySharedMut<ClientWrapper> {
self.client.clone()
}
diff --git a/core/sdk/src/clients/consumer.rs b/core/sdk/src/clients/consumer.rs
index 8a5c12b6..1c5fb728 100644
--- a/core/sdk/src/clients/consumer.rs
+++ b/core/sdk/src/clients/consumer.rs
@@ -24,7 +24,7 @@ use futures_util::{FutureExt, StreamExt};
use iggy_binary_protocol::{
Client, ConsumerGroupClient, ConsumerOffsetClient, MessageClient, StreamClient, TopicClient,
};
-use iggy_common::locking::{IggyRwLock, IggyRwLockFn};
+use iggy_common::locking::{IggySharedMut, IggySharedMutFn};
use iggy_common::{
Consumer, ConsumerKind, DiagnosticEvent, EncryptorKind, IdKind, Identifier, IggyDuration,
IggyError, IggyMessage, IggyTimestamp, PolledMessages, PollingKind, PollingStrategy,
@@ -96,7 +96,7 @@ unsafe impl Sync for IggyConsumer {}
pub struct IggyConsumer {
initialized: bool,
can_poll: Arc<AtomicBool>,
- client: IggyRwLock<ClientWrapper>,
+ client: IggySharedMut<ClientWrapper>,
consumer_name: String,
consumer: Arc<Consumer>,
is_consumer_group: bool,
@@ -132,7 +132,7 @@ pub struct IggyConsumer {
impl IggyConsumer {
#[allow(clippy::too_many_arguments)]
pub(crate) fn new(
- client: IggyRwLock<ClientWrapper>,
+ client: IggySharedMut<ClientWrapper>,
consumer_name: String,
consumer: Consumer,
stream_id: Identifier,
@@ -408,7 +408,7 @@ impl IggyConsumer {
#[allow(clippy::too_many_arguments)]
async fn store_consumer_offset(
- client: &IggyRwLock<ClientWrapper>,
+ client: &IggySharedMut<ClientWrapper>,
consumer: &Consumer,
stream_id: &Identifier,
topic_id: &Identifier,
@@ -784,7 +784,7 @@ impl IggyConsumer {
}
async fn initialize_consumer_group(
- client: IggyRwLock<ClientWrapper>,
+ client: IggySharedMut<ClientWrapper>,
create_consumer_group_if_not_exists: bool,
stream_id: Arc<Identifier>,
topic_id: Arc<Identifier>,
diff --git a/core/sdk/src/clients/consumer_builder.rs b/core/sdk/src/clients/consumer_builder.rs
index 3246b06e..576d841e 100644
--- a/core/sdk/src/clients/consumer_builder.rs
+++ b/core/sdk/src/clients/consumer_builder.rs
@@ -18,14 +18,13 @@
use crate::client_wrappers::client_wrapper::ClientWrapper;
use crate::prelude::{AutoCommit, AutoCommitWhen, IggyConsumer};
-use iggy_binary_protocol::Client;
-use iggy_common::locking::IggyRwLock;
+use iggy_common::locking::IggySharedMut;
use iggy_common::{Consumer, EncryptorKind, Identifier, IggyDuration, PollingStrategy};
use std::sync::Arc;
#[derive(Debug)]
pub struct IggyConsumerBuilder {
- client: IggyRwLock<ClientWrapper>,
+ client: IggySharedMut<ClientWrapper>,
consumer_name: String,
consumer: Consumer,
stream: Identifier,
@@ -47,7 +46,7 @@ pub struct IggyConsumerBuilder {
impl IggyConsumerBuilder {
#[allow(clippy::too_many_arguments)]
pub(crate) fn new(
- client: IggyRwLock<ClientWrapper>,
+ client: IggySharedMut<ClientWrapper>,
consumer_name: String,
consumer: Consumer,
stream_id: Identifier,
diff --git a/core/sdk/src/clients/producer.rs b/core/sdk/src/clients/producer.rs
index 6cd7f03a..5eee0e25 100644
--- a/core/sdk/src/clients/producer.rs
+++ b/core/sdk/src/clients/producer.rs
@@ -24,7 +24,7 @@ use crate::clients::producer_dispatcher::ProducerDispatcher;
use bytes::Bytes;
use futures_util::StreamExt;
use iggy_binary_protocol::{Client, MessageClient, StreamClient, TopicClient};
-use iggy_common::locking::{IggyRwLock, IggyRwLockFn};
+use iggy_common::locking::{IggySharedMut, IggySharedMutFn};
use iggy_common::{
CompressionAlgorithm, DiagnosticEvent, EncryptorKind, IdKind, Identifier, IggyDuration,
IggyError, IggyExpiry, IggyMessage, IggyTimestamp, MaxTopicSize, Partitioner, Partitioning,
@@ -53,7 +53,7 @@ pub trait ProducerCoreBackend: Send + Sync + 'static {
pub struct ProducerCore {
initialized: AtomicBool,
can_send: Arc<AtomicBool>,
- client: Arc<IggyRwLock<ClientWrapper>>,
+ client: Arc<IggySharedMut<ClientWrapper>>,
stream_id: Arc<Identifier>,
stream_name: String,
topic_id: Arc<Identifier>,
@@ -432,7 +432,7 @@ pub struct IggyProducer {
impl IggyProducer {
#[allow(clippy::too_many_arguments)]
pub(crate) fn new(
- client: IggyRwLock<ClientWrapper>,
+ client: IggySharedMut<ClientWrapper>,
stream: Identifier,
stream_name: String,
topic: Identifier,
diff --git a/core/sdk/src/clients/producer_builder.rs b/core/sdk/src/clients/producer_builder.rs
index 576bbe9a..ae8bb368 100644
--- a/core/sdk/src/clients/producer_builder.rs
+++ b/core/sdk/src/clients/producer_builder.rs
@@ -18,7 +18,7 @@
use crate::client_wrappers::client_wrapper::ClientWrapper;
use crate::clients::producer_config::{BackgroundConfig, DirectConfig};
use crate::prelude::IggyProducer;
-use iggy_common::locking::IggyRwLock;
+use iggy_common::locking::IggySharedMut;
use iggy_common::{
EncryptorKind, Identifier, IggyDuration, IggyExpiry, MaxTopicSize, Partitioner, Partitioning,
};
@@ -36,7 +36,7 @@ impl Default for SendMode {
}
pub struct IggyProducerBuilder {
- client: IggyRwLock<ClientWrapper>,
+ client: IggySharedMut<ClientWrapper>,
stream: Identifier,
stream_name: String,
topic: Identifier,
@@ -58,7 +58,7 @@ pub struct IggyProducerBuilder {
impl IggyProducerBuilder {
#[allow(clippy::too_many_arguments)]
pub(crate) fn new(
- client: IggyRwLock<ClientWrapper>,
+ client: IggySharedMut<ClientWrapper>,
stream: Identifier,
stream_name: String,
topic: Identifier,