-
Notifications
You must be signed in to change notification settings - Fork 21
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 deduping to mobile packet verifier #585
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,4 @@ | ||
CREATE TABLE event_ids ( | ||
event_id TEXT NOT NULL PRIMARY KEY, | ||
received_timestamp TIMESTAMPTZ NOT NULL | ||
); |
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,60 @@ | ||
use chrono::{DateTime, Duration, Utc}; | ||
use sqlx::{Pool, Postgres, Transaction}; | ||
|
||
use crate::settings::Settings; | ||
|
||
pub async fn is_duplicate( | ||
txn: &mut Transaction<'_, Postgres>, | ||
event_id: String, | ||
received_timestamp: DateTime<Utc>, | ||
) -> anyhow::Result<bool> { | ||
sqlx::query("INSERT INTO event_ids(event_id, received_timestamp) VALUES($1, $2) ON CONFLICT (event_id) DO NOTHING") | ||
.bind(event_id) | ||
.bind(received_timestamp) | ||
.execute(txn) | ||
.await | ||
.map(|result| result.rows_affected() > 0) | ||
.map_err(anyhow::Error::from) | ||
} | ||
|
||
pub struct EventIdPurger { | ||
conn: Pool<Postgres>, | ||
interval: Duration, | ||
max_age: Duration, | ||
} | ||
|
||
impl EventIdPurger { | ||
pub fn from_settings(conn: Pool<Postgres>, settings: &Settings) -> Self { | ||
Self { | ||
conn, | ||
interval: settings.purger_interval(), | ||
max_age: settings.purger_max_age(), | ||
} | ||
} | ||
|
||
pub async fn run(self, mut shutdown: triggered::Listener) -> anyhow::Result<()> { | ||
let mut timer = tokio::time::interval(self.interval.to_std()?); | ||
|
||
loop { | ||
tokio::select! { | ||
_ = &mut shutdown => { | ||
return Ok(()) | ||
} | ||
_ = timer.tick() => { | ||
purge(&self.conn, self.max_age).await?; | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
async fn purge(conn: &Pool<Postgres>, max_age: Duration) -> anyhow::Result<()> { | ||
let timestamp = Utc::now() - max_age; | ||
|
||
sqlx::query("DELETE FROM event_ids where received_timestamp < $1") | ||
.bind(timestamp) | ||
.execute(conn) | ||
.await | ||
.map(|_| ()) | ||
.map_err(anyhow::Error::from) | ||
} |
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,4 +1,5 @@ | ||
pub mod accumulate; | ||
pub mod burner; | ||
pub mod daemon; | ||
pub mod event_ids; | ||
pub mod settings; |
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
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.
what are these event_ids constituted from? are we pretty sure they'll be unique for the life of a record in this database without aggregating to some other piece of data like a hotspot pubkey or cbsd_id?
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 are unique according to Dmytro.