rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-20 06:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

update more and fix

Browse Source
This commit is contained in:
Conrad Ludgate
2024-05-09 12:53:59 +01:00
parent b316a5daff
commit bf3973043e
9 changed files with 70 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/utils/src/id.rs
View File

@@ -384,7 +384,7 @@ impl FromStr for NodeId {
#[cfg(test)]
mod tests {
use serde_assert::{Deserializer, Serializer, Token, Tokens};
use serde_assert::{Deserializer, Serializer, Token};
use crate::bin_ser::BeSer;
@@ -395,7 +395,7 @@ mod tests {
let original_id = Id([
173, 80, 132, 115, 129, 226, 72, 254, 170, 201, 135, 108, 199, 26, 228, 24,
]);
let expected_tokens = Tokens(vec![
let expected_tokens = vec![
Token::Tuple { len: 16 },
Token::U8(173),
Token::U8(80),
@@ -414,15 +414,14 @@ mod tests {
Token::U8(228),
Token::U8(24),
Token::TupleEnd,
]);
];
let serializer = Serializer::builder().is_human_readable(false).build();
let serialized_tokens = original_id.serialize(&serializer).unwrap();
assert_eq!(serialized_tokens, expected_tokens);
let mut deserializer = Deserializer::builder()
let mut deserializer = Deserializer::builder(serialized_tokens)
.is_human_readable(false)
.tokens(serialized_tokens)
.build();
let deserialized_id = Id::deserialize(&mut deserializer).unwrap();
assert_eq!(deserialized_id, original_id);
@@ -433,20 +432,17 @@ mod tests {
let original_id = Id([
173, 80, 132, 115, 129, 226, 72, 254, 170, 201, 135, 108, 199, 26, 228, 24,
]);
let expected_tokens = Tokens(vec![Token::Str(String::from(
"ad50847381e248feaac9876cc71ae418",
))]);
let expected_tokens = vec![Token::Str(String::from("ad50847381e248feaac9876cc71ae418"))];
let serializer = Serializer::builder().is_human_readable(true).build();
let serialized_tokens = original_id.serialize(&serializer).unwrap();
assert_eq!(serialized_tokens, expected_tokens);
let mut deserializer = Deserializer::builder()
.is_human_readable(true)
.tokens(Tokens(vec![Token::Str(String::from(
"ad50847381e248feaac9876cc71ae418",
))]))
.build();
let mut deserializer = Deserializer::builder(vec![Token::Str(String::from(
"ad50847381e248feaac9876cc71ae418",
))])
.is_human_readable(true)
.build();
assert_eq!(Id::deserialize(&mut deserializer).unwrap(), original_id);
}

4
libs/utils/src/logging.rs
View File

@@ -3,9 +3,9 @@ use std::str::FromStr;
use anyhow::Context;
use metrics::{IntCounter, IntCounterVec};
use once_cell::sync::Lazy;
use strum_macros::{EnumString, EnumVariantNames};
use strum_macros::{EnumString, VariantNames};
#[derive(EnumString, EnumVariantNames, Eq, PartialEq, Debug, Clone, Copy)]
#[derive(EnumString, VariantNames, Eq, PartialEq, Debug, Clone, Copy)]
#[strum(serialize_all = "snake_case")]
pub enum LogFormat {
Plain,

22
libs/utils/src/lsn.rs
View File

@@ -415,7 +415,7 @@ mod tests {
use super::*;
use serde_assert::{Deserializer, Serializer, Token, Tokens};
use serde_assert::{Deserializer, Serializer, Token};
#[test]
fn test_lsn_strings() {
@@ -496,18 +496,16 @@ mod tests {
#[test]
fn test_lsn_serde() {
let original_lsn = Lsn(0x0123456789abcdef);
let expected_readable_tokens = Tokens(vec![Token::U64(0x0123456789abcdef)]);
let expected_non_readable_tokens =
Tokens(vec![Token::Str(String::from("1234567/89ABCDEF"))]);
let expected_readable_tokens = vec![Token::U64(0x0123456789abcdef)];
let expected_non_readable_tokens = vec![Token::Str(String::from("1234567/89ABCDEF"))];
// Testing human_readable ser/de
let serializer = Serializer::builder().is_human_readable(false).build();
let readable_ser_tokens = original_lsn.serialize(&serializer).unwrap();
assert_eq!(readable_ser_tokens, expected_readable_tokens);
let mut deserializer = Deserializer::builder()
let mut deserializer = Deserializer::builder(readable_ser_tokens)
.is_human_readable(false)
.tokens(readable_ser_tokens)
.build();
let des_lsn = Lsn::deserialize(&mut deserializer).unwrap();
assert_eq!(des_lsn, original_lsn);
@@ -517,9 +515,8 @@ mod tests {
let non_readable_ser_tokens = original_lsn.serialize(&serializer).unwrap();
assert_eq!(non_readable_ser_tokens, expected_non_readable_tokens);
let mut deserializer = Deserializer::builder()
let mut deserializer = Deserializer::builder(non_readable_ser_tokens)
.is_human_readable(true)
.tokens(non_readable_ser_tokens)
.build();
let des_lsn = Lsn::deserialize(&mut deserializer).unwrap();
assert_eq!(des_lsn, original_lsn);
@@ -528,18 +525,16 @@ mod tests {
let serializer = Serializer::builder().is_human_readable(false).build();
let non_readable_ser_tokens = original_lsn.serialize(&serializer).unwrap();
let mut deserializer = Deserializer::builder()
let mut deserializer = Deserializer::builder(non_readable_ser_tokens)
.is_human_readable(true)
.tokens(non_readable_ser_tokens)
.build();
Lsn::deserialize(&mut deserializer).unwrap_err();
let serializer = Serializer::builder().is_human_readable(true).build();
let readable_ser_tokens = original_lsn.serialize(&serializer).unwrap();
let mut deserializer = Deserializer::builder()
let mut deserializer = Deserializer::builder(readable_ser_tokens)
.is_human_readable(false)
.tokens(readable_ser_tokens)
.build();
Lsn::deserialize(&mut deserializer).unwrap_err();
}
@@ -551,9 +546,8 @@ mod tests {
let serializer = Serializer::builder().is_human_readable(false).build();
let ser_tokens = original_lsn.serialize(&serializer).unwrap();
let mut deserializer = Deserializer::builder()
let mut deserializer = Deserializer::builder(ser_tokens)
.is_human_readable(false)
.tokens(ser_tokens)
.build();
let des_lsn = Lsn::deserialize(&mut deserializer).unwrap();