-
Notifications
You must be signed in to change notification settings - Fork 3.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[fix](HMSExternalTable) refactor code #46466
Open
BePPPower
wants to merge
5
commits into
apache:master
Choose a base branch
from
BePPPower:implementHiveExternalTable2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+241
−66
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
79 changes: 79 additions & 0 deletions
79
fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSDlaTable.java
This file contains 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,79 @@ | ||
| // 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. | ||
|
|
||
| package org.apache.doris.datasource.hive; | ||
|
|
||
| import org.apache.doris.catalog.Column; | ||
| import org.apache.doris.catalog.Env; | ||
| import org.apache.doris.catalog.MTMV; | ||
| import org.apache.doris.catalog.PartitionItem; | ||
| import org.apache.doris.catalog.PartitionType; | ||
| import org.apache.doris.common.AnalysisException; | ||
| import org.apache.doris.common.DdlException; | ||
| import org.apache.doris.datasource.mvcc.MvccSnapshot; | ||
| import org.apache.doris.mtmv.MTMVBaseTableIf; | ||
| import org.apache.doris.mtmv.MTMVRefreshContext; | ||
| import org.apache.doris.mtmv.MTMVSnapshotIf; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * This abstract class represents a Hive Metastore (HMS) Dla Table and provides a blueprint for | ||
| * various operations related to metastore tables in Doris. | ||
| * | ||
| * Purpose: | ||
| * - To encapsulate common functionalities that HMS Dla tables should have for implementing other interfaces | ||
| * | ||
| * Why needed: | ||
| * - To provide a unified way to manage and interact with different kinds of Dla Table | ||
| * - To facilitate the implementation of multi-table materialized views (MTMV) by providing necessary | ||
| * methods for snapshot and partition management. | ||
| * - To abstract out the specific details of HMS table operations, making the code more modular and maintainable. | ||
| */ | ||
| public abstract class HMSDlaTable implements MTMVBaseTableIf { | ||
| HMSExternalTable hmsTable; | ||
|
|
||
| public HMSDlaTable(HMSExternalTable table) { | ||
| this.hmsTable = table; | ||
| } | ||
|
|
||
| abstract Map<String, PartitionItem> getAndCopyPartitionItems(Optional<MvccSnapshot> snapshot) | ||
| throws AnalysisException; | ||
|
|
||
| abstract PartitionType getPartitionType(Optional<MvccSnapshot> snapshot); | ||
|
|
||
| abstract Set<String> getPartitionColumnNames(Optional<MvccSnapshot> snapshot) throws DdlException; | ||
|
|
||
| abstract List<Column> getPartitionColumns(Optional<MvccSnapshot> snapshot); | ||
|
|
||
| abstract MTMVSnapshotIf getPartitionSnapshot(String partitionName, MTMVRefreshContext context, | ||
| Optional<MvccSnapshot> snapshot) throws AnalysisException; | ||
|
|
||
| abstract MTMVSnapshotIf getTableSnapshot(MTMVRefreshContext context, Optional<MvccSnapshot> snapshot) | ||
| throws AnalysisException; | ||
|
|
||
| abstract boolean isPartitionColumnAllowNull(); | ||
|
|
||
| @Override | ||
| public void beforeMTMVRefresh(MTMV mtmv) throws DdlException { | ||
| Env.getCurrentEnv().getRefreshManager() | ||
| .refreshTable(hmsTable.getCatalog().getName(), hmsTable.getDbName(), hmsTable.getName(), true); | ||
| } | ||
| } | ||
This file contains 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
135 changes: 135 additions & 0 deletions
135
fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveDlaTable.java
This file contains 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,135 @@ | ||
| // 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. | ||
|
|
||
| package org.apache.doris.datasource.hive; | ||
|
|
||
| import org.apache.doris.catalog.Column; | ||
| import org.apache.doris.catalog.Env; | ||
| import org.apache.doris.catalog.PartitionItem; | ||
| import org.apache.doris.catalog.PartitionType; | ||
| import org.apache.doris.common.AnalysisException; | ||
| import org.apache.doris.datasource.mvcc.MvccSnapshot; | ||
| import org.apache.doris.mtmv.MTMVMaxTimestampSnapshot; | ||
| import org.apache.doris.mtmv.MTMVRefreshContext; | ||
| import org.apache.doris.mtmv.MTMVSnapshotIf; | ||
| import org.apache.doris.mtmv.MTMVTimestampSnapshot; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
| import org.apache.commons.collections.CollectionUtils; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
|
|
||
| public class HiveDlaTable extends HMSDlaTable { | ||
|
|
||
| public HiveDlaTable(HMSExternalTable table) { | ||
| super(table); | ||
| } | ||
|
|
||
| @Override | ||
| public PartitionType getPartitionType(Optional<MvccSnapshot> snapshot) { | ||
| return hmsTable.getPartitionType(); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<String> getPartitionColumnNames(Optional<MvccSnapshot> snapshot) { | ||
| return hmsTable.getPartitionColumnNames(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Column> getPartitionColumns(Optional<MvccSnapshot> snapshot) { | ||
| return hmsTable.getPartitionColumns(); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, PartitionItem> getAndCopyPartitionItems(Optional<MvccSnapshot> snapshot) { | ||
| return hmsTable.getNameToPartitionItems(); | ||
| } | ||
|
|
||
| @Override | ||
| public MTMVSnapshotIf getPartitionSnapshot(String partitionName, MTMVRefreshContext context, | ||
| Optional<MvccSnapshot> snapshot) throws AnalysisException { | ||
| HiveMetaStoreCache cache = Env.getCurrentEnv().getExtMetaCacheMgr() | ||
| .getMetaStoreCache((HMSExternalCatalog) hmsTable.getCatalog()); | ||
| HiveMetaStoreCache.HivePartitionValues hivePartitionValues = cache.getPartitionValues( | ||
| hmsTable.getDbName(), hmsTable.getName(), hmsTable.getPartitionColumnTypes()); | ||
| Long partitionId = getPartitionIdByNameOrAnalysisException(partitionName, hivePartitionValues); | ||
| HivePartition hivePartition = getHivePartitionByIdOrAnalysisException(partitionId, | ||
| hivePartitionValues, cache); | ||
| return new MTMVTimestampSnapshot(hivePartition.getLastModifiedTime()); | ||
| } | ||
|
|
||
| @Override | ||
| public MTMVSnapshotIf getTableSnapshot(MTMVRefreshContext context, Optional<MvccSnapshot> snapshot) | ||
| throws AnalysisException { | ||
| if (hmsTable.getPartitionType() == PartitionType.UNPARTITIONED) { | ||
| return new MTMVMaxTimestampSnapshot(hmsTable.getName(), hmsTable.getLastDdlTime()); | ||
| } | ||
| HivePartition maxPartition = null; | ||
| long maxVersionTime = 0L; | ||
| long visibleVersionTime; | ||
| HiveMetaStoreCache cache = Env.getCurrentEnv().getExtMetaCacheMgr() | ||
| .getMetaStoreCache((HMSExternalCatalog) hmsTable.getCatalog()); | ||
| HiveMetaStoreCache.HivePartitionValues hivePartitionValues = cache.getPartitionValues( | ||
| hmsTable.getDbName(), hmsTable.getName(), hmsTable.getPartitionColumnTypes()); | ||
| List<HivePartition> partitionList = cache.getAllPartitionsWithCache(hmsTable.getDbName(), hmsTable.getName(), | ||
| Lists.newArrayList(hivePartitionValues.getPartitionValuesMap().values())); | ||
| if (CollectionUtils.isEmpty(partitionList)) { | ||
| throw new AnalysisException("partitionList is empty, table name: " + hmsTable.getName()); | ||
| } | ||
| for (HivePartition hivePartition : partitionList) { | ||
| visibleVersionTime = hivePartition.getLastModifiedTime(); | ||
| if (visibleVersionTime > maxVersionTime) { | ||
| maxVersionTime = visibleVersionTime; | ||
| maxPartition = hivePartition; | ||
| } | ||
| } | ||
| return new MTMVMaxTimestampSnapshot(maxPartition.getPartitionName( | ||
| hmsTable.getPartitionColumns()), maxVersionTime); | ||
| } | ||
|
|
||
| private Long getPartitionIdByNameOrAnalysisException(String partitionName, | ||
| HiveMetaStoreCache.HivePartitionValues hivePartitionValues) | ||
| throws AnalysisException { | ||
| Long partitionId = hivePartitionValues.getPartitionNameToIdMap().get(partitionName); | ||
| if (partitionId == null) { | ||
| throw new AnalysisException("can not find partition: " + partitionName); | ||
| } | ||
| return partitionId; | ||
| } | ||
|
|
||
| private HivePartition getHivePartitionByIdOrAnalysisException(Long partitionId, | ||
| HiveMetaStoreCache.HivePartitionValues hivePartitionValues, | ||
| HiveMetaStoreCache cache) throws AnalysisException { | ||
| List<String> partitionValues = hivePartitionValues.getPartitionValuesMap().get(partitionId); | ||
| if (CollectionUtils.isEmpty(partitionValues)) { | ||
| throw new AnalysisException("can not find partitionValues: " + partitionId); | ||
| } | ||
| HivePartition partition = cache.getHivePartition(hmsTable.getDbName(), hmsTable.getName(), partitionValues); | ||
| if (partition == null) { | ||
| throw new AnalysisException("can not find partition: " + partitionId); | ||
| } | ||
| return partition; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isPartitionColumnAllowNull() { | ||
| return true; | ||
| } | ||
| } |
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add some comment for this class.
eg, why need this class, what's is purpose?