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
13 changes: 3 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ humantime = "2.3.0"
hwlocality = "1.0.0-alpha.11"
iceberg = "0.8.0"
iceberg-catalog-rest = "0.8.0"
iggy = { path = "core/sdk", version = "0.8.2-edge.1" }
iggy_binary_protocol = { path = "core/binary_protocol", version = "0.8.2-edge.1" }
iggy_common = { path = "core/common", version = "0.8.2-edge.1" }
iggy = { path = "core/sdk", version = "0.8.2-edge.2" }
iggy_binary_protocol = { path = "core/binary_protocol", version = "0.8.2-edge.2" }
iggy_common = { path = "core/common", version = "0.8.2-edge.2" }
iggy_connector_sdk = { path = "core/connectors/sdk", version = "0.1.2-edge.1" }
integration = { path = "core/integration" }
keyring = { version = "3.6.3", features = ["sync-secret-service", "vendored"] }
Expand Down
7 changes: 3 additions & 4 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ expect-test: 1.5.1, "Apache-2.0 OR MIT",
ext-trait: 1.0.1, "Apache-2.0 OR MIT OR Zlib",
ext-trait-proc_macros: 1.0.1, "Apache-2.0 OR MIT OR Zlib",
extension-traits: 1.0.1, "Apache-2.0 OR MIT OR Zlib",
fast-async-mutex: 0.6.7, "Apache-2.0 OR MIT",
fastbloom: 0.14.1, "Apache-2.0 OR MIT",
fastrand: 2.3.0, "Apache-2.0 OR MIT",
ferroid: 0.8.9, "Apache-2.0 OR MIT",
Expand Down Expand Up @@ -385,14 +384,14 @@ icu_provider: 2.1.1, "Unicode-3.0",
ident_case: 1.0.1, "Apache-2.0 OR MIT",
idna: 1.1.0, "Apache-2.0 OR MIT",
idna_adapter: 1.2.1, "Apache-2.0 OR MIT",
iggy: 0.8.2-edge.1, "Apache-2.0",
iggy: 0.8.2-edge.2, "Apache-2.0",
iggy-bench: 0.3.2-edge.1, "Apache-2.0",
iggy-bench-dashboard-server: 0.5.1-edge.1, "Apache-2.0",
iggy-cli: 0.10.2-edge.1, "Apache-2.0",
iggy-connectors: 0.2.2-edge.1, "Apache-2.0",
iggy-mcp: 0.2.2-edge.1, "Apache-2.0",
iggy_binary_protocol: 0.8.2-edge.1, "Apache-2.0",
iggy_common: 0.8.2-edge.1, "Apache-2.0",
iggy_binary_protocol: 0.8.2-edge.2, "Apache-2.0",
iggy_common: 0.8.2-edge.2, "Apache-2.0",
iggy_connector_elasticsearch_sink: 0.2.1-edge.1, "Apache-2.0",
iggy_connector_elasticsearch_source: 0.2.1-edge.1, "Apache-2.0",
iggy_connector_iceberg_sink: 0.2.1-edge.1, "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion core/binary_protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[package]
name = "iggy_binary_protocol"
version = "0.8.2-edge.1"
version = "0.8.2-edge.2"
description = "Iggy is the persistent message streaming platform written in Rust, supporting QUIC, TCP and HTTP transport protocols, capable of processing millions of messages per second."
edition = "2024"
license = "Apache-2.0"
Expand Down
8 changes: 1 addition & 7 deletions core/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.
[package]
name = "iggy_common"
version = "0.8.2-edge.1"
version = "0.8.2-edge.2"
description = "Iggy is the persistent message streaming platform written in Rust, supporting QUIC, TCP and HTTP transport protocols, capable of processing millions of messages per second."
edition = "2024"
license = "Apache-2.0"
Expand All @@ -27,11 +27,6 @@ documentation = "https://iggy.apache.org/docs"
repository = "https://github.com/apache/iggy"
readme = "../../README.md"

[features]
default = ["tokio_lock"]
tokio_lock = []
fast_async_lock = ["dep:fast-async-mutex"]

[dependencies]
aes-gcm = { workspace = true }
ahash = { workspace = true }
Expand All @@ -51,7 +46,6 @@ compio-ws = { workspace = true }
crossbeam = { workspace = true }
derive_more = { workspace = true }
err_trail = { workspace = true }
fast-async-mutex = { version = "0.6.7", optional = true }
human-repr = { workspace = true }
humantime = { workspace = true }
nix = { workspace = true }
Expand Down
61 changes: 0 additions & 61 deletions core/common/src/locking/fast_async_lock.rs

This file was deleted.

13 changes: 0 additions & 13 deletions core/common/src/locking/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,10 @@

use std::ops::{Deref, DerefMut};

/// This module provides a trait and implementations for a shared mutable reference configurable via feature flags.
#[cfg(feature = "tokio_lock")]
#[cfg(not(any(feature = "fast_async_lock")))]
mod tokio_lock;

// this can be used in the future to provide different locking mechanisms
#[cfg(feature = "fast_async_lock")]
mod fast_async_lock;

#[cfg(feature = "tokio_lock")]
#[cfg(not(any(feature = "fast_async_lock")))]
pub type IggyRwLock<T> = tokio_lock::IggyTokioRwLock<T>;

//this can be used in the future to provide different locking mechanisms
#[cfg(feature = "fast_async_lock")]
pub type IggyRwLock<T> = fast_async_lock::IggyFastAsyncRwLock<T>;

#[allow(async_fn_in_trait)]
pub trait IggyRwLockFn<T> {
type ReadGuard<'a>: Deref<Target = T>
Expand Down
1 change: 0 additions & 1 deletion core/common/src/locking/tokio_lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use crate::locking::IggyRwLockFn;
use std::sync::Arc;
use tokio::sync::{RwLock as TokioRwLock, RwLockReadGuard, RwLockWriteGuard};

#[cfg(feature = "tokio_lock")]
#[derive(Debug)]
pub struct IggyTokioRwLock<T>(Arc<TokioRwLock<T>>);

Expand Down
10 changes: 1 addition & 9 deletions core/sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[package]
name = "iggy"
version = "0.8.2-edge.1"
version = "0.8.2-edge.2"
description = "Iggy is the persistent message streaming platform written in Rust, supporting QUIC, TCP and HTTP transport protocols, capable of processing millions of messages per second."
edition = "2024"
license = "Apache-2.0"
Expand All @@ -28,21 +28,13 @@ documentation = "https://iggy.apache.org/docs"
repository = "https://github.com/apache/iggy"
readme = "../../README.md"

[features]
default = ["tokio_lock"]
tokio_lock = []
# Moved to common crate. Not sure if this is even needed anymore
#fast_async_lock = ["dep:fast-async-mutex"]

[dependencies]
async-broadcast = { workspace = true }
async-dropper = { workspace = true }
async-trait = { workspace = true }
bon = { workspace = true }
bytes = { workspace = true }
dashmap = { workspace = true }
# Can be removed if the feature above gets removed.
#fast-async-mutex = { version = "0.6.7", optional = true }
flume = { workspace = true }
futures = { workspace = true }
futures-util = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion foreign/python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ repository = "https://github.com/apache/iggy"
[dependencies]
bytes = "1.11.0"
futures = "0.3.31"
iggy = { path = "../../core/sdk", version = "0.8.2-edge.1" }
iggy = { path = "../../core/sdk", version = "0.8.2-edge.2" }
pyo3 = "0.27.2"
pyo3-async-runtimes = { version = "0.27.0", features = [
"attributes",
Expand Down
Loading