Skip to content

removed nulls/optionals #829

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.

Sign up for GitHub

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

Open
ZanCorDX wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

removed nulls/optionals #829

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions crates/rbuilder-operator/src/clickhouse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,13 @@ pub struct BlockRow {
/// Info about the bid that triggered the bid to be generated.
/// Notice this may not be the top bid since a builder lowering it's bid could trigger a new bid
/// against the new winner.
pub triggering_bid_seen_time: Option<i64>,
pub triggering_bid_relay: Option<String>,
/// These 2 should be Option but for clickhouse optimization we use defaults as null values.
pub triggering_bid_seen_time: i64,
pub triggering_bid_relay: String,
/// Info about the top bid among all relays we are trying to beat (best_relay_value)
pub bid_to_beat_seen_time: Option<i64>,
pub bid_to_beat_seen_relay: Option<String>,
/// These 2 should be Option but for clickhouse optimization we use defaults as null values.
pub bid_to_beat_seen_time: i64,
pub bid_to_beat_seen_relay: String,
}

impl ClickhouseRowExt for BlockRow {
Expand Down Expand Up @@ -295,30 +297,26 @@ impl BidObserver for BuiltBlocksWriter {
let block_uses = block_uses
.entry(built_block_trace.build_block_id)
.or_insert(0);

let (triggering_bid_seen_time, triggering_bid_relay) = built_block_trace
.competition_bid_context
.triggering_bid_source_info
.as_ref()
.map(|info| {
(
Some(offset_date_to_clickhouse_timestamp(info.seen_time)),
Some(info.relay.clone()),
offset_date_to_clickhouse_timestamp(info.seen_time),
info.relay.clone(),
)
})
.unwrap_or_default();

let (bid_to_beat_seen_time, bid_to_beat_seen_relay, best_relay_value) =
built_block_trace
.competition_bid_context
.seen_competition_bid
.as_ref()
.map(|bid_with_info| {
(
Some(offset_date_to_clickhouse_timestamp(
bid_with_info.info.seen_time,
)),
Some(bid_with_info.info.relay.clone()),
offset_date_to_clickhouse_timestamp(bid_with_info.info.seen_time),
bid_with_info.info.relay.clone(),
Some(bid_with_info.value),
)
})
Expand Down
Loading