Skip to content

Commit

Permalink
Drops closure-based container writers
Browse files Browse the repository at this point in the history
  • Loading branch information
@zslayton
zslayton committed Apr 10, 2024
1 parent 55f0614 commit e3f0eaf
Show file tree
Hide file tree
Showing 19 changed files with 1,468 additions and 1,388 deletions.
234 changes: 110 additions & 124 deletions benches/write_many_structs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,119 +3,113 @@ use ion_rs::lazy::encoder::binary::v1_0::writer::LazyRawBinaryWriter_1_0;
use nom::AsBytes;

use ion_rs::lazy::encoder::binary::v1_1::writer::LazyRawBinaryWriter_1_1;
use ion_rs::lazy::encoder::value_writer::{AnnotatableValueWriter, SequenceWriter};
use ion_rs::lazy::encoder::value_writer::{StructWriter, ValueWriter};
use ion_rs::RawSymbolTokenRef;
use ion_rs::lazy::encoder::value_writer::StructWriter;
use ion_rs::lazy::encoder::value_writer::{SequenceWriter, ValueWriter};
use ion_rs::{IonResult, RawSymbolTokenRef};

fn write_struct_with_string_values(value_writer: impl ValueWriter) {
value_writer
.write_struct(|fields| {
fields
// $10 = timestamp
.write(10, black_box(1670446800245i64))?
// $11 = threadId
.write(11, black_box(418))?
// $12 = threadName
.write(12, black_box("scheduler-thread-6"))?
// $13 = loggerName
.write(13, black_box("com.example.organization.product.component.ClassName"))?
// $14 = logLevel
.write(14, black_box("INFO"))?
// $15 = format
.write(15, black_box("Request status: {} Client ID: {} Client Host: {} Client Region: {} Timestamp: {}"))?
// $16 = parameters
.write(16, &[
black_box("SUCCESS"),
black_box("example-client-1"),
black_box("aws-us-east-5f-18b4fa"),
black_box("region 4"),
black_box("2022-12-07T20:59:59.744000Z"),
])?;
Ok(())
}).unwrap();
fn write_struct_with_string_values(value_writer: impl ValueWriter) -> IonResult<()> {
let mut struct_ = value_writer.struct_writer()?;
struct_
// $10 = timestamp
.write(10, black_box(1670446800245i64))?
// $11 = threadId
.write(11, black_box(418))?
// $12 = threadName
.write(12, black_box("scheduler-thread-6"))?
// $13 = loggerName
.write(
13,
black_box("com.example.organization.product.component.ClassName"),
)?
// $14 = logLevel
.write(14, black_box("INFO"))?
// $15 = format
.write(
15,
black_box(
"Request status: {} Client ID: {} Client Host: {} Client Region: {} Timestamp: {}",
),
)?
// $16 = parameters
.write(
16,
&[
black_box("SUCCESS"),
black_box("example-client-1"),
black_box("aws-us-east-5f-18b4fa"),
black_box("region 4"),
black_box("2022-12-07T20:59:59.744000Z"),
],
)?;
struct_.end()
}

fn write_struct_with_symbol_values(value_writer: impl ValueWriter) {
value_writer
.write_struct(|fields| {
fields
// $10 = timestamp
.write(10, black_box(1670446800245i64))?
// $11 = threadId
.write(11, black_box(418))?
// $12 = threadName, $17 = scheduler-thread-6
.write(12, symbol_id(black_box(17)))?
// $13 = loggerName, $18 = com.example.organization.product.component.ClassName
.write(13, symbol_id(black_box(18)))?
// $14 = logLevel, $19 = INFO
.write(14, symbol_id(black_box(19)))?
// $15 = format, $20 = Request status: {} Client ID: {} Client Host: {} Client Region: {} Timestamp: {}
.write(15, symbol_id(black_box(20)))?
// $16 = parameters
.write(
16,
&[
// $21 = SUCCESS
symbol_id(black_box(21)),
// $22 = example-client-1
symbol_id(black_box(22)),
// $23 = aws-us-east-5f-18b4fa
symbol_id(black_box(23)),
// $24 = region 4
symbol_id(black_box(24)),
// $25 = 2022-12-07T20:59:59.744000Z (string, not timestamp)
symbol_id(black_box(25)),
],
)?;
Ok(())
})
.unwrap();
fn write_struct_with_symbol_values(value_writer: impl ValueWriter) -> IonResult<()> {
let mut struct_ = value_writer.struct_writer()?;
struct_
// $10 = timestamp
.write(10, black_box(1670446800245i64))?
// $11 = threadId
.write(11, black_box(418))?
// $12 = threadName, $17 = scheduler-thread-6
.write(12, symbol_id(black_box(17)))?
// $13 = loggerName, $18 = com.example.organization.product.component.ClassName
.write(13, symbol_id(black_box(18)))?
// $14 = logLevel, $19 = INFO
.write(14, symbol_id(black_box(19)))?
// $15 = format, $20 = Request status: {} Client ID: {} Client Host: {} Client Region: {} Timestamp: {}
.write(15, symbol_id(black_box(20)))?
// $16 = parameters
.write(
16,
&[
// $21 = SUCCESS
symbol_id(black_box(21)),
// $22 = example-client-1
symbol_id(black_box(22)),
// $23 = aws-us-east-5f-18b4fa
symbol_id(black_box(23)),
// $24 = region 4
symbol_id(black_box(24)),
// $25 = 2022-12-07T20:59:59.744000Z (string, not timestamp)
symbol_id(black_box(25)),
],
)?;
struct_.end()
}

fn write_eexp_with_symbol_values(value_writer: impl ValueWriter) {
value_writer
.write_eexp(0, |args| {
args.write(black_box(1670446800245i64))? // timestamp
.write(black_box(418))? // thread_id
// These are still strings because they're so short that using symbols to represent
// them wouldn't be beneficial.
.write(black_box("6"))? // thread_name
.write(black_box("1"))? // client_num
.write(symbol_id(black_box(10)))? // host_id: "18b4fa" ($10)
.value_writer()
.without_annotations()
.write_eexp(1, |args| {
args
// $11 = region 4
.write(symbol_id(black_box(11)))?
// $12 = "2022-12-07T20:59:59.744000Z" (string, not timestamp)
.write(symbol_id(black_box(12)))?;
Ok(())
})
.unwrap();
Ok(())
})
.unwrap();
fn write_eexp_with_symbol_values(value_writer: impl ValueWriter) -> IonResult<()> {
let mut eexp = value_writer.eexp_writer(0)?;
eexp.write(black_box(1670446800245i64))? // timestamp
.write(black_box(418))? // thread_id
// These are still strings because they're so short that using symbols to represent
// them wouldn't be beneficial.
.write(black_box("6"))? // thread_name
.write(black_box("1"))? // client_num
.write(symbol_id(black_box(10)))?; // host_id: "18b4fa" ($10)
let mut nested_eexp = eexp.eexp_writer(1)?;
nested_eexp
// $11 = region 4
.write(symbol_id(black_box(11)))?
// $12 = "2022-12-07T20:59:59.744000Z" (string, not timestamp)
.write(symbol_id(black_box(12)))?;
nested_eexp.end()?;
eexp.end()
}

fn write_eexp_with_string_values(value_writer: impl ValueWriter) {
value_writer
.write_eexp(0, |args| {
args.write(black_box(1670446800245i64))? // timestamp
.write(black_box(418))? // thread_id
.write(black_box("6"))? // thread_name
.write(black_box("1"))? // client_num
.write(black_box("18b4fa"))? // host_id
.value_writer()
.without_annotations()
.write_eexp(1, |args| {
args.write(black_box("region 4"))?
.write(black_box("2022-12-07T20:59:59.744000Z"))?;
Ok(())
})?;
Ok(())
})
.unwrap();
fn write_eexp_with_string_values(value_writer: impl ValueWriter) -> IonResult<()> {
let mut eexp = value_writer.eexp_writer(0)?;
eexp.write(black_box(1670446800245i64))? // timestamp
.write(black_box(418))? // thread_id
.write(black_box("6"))? // thread_name
.write(black_box("1"))? // client_num
.write(black_box("18b4fa"))?; // host_id
let mut nested_eexp = eexp.eexp_writer(1)?;
nested_eexp
.write(black_box("region 4"))?
.write(black_box("2022-12-07T20:59:59.744000Z"))?;
nested_eexp.end()?;
eexp.end()
}

fn symbol_id(sid: usize) -> RawSymbolTokenRef<'static> {
Expand All @@ -130,7 +124,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
b.iter(|| {
buffer.clear();
let mut writer = LazyRawBinaryWriter_1_0::new(&mut buffer).unwrap();
write_struct_with_string_values(writer.value_writer().without_annotations());
write_struct_with_string_values(writer.value_writer()).unwrap();
writer.flush().unwrap();
black_box(buffer.as_bytes());
});
Expand All @@ -148,7 +142,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
b.iter(|| {
buffer.clear();
let mut writer = LazyRawBinaryWriter_1_0::new(&mut buffer).unwrap();
write_struct_with_symbol_values(writer.value_writer().without_annotations());
write_struct_with_symbol_values(writer.value_writer()).unwrap();
writer.flush().unwrap();

black_box(buffer.as_bytes());
Expand All @@ -165,7 +159,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
b.iter(|| {
buffer.clear();
let mut writer = LazyRawBinaryWriter_1_1::new(&mut buffer).unwrap();
write_struct_with_string_values(writer.value_writer().without_annotations());
write_struct_with_string_values(writer.value_writer()).unwrap();
writer.flush().unwrap();
black_box(buffer.as_bytes());
});
Expand All @@ -179,7 +173,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
b.iter(|| {
buffer.clear();
let mut writer = LazyRawBinaryWriter_1_1::new(&mut buffer).unwrap();
write_struct_with_symbol_values(writer.value_writer().without_annotations());
write_struct_with_symbol_values(writer.value_writer()).unwrap();
writer.flush().unwrap();

black_box(buffer.as_bytes());
Expand All @@ -194,12 +188,8 @@ pub fn criterion_benchmark(c: &mut Criterion) {
b.iter(|| {
buffer.clear();
let mut writer = LazyRawBinaryWriter_1_1::new(&mut buffer).unwrap();
write_struct_with_string_values(
writer
.value_writer()
.with_delimited_containers()
.without_annotations(),
);
write_struct_with_string_values(writer.value_writer().with_delimited_containers())
.unwrap();
writer.flush().unwrap();
black_box(buffer.as_bytes());
});
Expand All @@ -216,12 +206,8 @@ pub fn criterion_benchmark(c: &mut Criterion) {
b.iter(|| {
buffer.clear();
let mut writer = LazyRawBinaryWriter_1_1::new(&mut buffer).unwrap();
write_struct_with_symbol_values(
writer
.value_writer()
.with_delimited_containers()
.without_annotations(),
);
write_struct_with_symbol_values(writer.value_writer().with_delimited_containers())
.unwrap();
writer.flush().unwrap();

black_box(buffer.as_bytes());
Expand All @@ -236,7 +222,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
b.iter(|| {
buffer.clear();
let mut writer = LazyRawBinaryWriter_1_1::new(&mut buffer).unwrap();
write_eexp_with_string_values(writer.value_writer().without_annotations());
write_eexp_with_string_values(writer.value_writer()).unwrap();
writer.flush().unwrap();
black_box(buffer.as_bytes());
});
Expand All @@ -253,7 +239,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
b.iter(|| {
buffer.clear();
let mut writer = LazyRawBinaryWriter_1_1::new(&mut buffer).unwrap();
write_eexp_with_symbol_values(writer.value_writer().without_annotations());
write_eexp_with_symbol_values(writer.value_writer()).unwrap();
writer.flush().unwrap();
black_box(buffer.as_bytes());
});
Expand Down
Loading

0 comments on commit e3f0eaf

Please sign in to comment.