Signed-off-by: Ping Yu <yuping@pingcap.com>
This commit is contained in:
Ping Yu 2022-12-27 12:58:37 +08:00
parent b38ba7a58a
commit 1baa3f84bb
3 changed files with 9 additions and 7 deletions

View File

@ -35,8 +35,9 @@ impl TimestampExt for Timestamp {
Self {
physical: version >> PHYSICAL_SHIFT_BITS,
logical: version & LOGICAL_MASK,
// Now we only support global transactions
suffix_bits: 0,
// Now we only support global transactions:
// suffix_bits: 0,
..Default::default()
}
}

View File

@ -436,7 +436,7 @@ mod tests {
|_: &dyn Any| {
fail::fail_point!("region-error", |_| {
let resp = kvrpcpb::ResolveLockResponse {
region_error: Some(errorpb::Error::default()),
region_error: Some(errorpb::Error::default()).into(),
..Default::default()
};
Ok(Box::new(resp) as Box<dyn Any>)

View File

@ -783,6 +783,7 @@ impl HasLocks for kvrpcpb::PrewriteResponse {
}
#[cfg(test)]
#[cfg_attr(feature = "protobuf-codec", allow(clippy::useless_conversion))]
mod tests {
use crate::{
request::{plan::Merge, CollectWithShard, ResponseWithShard},
@ -815,7 +816,7 @@ mod tests {
..Default::default()
},
vec![kvrpcpb::Mutation {
op: kvrpcpb::Op::PessimisticLock as i32,
op: kvrpcpb::Op::PessimisticLock.into(),
key: key2.to_vec(),
..Default::default()
}],
@ -823,18 +824,18 @@ mod tests {
let resp_not_found = ResponseWithShard(
kvrpcpb::PessimisticLockResponse {
values: vec![value_empty.to_vec(), value4.to_vec()],
values: vec![value_empty.to_vec(), value4.to_vec()].into(),
not_founds: vec![true, false],
..Default::default()
},
vec![
kvrpcpb::Mutation {
op: kvrpcpb::Op::PessimisticLock as i32,
op: kvrpcpb::Op::PessimisticLock.into(),
key: key3.to_vec(),
..Default::default()
},
kvrpcpb::Mutation {
op: kvrpcpb::Op::PessimisticLock as i32,
op: kvrpcpb::Op::PessimisticLock.into(),
key: key4.to_vec(),
..Default::default()
},