mirror of
https://github.com/chirpstack/chirpstack.git
synced 2025-02-21 01:21:21 +00:00
Save metrics in one pipelined Redis query.
This saves the metrics in one pipelined Redis query, rather than one query per aggregation level. This saves 2 queries per save.
This commit is contained in:
parent
b65faf7b98
commit
8cde64c4b7
@ -83,81 +83,77 @@ pub async fn save_state(name: &str, state: &str) -> Result<()> {
|
||||
}
|
||||
|
||||
pub async fn save(name: &str, record: &Record) -> Result<()> {
|
||||
for a in get_aggregations() {
|
||||
save_for_interval(a, name, record).await?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn save_for_interval(a: Aggregation, name: &str, record: &Record) -> Result<()> {
|
||||
if record.metrics.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let ttl = get_ttl(a);
|
||||
|
||||
let ts: DateTime<Local> = match a {
|
||||
Aggregation::HOUR => Local
|
||||
.with_ymd_and_hms(
|
||||
record.time.year(),
|
||||
record.time.month(),
|
||||
record.time.day(),
|
||||
record.time.hour(),
|
||||
0,
|
||||
0,
|
||||
)
|
||||
.unwrap(),
|
||||
Aggregation::DAY => Local
|
||||
.with_ymd_and_hms(
|
||||
record.time.year(),
|
||||
record.time.month(),
|
||||
record.time.day(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
)
|
||||
.unwrap(),
|
||||
Aggregation::MONTH => Local
|
||||
.with_ymd_and_hms(record.time.year(), record.time.month(), 1, 0, 0, 0)
|
||||
.unwrap(),
|
||||
};
|
||||
|
||||
let key = get_key(&name, a, ts);
|
||||
let mut pipe = redis::pipe();
|
||||
pipe.atomic();
|
||||
|
||||
for (k, v) in &record.metrics {
|
||||
// Passing a reference to hincr will return a runtime error.
|
||||
let k = k.clone();
|
||||
let v = *v;
|
||||
for a in get_aggregations() {
|
||||
let ttl = get_ttl(a);
|
||||
|
||||
match record.kind {
|
||||
Kind::COUNTER => {
|
||||
pipe.cmd("HSET").arg(&key).arg(k).arg(v).ignore();
|
||||
}
|
||||
Kind::ABSOLUTE => {
|
||||
pipe.cmd("HINCRBYFLOAT").arg(&key).arg(k).arg(v).ignore();
|
||||
}
|
||||
Kind::GAUGE => {
|
||||
pipe.cmd("HINCRBYFLOAT")
|
||||
.arg(&key)
|
||||
.arg(format!("_{}_count", k))
|
||||
.arg(1.0)
|
||||
.ignore();
|
||||
pipe.cmd("HINCRBYFLOAT").arg(&key).arg(k).arg(v).ignore();
|
||||
let ts: DateTime<Local> = match a {
|
||||
Aggregation::HOUR => Local
|
||||
.with_ymd_and_hms(
|
||||
record.time.year(),
|
||||
record.time.month(),
|
||||
record.time.day(),
|
||||
record.time.hour(),
|
||||
0,
|
||||
0,
|
||||
)
|
||||
.unwrap(),
|
||||
Aggregation::DAY => Local
|
||||
.with_ymd_and_hms(
|
||||
record.time.year(),
|
||||
record.time.month(),
|
||||
record.time.day(),
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
)
|
||||
.unwrap(),
|
||||
Aggregation::MONTH => Local
|
||||
.with_ymd_and_hms(record.time.year(), record.time.month(), 1, 0, 0, 0)
|
||||
.unwrap(),
|
||||
};
|
||||
|
||||
let key = get_key(&name, a, ts);
|
||||
|
||||
for (k, v) in &record.metrics {
|
||||
// Passing a reference to hincr will return a runtime error.
|
||||
let k = k.clone();
|
||||
let v = *v;
|
||||
|
||||
match record.kind {
|
||||
Kind::COUNTER => {
|
||||
pipe.cmd("HSET").arg(&key).arg(k).arg(v).ignore();
|
||||
}
|
||||
Kind::ABSOLUTE => {
|
||||
pipe.cmd("HINCRBYFLOAT").arg(&key).arg(k).arg(v).ignore();
|
||||
}
|
||||
Kind::GAUGE => {
|
||||
pipe.cmd("HINCRBYFLOAT")
|
||||
.arg(&key)
|
||||
.arg(format!("_{}_count", k))
|
||||
.arg(1.0)
|
||||
.ignore();
|
||||
pipe.cmd("HINCRBYFLOAT").arg(&key).arg(k).arg(v).ignore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pipe.cmd("PEXPIRE")
|
||||
.arg(&key)
|
||||
.arg(ttl.as_millis() as usize)
|
||||
.ignore();
|
||||
|
||||
info!(name = %name, aggregation = %a, "Metrics saved");
|
||||
}
|
||||
|
||||
pipe.cmd("PEXPIRE")
|
||||
.arg(&key)
|
||||
.arg(ttl.as_millis() as usize)
|
||||
.ignore()
|
||||
.query_async(&mut get_async_redis_conn().await?)
|
||||
.await?;
|
||||
pipe.query_async(&mut get_async_redis_conn().await?).await?;
|
||||
|
||||
info!(name = %name, aggregation = %a, "Metrics saved");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -339,9 +335,7 @@ pub mod test {
|
||||
},
|
||||
];
|
||||
for r in &records {
|
||||
save_for_interval(Aggregation::HOUR, "test", r)
|
||||
.await
|
||||
.unwrap();
|
||||
save("test", r).await.unwrap();
|
||||
}
|
||||
|
||||
let resp = get(
|
||||
@ -408,9 +402,7 @@ pub mod test {
|
||||
},
|
||||
];
|
||||
for r in &records {
|
||||
save_for_interval(Aggregation::DAY, "test", r)
|
||||
.await
|
||||
.unwrap();
|
||||
save("test", r).await.unwrap();
|
||||
}
|
||||
|
||||
let resp = get(
|
||||
@ -477,9 +469,7 @@ pub mod test {
|
||||
},
|
||||
];
|
||||
for r in &records {
|
||||
save_for_interval(Aggregation::DAY, "test", r)
|
||||
.await
|
||||
.unwrap();
|
||||
save("test", r).await.unwrap();
|
||||
}
|
||||
|
||||
let resp = get(
|
||||
@ -546,9 +536,7 @@ pub mod test {
|
||||
},
|
||||
];
|
||||
for r in &records {
|
||||
save_for_interval(Aggregation::MONTH, "test", r)
|
||||
.await
|
||||
.unwrap();
|
||||
save("test", r).await.unwrap();
|
||||
}
|
||||
|
||||
let resp = get(
|
||||
@ -607,9 +595,7 @@ pub mod test {
|
||||
},
|
||||
];
|
||||
for r in &records {
|
||||
save_for_interval(Aggregation::HOUR, "test", r)
|
||||
.await
|
||||
.unwrap();
|
||||
save("test", r).await.unwrap();
|
||||
}
|
||||
|
||||
let resp = get(
|
||||
@ -658,9 +644,7 @@ pub mod test {
|
||||
},
|
||||
];
|
||||
for r in &records {
|
||||
save_for_interval(Aggregation::HOUR, "test", r)
|
||||
.await
|
||||
.unwrap();
|
||||
save("test", r).await.unwrap();
|
||||
}
|
||||
|
||||
let resp = get(
|
||||
@ -709,9 +693,7 @@ pub mod test {
|
||||
},
|
||||
];
|
||||
for r in &records {
|
||||
save_for_interval(Aggregation::HOUR, "test", r)
|
||||
.await
|
||||
.unwrap();
|
||||
save("test", r).await.unwrap();
|
||||
}
|
||||
|
||||
let resp = get(
|
||||
|
Loading…
x
Reference in New Issue
Block a user