Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #1577]🍻Replace ConsumeMessageDirectlyResultRequestHeader and ResetOffsetRequestHeader's RpcRequestHeader with TopicRequestHeader #1578

Merged
merged 1 commit into from
Dec 5, 2024
Merged

[ISSUE #1577]🍻Replace ConsumeMessageDirectlyResultRequestHeader and ResetOffsetRequestHeader's RpcRequestHeader with TopicRequestHeader #1578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions rocketmq-remoting/src/protocol/header/consume_message_directly_result_request_header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use rocketmq_macros::RequestHeaderCodec;
use serde::Deserialize;
use serde::Serialize;

use crate::rpc::rpc_request_header::RpcRequestHeader;
use crate::rpc::topic_request_header::TopicRequestHeader;

#[derive(Clone, Debug, Serialize, Deserialize, Default, RequestHeaderCodec)]
#[serde(rename_all = "camelCase")]
Expand All @@ -33,7 +33,7 @@ pub struct ConsumeMessageDirectlyResultRequestHeader {
pub topic_sys_flag: Option<i32>,
pub group_sys_flag: Option<i32>,
#[serde(flatten)]
pub rpc_request_header: Option<RpcRequestHeader>,
pub topic_request_header: Option<TopicRequestHeader>,
}

#[cfg(test)]
Expand All @@ -52,7 +52,7 @@ mod tests {
topic: Some(CheetahString::from_static_str("topic")),
topic_sys_flag: Some(1),
group_sys_flag: Some(2),
rpc_request_header: None,
topic_request_header: None,
};
let serialized = serde_json::to_string(&header).unwrap();
let expected = r#"{"consumerGroup":"test_group","clientId":"client_id","msgId":"msg_id","brokerName":"broker_name","topic":"topic","topicSysFlag":1,"groupSysFlag":2}"#;
Expand Down
8 changes: 4 additions & 4 deletions rocketmq-remoting/src/protocol/header/reset_offset_request_header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use rocketmq_macros::RequestHeaderCodec;
use serde::Deserialize;
use serde::Serialize;

use crate::rpc::rpc_request_header::RpcRequestHeader;
use crate::rpc::topic_request_header::TopicRequestHeader;

#[derive(Clone, Debug, Serialize, Deserialize, RequestHeaderCodec)]
#[serde(rename_all = "camelCase")]
Expand All @@ -36,7 +36,7 @@ pub struct ResetOffsetRequestHeader {
pub is_force: bool,

#[serde(flatten)]
pub rpc_request_header: Option<RpcRequestHeader>,
pub topic_request_header: Option<TopicRequestHeader>,
}

impl Default for ResetOffsetRequestHeader {
Expand All @@ -48,7 +48,7 @@ impl Default for ResetOffsetRequestHeader {
offset: None,
timestamp: 0,
is_force: false,
rpc_request_header: None,
topic_request_header: None,
}
}
}
Expand All @@ -68,7 +68,7 @@ mod tests {
offset: Some(100),
timestamp: 1234567890,
is_force: true,
rpc_request_header: None,
topic_request_header: None,
};
let serialized = serde_json::to_string(&header).unwrap();
let expected = r#"{"topic":"test_topic","group":"test_group","queueId":1,"offset":100,"timestamp":1234567890,"isForce":true}"#;
Expand Down
Loading