Skip to content

Commit 25e5d83

Browse files
committed
chore: change RawData::as_bytes to to_bytes
1 parent fd6dba9 commit 25e5d83

File tree

3 files changed

+14
-54
lines changed

3 files changed

+14
-54
lines changed

taos-query/src/common/raw/data.rs

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,6 @@ pub struct raw_data_t {
2121

2222
unsafe impl Send for raw_data_t {}
2323

24-
// impl raw_data_t {
25-
// pub fn to_bytes(&self) -> Bytes {
26-
// let cap = // raw data len
27-
// self.raw_len as usize +
28-
// // self.raw_len
29-
// std::mem::size_of::<u32>() +
30-
// // self.raw_type
31-
// std::mem::size_of::<u16>();
32-
// let mut data = Vec::with_capacity(cap);
33-
34-
// // first 4 bytes: raw_len
35-
// data.extend(self.raw_len.to_le_bytes());
36-
37-
// // next 2 bytes: raw_type
38-
// data.extend(self.raw_type.to_le_bytes());
39-
40-
// unsafe {
41-
// let ptr = data.as_mut_ptr().add(RAW_PTR_OFFSET);
42-
// std::ptr::copy_nonoverlapping(self.raw, ptr as _, self.raw_len as _);
43-
// data.set_len(cap);
44-
// }
45-
// Bytes::from(data)
46-
// }
47-
// }
48-
4924
/// TMQ message raw data container.
5025
///
5126
/// It's a wrapper for raw data from native library, and will be auto free when drop.
@@ -68,27 +43,6 @@ impl RawData {
6843
pub fn new(raw: raw_data_t, free: unsafe extern "C" fn(raw: raw_data_t) -> i32) -> Self {
6944
RawData { free, raw }
7045
}
71-
}
72-
73-
// #[derive(Debug, Clone)]
74-
// pub struct RawData(Bytes);
75-
76-
// unsafe impl Send for RawData {}
77-
// unsafe impl Sync for RawData {}
78-
79-
// // impl From<&raw_data_t> for RawData {
80-
// // fn from(raw: &raw_data_t) -> Self {
81-
// // RawData(raw.to_bytes())
82-
// // }
83-
// // }
84-
85-
// impl<T: Into<Bytes>> From<T> for RawData {
86-
// fn from(bytes: T) -> Self {
87-
// RawData(bytes.into())
88-
// }
89-
// }
90-
91-
impl RawData {
9246
pub fn raw_ptr(&self) -> *const c_void {
9347
self.raw.raw
9448
}
@@ -106,8 +60,14 @@ impl RawData {
10660
self.raw
10761
}
10862

109-
pub fn as_bytes(&self) -> Cow<Bytes> {
110-
todo!("replace as_bytes")
63+
pub fn to_bytes(&self) -> Vec<u8> {
64+
let len = self.raw_len() as usize + RAW_PTR_OFFSET;
65+
66+
let mut vec = Vec::with_capacity(len);
67+
vec.extend_from_slice(&self.raw_len().to_le_bytes());
68+
vec.extend_from_slice(&self.raw_type().to_le_bytes());
69+
vec.extend_from_slice(self.raw_slice());
70+
vec
11171
}
11272
}
11373

taos/examples/raw-dump.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,15 @@ async fn main() -> anyhow::Result<()> {
165165
continue;
166166
}
167167
let raw = meta.as_raw_meta().await?;
168-
let bytes = raw.as_bytes();
168+
let bytes = raw.to_bytes();
169169
println!("{mid},meta,{}", bytes.len());
170170
let path = args.raw_dir.join(format!("raw_{}_meta.bin", mid));
171171
std::fs::write(path, bytes.deref())?;
172172
}
173173
MessageSet::Data(data) => {
174174
// println!("{mid} data: {:?}", data);
175175
let raw = data.as_raw_data().await?;
176-
let bytes = raw.as_bytes();
176+
let bytes = raw.to_bytes();
177177
println!("{mid},data,{}", bytes.len());
178178

179179
if args.print_block {
@@ -206,7 +206,7 @@ async fn main() -> anyhow::Result<()> {
206206
}
207207
// println!("{mid} meta data: {:?}", meta);
208208
let raw = meta.as_raw_meta().await?;
209-
let bytes = raw.as_bytes();
209+
let bytes = raw.to_bytes();
210210
println!("{mid},metadata,{}", bytes.len());
211211
if args.print_block {
212212
while let Some(block) = data.fetch_raw_block().await? {

taos/examples/ts5250-builder.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ async fn main() -> anyhow::Result<()> {
6666
MessageSet::Meta(meta) => {
6767
println!("{mid} meta: {:?}", meta);
6868
let raw = meta.as_raw_meta().await?;
69-
let bytes = raw.as_bytes();
69+
let bytes = raw.to_bytes();
7070
let path = format!("raw_{}.bin", mid);
7171
std::fs::write(path, bytes.deref())?;
7272
}
7373
MessageSet::Data(data) => {
7474
println!("{mid} data: {:?}", data);
7575
let raw = data.as_raw_data().await?;
76-
let bytes = raw.as_bytes();
76+
let bytes = raw.to_bytes();
7777
let path = format!("raw_{}.bin", mid);
7878
std::fs::write(path, bytes.deref())?;
7979
}
8080
MessageSet::MetaData(meta, ..) => {
8181
println!("{mid} meta data: {:?}", meta);
8282
let raw = meta.as_raw_meta().await?;
83-
let bytes = raw.as_bytes();
83+
let bytes = raw.to_bytes();
8484
let path = format!("raw_{}.bin", mid);
8585
std::fs::write(path, bytes.deref())?;
8686
}

0 commit comments

Comments
 (0)