-
-
Notifications
You must be signed in to change notification settings - Fork 144
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.
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
Add is_compatible method to event content enums to fix Any*Event deserialization #52
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0b825ef
Adds derive to generate custom Deserialize impl for top level any eve…
DevinR528 fafc584
Adds tests for the AnyEventDeserialize derive macro, moves enums.rs t…
DevinR528 ca69ed9
Implement Deserialize manually for Any*Event enums
DevinR528 5ea7ad2
Refactor tests Any*Event enum tests, refactor benchmark file, bench l…
DevinR528 be80107
Fix grammar in benchmark comments
DevinR528 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
/target | ||
target | ||
Cargo.lock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
// `cargo bench` works, but if you use `cargo bench -- --save-baseline <name>` | ||
// or pass any other args to it, it fails with the error | ||
// `cargo bench unknown option --save-baseline`. | ||
// To pass args to criterion, use this form | ||
// `cargo bench --bench <name of the bench> -- --save-baseline <name>`. | ||
|
||
use criterion::{criterion_group, criterion_main, Criterion}; | ||
use ruma_events::{ | ||
room::power_levels::PowerLevelsEventContent, AnyEvent, AnyRoomEvent, AnyStateEvent, EventJson, | ||
StateEvent, | ||
}; | ||
use serde_json::json; | ||
|
||
fn power_levels() -> serde_json::Value { | ||
json!({ | ||
"content": { | ||
"ban": 50, | ||
"events": { | ||
"m.room.avatar": 50, | ||
"m.room.canonical_alias": 50, | ||
"m.room.history_visibility": 100, | ||
"m.room.name": 50, | ||
"m.room.power_levels": 100 | ||
}, | ||
"events_default": 0, | ||
"invite": 0, | ||
"kick": 50, | ||
"redact": 50, | ||
"state_default": 50, | ||
"users": { | ||
"@example:localhost": 100 | ||
}, | ||
"users_default": 0 | ||
}, | ||
"event_id": "$15139375512JaHAW:localhost", | ||
"origin_server_ts": 45, | ||
"sender": "@example:localhost", | ||
"room_id": "!room:localhost", | ||
"state_key": "", | ||
"type": "m.room.power_levels", | ||
"unsigned": { | ||
"age": 45 | ||
} | ||
}) | ||
} | ||
|
||
fn deserialize_any_event(c: &mut Criterion) { | ||
let json_data = power_levels(); | ||
|
||
c.bench_function("deserialize to `AnyEvent`", |b| { | ||
b.iter(|| { | ||
let _ = serde_json::from_value::<EventJson<AnyEvent>>(json_data.clone()) | ||
.unwrap() | ||
.deserialize() | ||
.unwrap(); | ||
}) | ||
}); | ||
} | ||
|
||
fn deserialize_any_room_event(c: &mut Criterion) { | ||
let json_data = power_levels(); | ||
|
||
c.bench_function("deserialize to `AnyRoomEvent`", |b| { | ||
b.iter(|| { | ||
let _ = serde_json::from_value::<EventJson<AnyRoomEvent>>(json_data.clone()) | ||
.unwrap() | ||
.deserialize() | ||
.unwrap(); | ||
}) | ||
}); | ||
} | ||
|
||
fn deserialize_any_state_event(c: &mut Criterion) { | ||
let json_data = power_levels(); | ||
|
||
c.bench_function("deserialize to `AnyStateEvent`", |b| { | ||
b.iter(|| { | ||
let _ = serde_json::from_value::<EventJson<AnyStateEvent>>(json_data.clone()) | ||
.unwrap() | ||
.deserialize() | ||
.unwrap(); | ||
}) | ||
}); | ||
} | ||
|
||
fn deserialize_specific_event(c: &mut Criterion) { | ||
let json_data = power_levels(); | ||
|
||
c.bench_function("deserialize to `StateEvent<PowerLevelsEventContent>`", |b| { | ||
b.iter(|| { | ||
let _ = serde_json::from_value::<EventJson<StateEvent<PowerLevelsEventContent>>>( | ||
json_data.clone(), | ||
) | ||
.unwrap() | ||
.deserialize() | ||
.unwrap(); | ||
}) | ||
}); | ||
} | ||
|
||
criterion_group!( | ||
benches, | ||
deserialize_any_event, | ||
deserialize_any_room_event, | ||
deserialize_any_state_event, | ||
deserialize_specific_event | ||
); | ||
|
||
criterion_main!(benches); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❓
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
criterion
generates a ruma-events/target dir I figured this should be ignored?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure. I don't like it doing that, but I guess we can't do much about it.