rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-10 15:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: shorten lock time (#6968)

Browse Source
This commit is contained in:
shuiyisong
2025-09-15 11:37:36 +08:00
committed by GitHub
parent b3aabb6706
commit 8ce963f63e
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/frontend/src/instance.rs
View File

@@ -376,33 +376,35 @@ impl Instance {
ctx: QueryContextRef,
) -> server_error::Result<bool> {
let db_string = ctx.get_db_string();
let cache = self
.otlp_metrics_table_legacy_cache
.entry(db_string)
.or_default();
// fast cache check
{
let cache = self
.otlp_metrics_table_legacy_cache
.entry(db_string.clone())
.or_default();
// check cache
let hit_cache = names
.iter()
.filter_map(|name| cache.get(*name))
.collect::<Vec<_>>();
if !hit_cache.is_empty() {
let hit_legacy = hit_cache.iter().any(|en| *en.value());
let hit_prom = hit_cache.iter().any(|en| !*en.value());
let hit_cache = names
.iter()
.filter_map(|name| cache.get(*name))
.collect::<Vec<_>>();
if !hit_cache.is_empty() {
let hit_legacy = hit_cache.iter().any(|en| *en.value());
let hit_prom = hit_cache.iter().any(|en| !*en.value());
// hit but have true and false, means both legacy and new mode are used
// we cannot handle this case, so return error
// add doc links in err msg later
ensure!(!(hit_legacy && hit_prom), OtlpMetricModeIncompatibleSnafu);
// hit but have true and false, means both legacy and new mode are used
// we cannot handle this case, so return error
// add doc links in err msg later
ensure!(!(hit_legacy && hit_prom), OtlpMetricModeIncompatibleSnafu);
let flag = hit_legacy;
// set cache for all names
names.iter().for_each(|name| {
if !cache.contains_key(*name) {
cache.insert(name.to_string(), flag);
}
});
return Ok(flag);
let flag = hit_legacy;
// set cache for all names
names.iter().for_each(|name| {
if !cache.contains_key(*name) {
cache.insert(name.to_string(), flag);
}
});
return Ok(flag);
}
}
let catalog = ctx.current_catalog();
@@ -430,7 +432,10 @@ impl Instance {
// means no existing table is found, use new mode
if table_ids.is_empty() {
// set cache
let cache = self
.otlp_metrics_table_legacy_cache
.entry(db_string)
.or_default();
names.iter().for_each(|name| {
cache.insert(name.to_string(), false);
});
@@ -455,6 +460,10 @@ impl Instance {
.unwrap_or(&OTLP_LEGACY_DEFAULT_VALUE)
})
.collect::<Vec<_>>();
let cache = self
.otlp_metrics_table_legacy_cache
.entry(db_string)
.or_default();
if !options.is_empty() {
// check value consistency
let has_prom = options.iter().any(|opt| *opt == OTLP_METRIC_COMPAT_PROM);