feat: add LSM timeline support with timeline layout management for old and new table versions #395
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| use crate::config::table::HudiTableConfig::{TableVersion, TimelineLayoutVersion}; | ||
| use crate::config::HudiConfigs; | ||
| use crate::error::CoreError; | ||
| use crate::storage::Storage; | ||
| use crate::timeline::loader::TimelineLoader; | ||
| use crate::timeline::Timeline; | ||
| use crate::Result; | ||
| use std::sync::Arc; | ||
|
|
||
| pub struct TimelineBuilder { | ||
| hudi_configs: Arc<HudiConfigs>, | ||
| storage: Arc<Storage>, | ||
| } | ||
|
|
||
| impl TimelineBuilder { | ||
| pub fn new(hudi_configs: Arc<HudiConfigs>, storage: Arc<Storage>) -> Self { | ||
| Self { | ||
| hudi_configs, | ||
| storage, | ||
| } | ||
| } | ||
|
|
||
| pub async fn build(self) -> Result<Timeline> { | ||
| let (active_loader, archived_loader) = self.resolve_loader_config()?; | ||
| let timeline = Timeline::new( | ||
| self.hudi_configs, | ||
| self.storage, | ||
| active_loader, | ||
| archived_loader, | ||
| ); | ||
| Ok(timeline) | ||
| } | ||
|
|
||
| fn resolve_loader_config(&self) -> Result<(TimelineLoader, Option<TimelineLoader>)> { | ||
| let table_version = match self.hudi_configs.get(TableVersion) { | ||
| Ok(v) => v.to::<isize>(), | ||
| Err(_) => { | ||
| return Ok(( | ||
| TimelineLoader::LayoutOneActive(self.storage.clone()), | ||
| Some(TimelineLoader::LayoutOneArchived(self.storage.clone())), | ||
| )) | ||
| } | ||
| }; | ||
|
|
||
| let layout_version = self | ||
| .hudi_configs | ||
| .try_get(TimelineLayoutVersion) | ||
| .map(|v| v.to::<isize>()) | ||
| .unwrap_or_else(|| if table_version == 8 { 2 } else { 1 }); | ||
|
|
||
| match layout_version { | ||
| 1 => { | ||
| if !(5..=8).contains(&table_version) { | ||
xushiyan marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return Err(CoreError::Unsupported(format!( | ||
| "Unsupported table version {} with timeline layout version {}", | ||
| table_version, layout_version | ||
| ))); | ||
| } | ||
| Ok(( | ||
| TimelineLoader::LayoutOneActive(self.storage.clone()), | ||
| Some(TimelineLoader::LayoutOneArchived(self.storage.clone())), | ||
| )) | ||
| } | ||
| 2 => { | ||
| if table_version != 8 { | ||
| return Err(CoreError::Unsupported(format!( | ||
| "Unsupported table version {} with timeline layout version {}", | ||
| table_version, layout_version | ||
| ))); | ||
| } | ||
| Ok(( | ||
| TimelineLoader::LayoutTwoActive(self.storage.clone()), | ||
| Some(TimelineLoader::LayoutTwoCompacted(self.storage.clone())), | ||
| )) | ||
| } | ||
| _ => Err(CoreError::Unsupported(format!( | ||
| "Unsupported timeline layout version: {}", | ||
| layout_version | ||
| ))), | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| use crate::error::CoreError; | ||
| use crate::metadata::HUDI_METADATA_DIR; | ||
| use crate::storage::Storage; | ||
| use crate::timeline::instant::Instant; | ||
| use crate::timeline::lsm_tree::LSM_TIMELINE_DIR; | ||
| use crate::timeline::selector::TimelineSelector; | ||
| use crate::Result; | ||
| use log::debug; | ||
| use std::sync::Arc; | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub enum TimelineLoader { | ||
| LayoutOneActive(Arc<Storage>), | ||
| LayoutOneArchived(Arc<Storage>), | ||
| LayoutTwoActive(Arc<Storage>), | ||
| LayoutTwoCompacted(Arc<Storage>), | ||
codope marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| impl TimelineLoader { | ||
| pub async fn load_instants( | ||
| &self, | ||
| selector: &TimelineSelector, | ||
| desc: bool, | ||
| ) -> Result<Vec<Instant>> { | ||
| match self { | ||
| TimelineLoader::LayoutOneActive(storage) => { | ||
| let files = storage.list_files(Some(HUDI_METADATA_DIR)).await?; | ||
| let mut instants = Vec::with_capacity(files.len() / 3); | ||
|
|
||
| for file_info in files { | ||
| match selector.try_create_instant(file_info.name.as_str()) { | ||
| Ok(instant) => instants.push(instant), | ||
| Err(e) => { | ||
| debug!( | ||
| "Instant not created from file {:?} due to: {:?}", | ||
| file_info, e | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| instants.sort_unstable(); | ||
| instants.shrink_to_fit(); | ||
|
|
||
| if desc { | ||
| Ok(instants.into_iter().rev().collect()) | ||
| } else { | ||
| Ok(instants) | ||
| } | ||
| } | ||
| TimelineLoader::LayoutTwoActive(storage) => { | ||
| let files = storage.list_files(Some(LSM_TIMELINE_DIR)).await?; | ||
| let mut instants = Vec::new(); | ||
|
|
||
| for file_info in files { | ||
| if file_info.name.starts_with("history/") || file_info.name.starts_with('_') { | ||
|
||
| continue; | ||
| } | ||
| match selector.try_create_instant(file_info.name.as_str()) { | ||
|
There was a problem hiding this comment. i think this API needs to handle v8 instants as the completed ones have completion ts There was a problem hiding this comment. @codope this is the only blocker for merging. if we need to pass v8 timeline loading test cases, this parsing needs to be there. |
||
| Ok(instant) => instants.push(instant), | ||
| Err(e) => { | ||
| debug!( | ||
| "Instant not created from file {:?} due to: {:?}", | ||
| file_info, e | ||
| ); | ||
| } | ||
| } | ||
| } | ||
| Ok(instants) | ||
| } | ||
| _ => Err(CoreError::Unsupported( | ||
| "Loading from this timeline layout is not implemented yet.".to_string(), | ||
| )), | ||
| } | ||
| } | ||
|
|
||
| pub async fn load_archived_instants( | ||
| &self, | ||
| _selector: &TimelineSelector, | ||
| _desc: bool, | ||
| ) -> Result<Vec<Instant>> { | ||
| match self { | ||
| TimelineLoader::LayoutOneArchived(_) => Err(CoreError::Unsupported( | ||
| "Archived timeline for layout v1 not implemented yet".to_string(), | ||
| )), | ||
| TimelineLoader::LayoutTwoCompacted(_) => Err(CoreError::Unsupported( | ||
| "Compacted timeline for layout v2 not implemented yet".to_string(), | ||
xushiyan marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| )), | ||
| _ => Ok(Vec::new()), // Active loaders don't have archived parts. | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.