Skip to content

Commit e7fcf1c

Browse files
authored
fix: sqlite metadata panic (#1551)
1 parent db931be commit e7fcf1c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/common/infra/db/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,12 @@ pub fn parse_key(mut key: &str) -> (String, String, String) {
140140

141141
pub fn build_key(module: &str, key1: &str, key2: &str) -> String {
142142
if key1.is_empty() {
143-
return module.to_string();
144-
}
145-
if key2.is_empty() {
146-
return format!("/{}/{}", module, key1);
143+
format!("/{module}/")
144+
} else if key2.is_empty() {
145+
format!("/{module}/{key1}")
146+
} else {
147+
format!("/{module}/{key1}/{key2}")
147148
}
148-
format!("/{}/{}/{}", module, key1, key2)
149149
}
150150

151151
#[derive(Debug, Default)]

src/service/logs/otlp_http.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use opentelemetry_proto::tonic::collector::logs::v1::{
2222
};
2323
use prost::Message;
2424

25-
use crate::{common::{
25+
use crate::common::{
2626
infra::{cluster, config::CONFIG, metrics},
2727
meta::{
2828
alert::{Alert, Trigger},
@@ -33,10 +33,10 @@ use crate::{common::{
3333
StreamType,
3434
},
3535
utils::{flatten, json},
36-
}, service::format_stream_name};
36+
};
3737
use crate::handler::http::request::CONTENT_TYPE_JSON;
3838
use crate::service::{
39-
db,
39+
db, format_stream_name,
4040
ingestion::{grpc::get_val_for_attr, write_file},
4141
schema::stream_schema_exists,
4242
usage::report_request_usage_stats,

0 commit comments

Comments
 (0)