zddr commented on code in PR #44726:
URL: https://github.com/apache/doris/pull/44726#discussion_r1875797728
##########
fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelatedTableIf.java:
##########
@@ -115,4 +115,11 @@ default boolean needAutoRefresh() {
* @return
*/
boolean isPartitionColumnAllowNull();
+
+ /**
+ * If the table is supported as related table.
+ * For example, an Iceberg table may become unsupported after partition
revolution.
+ * @return
+ */
+ boolean isSupportedRelatedTable();
Review Comment:
not need this method?If some scenarios are not supported, simply return
Unpartitioned in the getPartitionType method
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergPartitionInfo.java:
##########
@@ -0,0 +1,71 @@
+// 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.iceberg;
+
+import org.apache.doris.catalog.PartitionItem;
+
+import com.google.common.collect.Maps;
+
+import java.util.Map;
+import java.util.Set;
+
+public class IcebergPartitionInfo {
+ private final Map<String, PartitionItem> nameToPartitionItem;
+ private final Map<String, IcebergPartition> nameToIcebergPartition;
+ private final Map<String, Set<String>> nameToIcebergPartitionNames;
+
+ public IcebergPartitionInfo() {
+ this.nameToPartitionItem = Maps.newHashMap();
+ this.nameToIcebergPartition = Maps.newHashMap();
+ this.nameToIcebergPartitionNames = Maps.newHashMap();
+ }
+
+ public IcebergPartitionInfo(Map<String, PartitionItem> nameToPartitionItem,
+ Map<String, IcebergPartition>
nameToIcebergPartition,
+ Map<String, Set<String>>
nameToIcebergPartitionNames) {
+ this.nameToPartitionItem = nameToPartitionItem;
+ this.nameToIcebergPartition = nameToIcebergPartition;
+ this.nameToIcebergPartitionNames = nameToIcebergPartitionNames;
+ }
+
+ public Map<String, PartitionItem> getNameToPartitionItem() {
+ return nameToPartitionItem;
+ }
+
+ public Map<String, IcebergPartition> getNameToIcebergPartition() {
+ return nameToIcebergPartition;
+ }
+
+ public long getLatestSnapshotId(String partitionName) {
+ Set<String> icebergPartitionNames =
nameToIcebergPartitionNames.get(partitionName);
+ if (icebergPartitionNames == null) {
Review Comment:
What situation would be null
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalTable.java:
##########
@@ -90,4 +199,318 @@ public long fetchRowCount() {
public Table getIcebergTable() {
return IcebergUtils.getIcebergTable(getCatalog(), getDbName(),
getName());
}
+
+ @Override
+ public void beforeMTMVRefresh(MTMV mtmv) throws DdlException {
+ Env.getCurrentEnv().getRefreshManager()
+ .refreshTable(getCatalog().getName(), getDbName(), getName(),
true);
+ }
+
+ @Override
+ public Map<String, PartitionItem>
getAndCopyPartitionItems(Optional<MvccSnapshot> snapshot) {
+ return
Maps.newHashMap(getPartitionInfoFromCache().getNameToPartitionItem());
+ }
+
+ private IcebergPartitionInfo getPartitionInfoFromCache() {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ if (!schemaCacheValue.isPresent()) {
+ return new IcebergPartitionInfo();
+ }
+ return ((IcebergSchemaCacheValue)
schemaCacheValue.get()).getPartitionInfo();
+ }
+
+ @Override
+ public PartitionType getPartitionType(Optional<MvccSnapshot> snapshot) {
+ makeSureInitialized();
+ return isSupportedRelatedTable() ? PartitionType.RANGE :
PartitionType.UNPARTITIONED;
+ }
+
+ @Override
+ public Set<String> getPartitionColumnNames(Optional<MvccSnapshot>
snapshot) throws DdlException {
+ return
getPartitionColumnsFromCache().stream().map(Column::getName).collect(Collectors.toSet());
+ }
+
+ @Override
+ public List<Column> getPartitionColumns(Optional<MvccSnapshot> snapshot) {
+ return getPartitionColumnsFromCache();
+ }
+
+ private List<Column> getPartitionColumnsFromCache() {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ return schemaCacheValue
+ .map(cacheValue -> ((IcebergSchemaCacheValue)
cacheValue).getPartitionColumns())
+ .orElseGet(Lists::newArrayList);
+ }
+
+ @Override
+ public MTMVSnapshotIf getPartitionSnapshot(String partitionName,
MTMVRefreshContext context,
+ Optional<MvccSnapshot>
snapshot) throws AnalysisException {
+ long latestSnapshotId =
getPartitionInfoFromCache().getLatestSnapshotId(partitionName);
+ if (latestSnapshotId <= 0) {
+ throw new AnalysisException("can not find partition: " +
partitionName);
+ }
+ return new MTMVVersionSnapshot(latestSnapshotId);
+ }
+
+ @Override
+ public MTMVSnapshotIf getTableSnapshot(MTMVRefreshContext context,
Optional<MvccSnapshot> snapshot)
+ throws AnalysisException {
+ return new MTMVVersionSnapshot(getLatestSnapshotIdFromCache());
+ }
+
+ public long getLatestSnapshotIdFromCache() throws AnalysisException {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ if (!schemaCacheValue.isPresent()) {
+ throw new AnalysisException("Can't find schema cache of table " +
name);
+ }
+ return ((IcebergSchemaCacheValue)
schemaCacheValue.get()).getSnapshotId();
+ }
+
+ @Override
+ public boolean isPartitionColumnAllowNull() {
+ if (partitionColumns == null || partitionColumns.size() != 1) {
+ return false;
+ }
+ return partitionColumns.get(0).isAllowNull();
Review Comment:
Just return true directly?
##########
fe/fe-core/src/main/java/org/apache/doris/job/extensions/mtmv/MTMVTask.java:
##########
@@ -176,6 +177,11 @@ public void run() throws JobException {
this.relation = MTMVPlanUtil.generateMTMVRelation(mtmv, ctx);
beforeMTMVRefresh();
if (mtmv.getMvPartitionInfo().getPartitionType() !=
MTMVPartitionType.SELF_MANAGE) {
+ MTMVRelatedTableIf relatedTable =
mtmv.getMvPartitionInfo().getRelatedTable();
Review Comment:
The verification here should be the case of partition column or partition
type transformation
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalTable.java:
##########
@@ -90,4 +199,318 @@ public long fetchRowCount() {
public Table getIcebergTable() {
return IcebergUtils.getIcebergTable(getCatalog(), getDbName(),
getName());
}
+
+ @Override
+ public void beforeMTMVRefresh(MTMV mtmv) throws DdlException {
+ Env.getCurrentEnv().getRefreshManager()
+ .refreshTable(getCatalog().getName(), getDbName(), getName(),
true);
+ }
+
+ @Override
+ public Map<String, PartitionItem>
getAndCopyPartitionItems(Optional<MvccSnapshot> snapshot) {
+ return
Maps.newHashMap(getPartitionInfoFromCache().getNameToPartitionItem());
+ }
+
+ private IcebergPartitionInfo getPartitionInfoFromCache() {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ if (!schemaCacheValue.isPresent()) {
+ return new IcebergPartitionInfo();
+ }
+ return ((IcebergSchemaCacheValue)
schemaCacheValue.get()).getPartitionInfo();
+ }
+
+ @Override
+ public PartitionType getPartitionType(Optional<MvccSnapshot> snapshot) {
+ makeSureInitialized();
+ return isSupportedRelatedTable() ? PartitionType.RANGE :
PartitionType.UNPARTITIONED;
+ }
+
+ @Override
+ public Set<String> getPartitionColumnNames(Optional<MvccSnapshot>
snapshot) throws DdlException {
+ return
getPartitionColumnsFromCache().stream().map(Column::getName).collect(Collectors.toSet());
+ }
+
+ @Override
+ public List<Column> getPartitionColumns(Optional<MvccSnapshot> snapshot) {
+ return getPartitionColumnsFromCache();
+ }
+
+ private List<Column> getPartitionColumnsFromCache() {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ return schemaCacheValue
+ .map(cacheValue -> ((IcebergSchemaCacheValue)
cacheValue).getPartitionColumns())
+ .orElseGet(Lists::newArrayList);
+ }
+
+ @Override
+ public MTMVSnapshotIf getPartitionSnapshot(String partitionName,
MTMVRefreshContext context,
+ Optional<MvccSnapshot>
snapshot) throws AnalysisException {
+ long latestSnapshotId =
getPartitionInfoFromCache().getLatestSnapshotId(partitionName);
+ if (latestSnapshotId <= 0) {
+ throw new AnalysisException("can not find partition: " +
partitionName);
+ }
+ return new MTMVVersionSnapshot(latestSnapshotId);
+ }
+
+ @Override
+ public MTMVSnapshotIf getTableSnapshot(MTMVRefreshContext context,
Optional<MvccSnapshot> snapshot)
+ throws AnalysisException {
+ return new MTMVVersionSnapshot(getLatestSnapshotIdFromCache());
+ }
+
+ public long getLatestSnapshotIdFromCache() throws AnalysisException {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ if (!schemaCacheValue.isPresent()) {
+ throw new AnalysisException("Can't find schema cache of table " +
name);
+ }
+ return ((IcebergSchemaCacheValue)
schemaCacheValue.get()).getSnapshotId();
+ }
+
+ @Override
+ public boolean isPartitionColumnAllowNull() {
+ if (partitionColumns == null || partitionColumns.size() != 1) {
+ return false;
+ }
+ return partitionColumns.get(0).isAllowNull();
Review Comment:
And the case needs to ensure that Iceberg writes null values, and the
materialized view can refresh to null data normally
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalTable.java:
##########
@@ -90,4 +199,318 @@ public long fetchRowCount() {
public Table getIcebergTable() {
return IcebergUtils.getIcebergTable(getCatalog(), getDbName(),
getName());
}
+
+ @Override
+ public void beforeMTMVRefresh(MTMV mtmv) throws DdlException {
+ Env.getCurrentEnv().getRefreshManager()
+ .refreshTable(getCatalog().getName(), getDbName(), getName(),
true);
+ }
+
+ @Override
+ public Map<String, PartitionItem>
getAndCopyPartitionItems(Optional<MvccSnapshot> snapshot) {
+ return
Maps.newHashMap(getPartitionInfoFromCache().getNameToPartitionItem());
+ }
+
+ private IcebergPartitionInfo getPartitionInfoFromCache() {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ if (!schemaCacheValue.isPresent()) {
+ return new IcebergPartitionInfo();
+ }
+ return ((IcebergSchemaCacheValue)
schemaCacheValue.get()).getPartitionInfo();
+ }
+
+ @Override
+ public PartitionType getPartitionType(Optional<MvccSnapshot> snapshot) {
+ makeSureInitialized();
+ return isSupportedRelatedTable() ? PartitionType.RANGE :
PartitionType.UNPARTITIONED;
+ }
+
+ @Override
+ public Set<String> getPartitionColumnNames(Optional<MvccSnapshot>
snapshot) throws DdlException {
+ return
getPartitionColumnsFromCache().stream().map(Column::getName).collect(Collectors.toSet());
+ }
+
+ @Override
+ public List<Column> getPartitionColumns(Optional<MvccSnapshot> snapshot) {
+ return getPartitionColumnsFromCache();
+ }
+
+ private List<Column> getPartitionColumnsFromCache() {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ return schemaCacheValue
+ .map(cacheValue -> ((IcebergSchemaCacheValue)
cacheValue).getPartitionColumns())
+ .orElseGet(Lists::newArrayList);
+ }
+
+ @Override
+ public MTMVSnapshotIf getPartitionSnapshot(String partitionName,
MTMVRefreshContext context,
+ Optional<MvccSnapshot>
snapshot) throws AnalysisException {
+ long latestSnapshotId =
getPartitionInfoFromCache().getLatestSnapshotId(partitionName);
+ if (latestSnapshotId <= 0) {
+ throw new AnalysisException("can not find partition: " +
partitionName);
+ }
+ return new MTMVVersionSnapshot(latestSnapshotId);
+ }
+
+ @Override
+ public MTMVSnapshotIf getTableSnapshot(MTMVRefreshContext context,
Optional<MvccSnapshot> snapshot)
+ throws AnalysisException {
+ return new MTMVVersionSnapshot(getLatestSnapshotIdFromCache());
+ }
+
+ public long getLatestSnapshotIdFromCache() throws AnalysisException {
+ makeSureInitialized();
+ Optional<SchemaCacheValue> schemaCacheValue = getSchemaCacheValue();
+ if (!schemaCacheValue.isPresent()) {
+ throw new AnalysisException("Can't find schema cache of table " +
name);
+ }
+ return ((IcebergSchemaCacheValue)
schemaCacheValue.get()).getSnapshotId();
+ }
+
+ @Override
+ public boolean isPartitionColumnAllowNull() {
+ if (partitionColumns == null || partitionColumns.size() != 1) {
+ return false;
+ }
+ return partitionColumns.get(0).isAllowNull();
+ }
+
+ @Override
+ public boolean isSupportedRelatedTable() {
+ Set<String> allFields = Sets.newHashSet();
Review Comment:
why not use cache?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
