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

Jump to bottom

coprocessor/codec/mysql/duration: Fix micro_secs of Duration #3625

Merged
merged 8 commits into from
Sep 22, 2018
Merged

coprocessor/codec/mysql/duration: Fix micro_secs of Duration #3625

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e93e2a0
coprocessor/codec/mysql/duration: Fix micro_secs of Duration (#360l)
koushiro Sep 13, 2018
cadfa59
Add nano_secs method; Add some unit test
koushiro Sep 14, 2018
4016cef
make format to fix CI
koushiro Sep 14, 2018
45d92cc
Merge branch 'master' into fix_issue#3601
huachaohuang Sep 17, 2018
28cbe6a
Merge branch 'master' into fix_issue#3601
huachaohuang Sep 18, 2018
1f1c9fa
Merge branch 'master' into fix_issue#3601
huachaohuang Sep 20, 2018
e4af7d7
Merge branch 'master' into fix_micro_secs
koushiro Sep 21, 2018
a3cedd3
Merge branch 'master' into fix_micro_secs
breezewish Sep 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
95 changes: 93 additions & 2 deletions src/coprocessor/codec/mysql/duration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ impl Duration {
}

pub fn micro_secs(&self) -> u32 {
self.dur.subsec_micros()
}

pub fn nano_secs(&self) -> u32 {
self.dur.subsec_nanos()
}

Expand Down Expand Up @@ -209,7 +213,7 @@ impl Duration {
)?;
if self.fsp > 0 {
write!(buf, ".")?;
let nanos = self.micro_secs() / (10u32.pow(NANO_WIDTH - u32::from(self.fsp)));
let nanos = self.dur.subsec_nanos() / (10u32.pow(NANO_WIDTH - u32::from(self.fsp)));
write!(buf, "{:01$}", nanos, self.fsp as usize)?;
}
let d = unsafe { str::from_utf8_unchecked(&buf).parse()? };
Expand Down Expand Up @@ -245,7 +249,7 @@ impl Display for Duration {
)?;
if self.fsp > 0 {
write!(formatter, ".")?;
let nanos = self.micro_secs() / (10u32.pow(NANO_WIDTH - u32::from(self.fsp)));
let nanos = self.dur.subsec_nanos() / (10u32.pow(NANO_WIDTH - u32::from(self.fsp)));
write!(formatter, "{:01$}", nanos, self.fsp as usize)?;
}
Ok(())
Expand Down Expand Up @@ -300,6 +304,93 @@ mod test {
use coprocessor::codec::mysql::MAX_FSP;
use util::escape;

#[test]
fn test_hours() {
let cases: Vec<(&str, i8, u64)> = vec![
("31 11:30:45", 0, 31 * 24 + 11),
("11:30:45", 0, 11),
("-11:30:45.9233456", 0, 11),
("272:59:59", 0, 272),
];

for (input, fsp, exp) in cases {
let dur = Duration::parse(input.as_bytes(), fsp).unwrap();
let res = dur.hours();
assert_eq!(exp, res);
}
}

#[test]
fn test_minutes() {
let cases: Vec<(&str, i8, u64)> = vec![
("31 11:30:45", 0, 30),
("11:30:45", 0, 30),
("-11:30:45.9233456", 0, 30),
];

for (input, fsp, exp) in cases {
let dur = Duration::parse(input.as_bytes(), fsp).unwrap();
let res = dur.minutes();
assert_eq!(exp, res);
}
}

#[test]
fn test_secs() {
let cases: Vec<(&str, i8, u64)> = vec![
("31 11:30:45", 0, 45),
("11:30:45", 0, 45),
("-11:30:45.9233456", 1, 45),
("-11:30:45.9233456", 0, 46),
];

for (input, fsp, exp) in cases {
let dur = Duration::parse(input.as_bytes(), fsp).unwrap();
let res = dur.secs();
assert_eq!(exp, res);
}
}

#[test]
fn test_micro_secs() {
let cases: Vec<(&str, i8, u32)> = vec![
("31 11:30:45.123", 6, 123000),
("11:30:45.123345", 3, 123000),
("11:30:45.123345", 5, 123350),
("11:30:45.123345", 6, 123345),
("11:30:45.1233456", 6, 123346),
("11:30:45.9233456", 0, 0),
("11:30:45.000010", 6, 10),
("11:30:45.00010", 5, 100),
];

for (input, fsp, exp) in cases {
let dur = Duration::parse(input.as_bytes(), fsp).unwrap();
let res = dur.micro_secs();
assert_eq!(exp, res);
}
}

#[test]
fn test_nano_secs() {
let cases: Vec<(&str, i8, u32)> = vec![
("31 11:30:45.123", 6, 123000),
("11:30:45.123345", 3, 123000),
("11:30:45.123345", 5, 123350),
("11:30:45.123345", 6, 123345),
("11:30:45.1233456", 6, 123346),
("11:30:45.9233456", 0, 0),
("11:30:45.000010", 6, 10),
("11:30:45.00010", 5, 100),
];

for (input, fsp, exp) in cases {
let dur = Duration::parse(input.as_bytes(), fsp).unwrap();
let res = dur.nano_secs();
assert_eq!(exp * 1000, res);
}
}

#[test]
fn test_parse() {
let cases: Vec<(&'static [u8], i8, Option<&'static str>)> = vec![
Expand Down