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

fix: column already exists (#4961)

Browse Source 
* fix: merge fetched logical metadata with existing cache

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* fix log acquire

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* Update src/metric-engine/src/engine/region_metadata.rs

Co-authored-by: Yingwen <realevenyag@gmail.com>

---------

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
Co-authored-by: Yingwen <realevenyag@gmail.com>
This commit is contained in:
Ruihang Xia
2024-11-07 21:25:05 +08:00
committed by GitHub
parent 22f31f5929
commit fcd0ceea94
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/metric-engine/src/engine/region_metadata.rs
View File

@@ -14,6 +14,8 @@
//! Implementation of retrieving logical region's region metadata.
use std::collections::HashMap;
use store_api::metadata::ColumnMetadata;
use store_api::storage::RegionId;
@@ -46,23 +48,36 @@ impl MetricEngineInner {
.read_lock_logical_region(logical_region_id)
.await;
// Load logical and physical columns, and intersect them to get logical column metadata.
let mut logical_column_metadata = self
let logical_column_metadata = self
.metadata_region
.logical_columns(physical_region_id, logical_region_id)
.await?
.into_iter()
.map(|(_, column_metadata)| column_metadata)
.collect::<Vec<_>>();
// Sort columns on column name to ensure the order
logical_column_metadata
.sort_unstable_by(|c1, c2| c1.column_schema.name.cmp(&c2.column_schema.name));
// Update cache
self.state
.write()
.unwrap()
.add_logical_columns(logical_region_id, logical_column_metadata.clone());
Ok(logical_column_metadata)
// Update cache
let mut mutable_state = self.state.write().unwrap();
// Merge with existing cached columns.
let existing_columns = mutable_state
.logical_columns()
.get(&logical_region_id)
.cloned()
.unwrap_or_default()
.into_iter();
let mut dedup_columns = logical_column_metadata
.into_iter()
.chain(existing_columns)
.map(|c| (c.column_id, c))
.collect::<HashMap<_, _>>()
.values()
.cloned()
.collect::<Vec<_>>();
// Sort columns on column name to ensure the order
dedup_columns.sort_unstable_by(|c1, c2| c1.column_schema.name.cmp(&c2.column_schema.name));
mutable_state.set_logical_columns(logical_region_id, dedup_columns.clone());
Ok(dedup_columns)
}
/// Load logical column names of a logical region.

14
src/metric-engine/src/engine/state.rs
View File

@@ -85,19 +85,13 @@ impl MetricEngineState {
.insert(logical_region_id, physical_region_id);
}
/// Add and reorder logical columns.
///
/// Caller should make sure:
/// 1. there is no duplicate columns
/// 2. the column order is the same with the order in the metadata, which is
/// alphabetically ordered on column name.
pub fn add_logical_columns(
/// Replace the logical columns of the logical region with given columns.
pub fn set_logical_columns(
&mut self,
logical_region_id: RegionId,
new_columns: impl IntoIterator<Item = ColumnMetadata>,
columns: Vec<ColumnMetadata>,
) {
let columns = self.logical_columns.entry(logical_region_id).or_default();
columns.extend(new_columns);
self.logical_columns.insert(logical_region_id, columns);
}
pub fn get_physical_region_id(&self, logical_region_id: RegionId) -> Option<RegionId> {