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 Cargo.lock

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

1 change: 1 addition & 0 deletions fuzz/Cargo.lock

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

1 change: 1 addition & 0 deletions rocketmq-ai/rocketmq-mcp-control/Cargo.lock

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

1 change: 1 addition & 0 deletions rocketmq-ai/rocketmq-mcp-query/Cargo.lock

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

1 change: 1 addition & 0 deletions rocketmq-ai/rocketmq-mcp/Cargo.lock

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

1 change: 1 addition & 0 deletions rocketmq-ai/rocketmq-sre/Cargo.lock

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

3 changes: 2 additions & 1 deletion rocketmq-broker/src/processor/send_message_processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ use rocketmq_model::common::TopicSysFlag;
use rocketmq_model::common::TopicSysFlag::build_sys_flag;
use rocketmq_model::utils::cleanup_policy_utils;
use rocketmq_model::utils::queue_type_utils::QueueTypeUtils;
use rocketmq_model::utils::string_utils::cheetah_from_integer;
use rocketmq_protocol::code::request_code::RequestCode;
use rocketmq_protocol::code::response_code::RemotingSysResponseCode;
use rocketmq_protocol::code::response_code::ResponseCode;
Expand Down Expand Up @@ -830,7 +831,7 @@ where
.message
.put_property(
CheetahString::from_static_str(MessageConst::PROPERTY_INNER_NUM),
CheetahString::from_string(inner_num.to_string()),
cheetah_from_integer(inner_num),
);
batch_message.message_ext_broker_inner.properties_string = message_properties_to_string(
batch_message
Expand Down
30 changes: 20 additions & 10 deletions rocketmq-broker/src/util/hook_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use rocketmq_model::common::mix_all::RETRY_GROUP_TOPIC_PREFIX;
use rocketmq_model::common::sys_flag::message_sys_flag::MessageSysFlag;
use rocketmq_model::common::topic::TopicValidator;
use rocketmq_model::utils::queue_type_utils::QueueTypeUtils;
use rocketmq_model::utils::string_utils::cheetah_from_integer;
use rocketmq_protocol::common::message::message_decoder::message_properties_to_string;
use rocketmq_runtime::common::time_utils::current_millis;
use rocketmq_store::MessageStoreConfig;
Expand Down Expand Up @@ -292,11 +293,11 @@ impl HookUtils {

msg.message_ext_inner.message.properties_mut().as_map_mut().insert(
CheetahString::from_static_str(MessageConst::PROPERTY_TIMER_OUT_MS),
CheetahString::from_string(normalized.timer_out_ms.to_string()),
cheetah_from_integer(normalized.timer_out_ms),
);
msg.message_ext_inner.message.properties_mut().as_map_mut().insert(
CheetahString::from_static_str(MessageConst::PROPERTY_TIMER_ORIGINAL_DELIVER_MS),
CheetahString::from_string(normalized.original_deliver_ms.to_string()),
cheetah_from_integer(normalized.original_deliver_ms),
);
let generation = 0u64;
let source_identity = msg
Expand All @@ -321,20 +322,29 @@ impl HookUtils {
);
let policy_fingerprint = policy.fingerprint();
for (key, value) in [
(MessageConst::TIMER_ENGINE_TYPE, engine.to_owned()),
(MessageConst::PROPERTY_TIMER_FORMAT_VERSION, format_version.to_string()),
(MessageConst::TIMER_ENGINE_TYPE, CheetahString::from_static_str(engine)),
(
MessageConst::PROPERTY_TIMER_FORMAT_VERSION,
cheetah_from_integer(format_version),
),
(
MessageConst::PROPERTY_TIMER_POLICY_FINGERPRINT,
policy_fingerprint.to_string(),
cheetah_from_integer(policy_fingerprint),
),
(
MessageConst::PROPERTY_TIMER_GENERATION,
cheetah_from_integer(generation),
),
(
MessageConst::PROPERTY_TIMER_DELIVERY_TOKEN,
CheetahString::from_string(delivery_token),
),
(MessageConst::PROPERTY_TIMER_GENERATION, generation.to_string()),
(MessageConst::PROPERTY_TIMER_DELIVERY_TOKEN, delivery_token),
] {
msg.message_ext_inner
.message
.properties_mut()
.as_map_mut()
.insert(CheetahString::from_static_str(key), CheetahString::from_string(value));
.insert(CheetahString::from_static_str(key), value);
}
let topic_value = CheetahString::from_slice(msg.topic());
msg.message_ext_inner.message.properties_mut().as_map_mut().insert(
Expand All @@ -343,7 +353,7 @@ impl HookUtils {
);
msg.message_ext_inner.message.properties_mut().as_map_mut().insert(
CheetahString::from_static_str(MessageConst::PROPERTY_REAL_QUEUE_ID),
CheetahString::from_string(msg.message_ext_inner.queue_id.to_string()),
cheetah_from_integer(msg.message_ext_inner.queue_id),
);
msg.properties_string = message_properties_to_string(msg.message_ext_inner.message.properties().as_map());
msg.message_ext_inner
Expand Down Expand Up @@ -378,7 +388,7 @@ impl HookUtils {
);
msg.message_ext_inner.message.properties_mut().as_map_mut().insert(
CheetahString::from_static_str(MessageConst::PROPERTY_REAL_QUEUE_ID),
CheetahString::from_string(msg.message_ext_inner.queue_id.to_string()),
cheetah_from_integer(msg.message_ext_inner.queue_id),
);
msg.properties_string = message_properties_to_string(msg.message_ext_inner.message.properties().as_map());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use rocketmq_model::common::mix_all;
use rocketmq_model::common::mq_version::RocketMqVersion;
use rocketmq_model::common::sys_flag::message_sys_flag::MessageSysFlag;
use rocketmq_model::common::sys_flag::pull_sys_flag::PullSysFlag;
use rocketmq_model::utils::string_utils::cheetah_from_integer;
use rocketmq_protocol::common::message::message_decoder as MessageDecoder;
use rocketmq_protocol::protocol::header::namesrv::topic_operation_header::TopicRequestHeader;
use rocketmq_protocol::protocol::header::pop_message_request_header::PopMessageRequestHeader;
Expand Down Expand Up @@ -209,8 +210,8 @@ impl PullAPIWrapper {
// Resolve batch-level constants once before iterating to avoid repeated allocations.
let broker_name = message_queue.broker_name().clone();
let queue_id = message_queue.queue_id();
let min_offset_str = CheetahString::from_string(pull_result_ext.pull_result.min_offset.to_string());
let max_offset_str = CheetahString::from_string(pull_result_ext.pull_result.max_offset.to_string());
let min_offset_str = cheetah_from_integer(pull_result_ext.pull_result.min_offset);
let max_offset_str = cheetah_from_integer(pull_result_ext.pull_result.max_offset);
for msg in &mut msg_list_filter_again {
let tra_flag = msg
.property(&CheetahString::from_static_str(
Expand Down
1 change: 1 addition & 0 deletions rocketmq-dashboard/rocketmq-dashboard-gpui/Cargo.lock

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

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

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

1 change: 1 addition & 0 deletions rocketmq-example/Cargo.lock

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

1 change: 1 addition & 0 deletions rocketmq-macros/tests/fixtures/renamed-consumer/Cargo.lock

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

1 change: 1 addition & 0 deletions rocketmq-model/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ base64 = "0.23.0"
byteorder = "1.5.0"
bytes.workspace = true
cheetah-string.workspace = true
itoa.workspace = true
chrono = "0.4.45"
crc32fast = "1.5"
dashmap.workspace = true
Expand Down
15 changes: 15 additions & 0 deletions rocketmq-model/src/utils/string_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ use std::collections::HashMap;

use cheetah_string::CheetahString;

/// Encodes an integer as decimal message-property text.
#[inline]
pub fn cheetah_from_integer(value: impl itoa::Integer) -> CheetahString {
CheetahString::from_slice(itoa::Buffer::new().format(value))
}

pub struct StringUtils;

impl StringUtils {
Expand Down Expand Up @@ -77,8 +83,17 @@ impl StringUtils {

#[cfg(test)]
mod tests {
use super::cheetah_from_integer;
use super::StringUtils;

#[test]
fn integer_text_matches_decimal_display() {
for value in [i128::MIN, i64::MIN.into(), -1, 0, i64::MAX.into(), i128::MAX] {
assert_eq!(cheetah_from_integer(value).as_str(), value.to_string());
}
assert_eq!(cheetah_from_integer(u128::MAX).as_str(), u128::MAX.to_string());
}

#[test]
fn is_not_empty_str_with_some_non_empty_str() {
assert!(StringUtils::is_not_empty_str(Some("hello")));
Expand Down
29 changes: 15 additions & 14 deletions rocketmq-store/src/timer/delivery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ use rocketmq_model::common::message::MessageConst;
#[cfg(feature = "extended_timeline")]
use rocketmq_model::common::message::MessageTrait;
#[cfg(feature = "extended_timeline")]
use rocketmq_model::utils::string_utils::cheetah_from_integer;
#[cfg(feature = "extended_timeline")]
use rocketmq_protocol::common::message::message_decoder as MessageDecoder;
#[cfg(feature = "extended_timeline")]
use rocketmq_runtime::common::time_utils::current_millis;
Expand Down Expand Up @@ -586,32 +588,31 @@ fn build_final_message(
for (property, value) in [
(
MessageConst::PROPERTY_TIMER_DELIVERY_TOKEN,
state.route.delivery_token().to_owned(),
CheetahString::from_slice(state.route.delivery_token()),
),
(
MessageConst::PROPERTY_TIMER_ID,
cheetah_from_integer(key.timer_id.get()),
),
(MessageConst::PROPERTY_TIMER_ID, key.timer_id.get().to_string()),
(
MessageConst::PROPERTY_TIMER_GENERATION,
key.generation.get().to_string(),
cheetah_from_integer(key.generation.get()),
),
(
MessageConst::TIMER_ENGINE_TYPE,
TimerEngineId::ExtendedTimeline.as_str().to_owned(),
CheetahString::from_static_str(TimerEngineId::ExtendedTimeline.as_str()),
),
(
MessageConst::PROPERTY_TIMER_OWNER_EPOCH,
state.owner_epoch.get().to_string(),
cheetah_from_integer(state.owner_epoch.get()),
),
(MessageConst::PROPERTY_TIMER_LANE, key.lane.to_string()),
(MessageConst::PROPERTY_TIMER_LANE, cheetah_from_integer(key.lane)),
(
MessageConst::PROPERTY_TIMER_ORIGINAL_DELIVER_MS,
key.due_time_ms.to_string(),
cheetah_from_integer(key.due_time_ms),
),
] {
MessageAccessor::put_property(
&mut final_message,
CheetahString::from_static_str(property),
CheetahString::from_string(value),
);
MessageAccessor::put_property(&mut final_message, CheetahString::from_static_str(property), value);
}
final_message.properties_string = MessageDecoder::message_properties_to_string(final_message.get_properties());
Ok(final_message)
Expand All @@ -635,12 +636,12 @@ fn copy_message(source: MessageExt) -> MessageExtBrokerInner {
MessageAccessor::put_property(
&mut inner,
CheetahString::from_static_str(MessageConst::PROPERTY_TIMER_ENQUEUE_MS),
CheetahString::from_string(store_timestamp.to_string()),
cheetah_from_integer(store_timestamp),
);
MessageAccessor::put_property(
&mut inner,
CheetahString::from_static_str(MessageConst::PROPERTY_TIMER_DEQUEUE_MS),
CheetahString::from_string((current_millis() as i64).to_string()),
cheetah_from_integer(current_millis() as i64),
);
inner.message_ext_inner.sys_flag = sys_flag;
inner.message_ext_inner.born_timestamp = born_timestamp;
Expand Down
7 changes: 4 additions & 3 deletions rocketmq-store/src/timer/timer_message_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ use rocketmq_model::common::message::message_ext_broker_inner::MessageExtBrokerI
use rocketmq_model::common::message::message_single;
use rocketmq_model::common::message::MessageConst;
use rocketmq_model::common::message::MessageTrait;
use rocketmq_model::utils::string_utils::cheetah_from_integer;
use rocketmq_observability::metrics::store::StoreMetricsRecorder;
use rocketmq_observability::metrics::timer::TimerMetricsRecorder;
use rocketmq_protocol::common::message::message_decoder as MessageDecoder;
Expand Down Expand Up @@ -3366,12 +3367,12 @@ impl TimerMessageStore {
if store_timestamp > 0 {
properties.insert(
CheetahString::from_static_str(MessageConst::PROPERTY_TIMER_ENQUEUE_MS),
CheetahString::from_string(store_timestamp.to_string()),
cheetah_from_integer(store_timestamp),
);
}
properties.insert(
CheetahString::from_static_str(MessageConst::PROPERTY_TIMER_DEQUEUE_MS),
CheetahString::from_string(current_millis().to_string()),
cheetah_from_integer(current_millis()),
);
if need_roll {
let next_roll_times = properties
Expand All @@ -3381,7 +3382,7 @@ impl TimerMessageStore {
+ 1;
properties.insert(
CheetahString::from_static_str(MessageConst::PROPERTY_TIMER_ROLL_TIMES),
CheetahString::from_string(next_roll_times.to_string()),
cheetah_from_integer(next_roll_times),
);
}
inner.message_ext_inner.set_properties(properties);
Expand Down
Loading