This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new ea67e3a6b47 branch-2.1: [enhance](mtmv)MTMV interface optimization
(#43329)
ea67e3a6b47 is described below
commit ea67e3a6b474d9f10ead11fd2ea1d6c99e32a187
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Nov 10 10:07:35 2024 +0800
branch-2.1: [enhance](mtmv)MTMV interface optimization (#43329)
Cherry-picked from #43086
Co-authored-by: zhangdong <493738...@qq.com>
---
.../java/org/apache/doris/catalog/OlapTable.java | 5 ---
.../doris/datasource/hive/HMSExternalTable.java | 22 +++++++------
.../apache/doris/job/extensions/mtmv/MTMVTask.java | 18 +++++------
.../org/apache/doris/mtmv/MTMVBaseTableIf.java | 36 ++++++++++++++++++++++
.../org/apache/doris/mtmv/MTMVRelatedTableIf.java | 16 ++++++++--
5 files changed, 70 insertions(+), 27 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index 123412827a1..37e5f265bd6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -3075,11 +3075,6 @@ public class OlapTable extends Table implements
MTMVRelatedTableIf {
return new MTMVVersionSnapshot(visibleVersion, id);
}
- @Override
- public boolean needAutoRefresh() {
- return true;
- }
-
@Override
public boolean isPartitionColumnAllowNull() {
return true;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java
index 06f1635e2fb..aaa59d44144 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java
@@ -20,6 +20,7 @@ package org.apache.doris.datasource.hive;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.ListPartitionItem;
+import org.apache.doris.catalog.MTMV;
import org.apache.doris.catalog.PartitionItem;
import org.apache.doris.catalog.PartitionType;
import org.apache.doris.catalog.PrimitiveType;
@@ -27,10 +28,12 @@ import org.apache.doris.catalog.ScalarType;
import org.apache.doris.catalog.Type;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
+import org.apache.doris.common.DdlException;
import org.apache.doris.datasource.ExternalTable;
import org.apache.doris.datasource.SchemaCacheValue;
import org.apache.doris.datasource.hudi.HudiUtils;
import org.apache.doris.datasource.iceberg.IcebergUtils;
+import org.apache.doris.mtmv.MTMVBaseTableIf;
import org.apache.doris.mtmv.MTMVMaxTimestampSnapshot;
import org.apache.doris.mtmv.MTMVRefreshContext;
import org.apache.doris.mtmv.MTMVRelatedTableIf;
@@ -87,7 +90,7 @@ import java.util.stream.Collectors;
/**
* Hive metastore external table.
*/
-public class HMSExternalTable extends ExternalTable implements
MTMVRelatedTableIf {
+public class HMSExternalTable extends ExternalTable implements
MTMVRelatedTableIf, MTMVBaseTableIf {
private static final Logger LOG =
LogManager.getLogger(HMSExternalTable.class);
public static final Set<String> SUPPORTED_HIVE_FILE_FORMATS;
@@ -587,9 +590,9 @@ public class HMSExternalTable extends ExternalTable
implements MTMVRelatedTableI
case ICEBERG:
if (GlobalVariable.enableFetchIcebergStats) {
return StatisticsUtil.getIcebergColumnStats(colName,
-
Env.getCurrentEnv().getExtMetaCacheMgr().getIcebergMetadataCache().getIcebergTable(
- catalog, dbName, name
- ));
+
Env.getCurrentEnv().getExtMetaCacheMgr().getIcebergMetadataCache().getIcebergTable(
+ catalog, dbName, name
+ ));
} else {
break;
}
@@ -821,11 +824,6 @@ public class HMSExternalTable extends ExternalTable
implements MTMVRelatedTableI
return partition;
}
- @Override
- public boolean needAutoRefresh() {
- return true;
- }
-
@Override
public boolean isPartitionColumnAllowNull() {
return true;
@@ -960,4 +958,10 @@ public class HMSExternalTable extends ExternalTable
implements MTMVRelatedTableI
makeSureInitialized();
return !isView() && remoteTable.getPartitionKeysSize() > 0;
}
+
+ @Override
+ public void beforeMTMVRefresh(MTMV mtmv) throws DdlException {
+ Env.getCurrentEnv().getRefreshManager()
+ .refreshTable(getCatalog().getName(), getDbName(), getName(),
true);
+ }
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/job/extensions/mtmv/MTMVTask.java
b/fe/fe-core/src/main/java/org/apache/doris/job/extensions/mtmv/MTMVTask.java
index 966291bd7aa..3d1d001d61a 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/job/extensions/mtmv/MTMVTask.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/job/extensions/mtmv/MTMVTask.java
@@ -28,11 +28,11 @@ import org.apache.doris.common.FeConstants;
import org.apache.doris.common.UserException;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.common.util.TimeUtils;
-import org.apache.doris.datasource.hive.HMSExternalTable;
import org.apache.doris.job.common.TaskStatus;
import org.apache.doris.job.exception.JobException;
import org.apache.doris.job.task.AbstractTask;
import org.apache.doris.mtmv.BaseTableInfo;
+import org.apache.doris.mtmv.MTMVBaseTableIf;
import org.apache.doris.mtmv.MTMVPartitionInfo.MTMVPartitionType;
import org.apache.doris.mtmv.MTMVPartitionUtil;
import org.apache.doris.mtmv.MTMVPlanUtil;
@@ -171,9 +171,7 @@ public class MTMVTask extends AbstractTask {
// Every time a task is run, the relation is regenerated because
baseTables and baseViews may change,
// such as deleting a table and creating a view with the same name
this.relation = MTMVPlanUtil.generateMTMVRelation(mtmv, ctx);
- // Now, the MTMV first ensures consistency with the data in the
cache.
- // To be completely consistent with hive, you need to manually
refresh the cache
- refreshHmsTable();
+ beforeMTMVRefresh();
if (mtmv.getMvPartitionInfo().getPartitionType() !=
MTMVPartitionType.SELF_MANAGE) {
MTMVPartitionUtil.alignMvPartition(mtmv);
}
@@ -278,20 +276,18 @@ public class MTMVTask extends AbstractTask {
}
/**
- * Before obtaining information from hmsTable, refresh to ensure that the
data is up-to-date
+ * Do something before refreshing, such as clearing the cache of the
external table
*
* @throws AnalysisException
* @throws DdlException
*/
- private void refreshHmsTable() throws AnalysisException, DdlException {
+ private void beforeMTMVRefresh() throws AnalysisException, DdlException {
for (BaseTableInfo tableInfo : relation.getBaseTablesOneLevel()) {
TableIf tableIf = MTMVUtil.getTable(tableInfo);
- if (tableIf instanceof HMSExternalTable) {
- HMSExternalTable hmsTable = (HMSExternalTable) tableIf;
- Env.getCurrentEnv().getRefreshManager()
- .refreshTable(hmsTable.getCatalog().getName(),
hmsTable.getDbName(), hmsTable.getName(), true);
+ if (tableIf instanceof MTMVBaseTableIf) {
+ MTMVBaseTableIf baseTableIf = (MTMVBaseTableIf) tableIf;
+ baseTableIf.beforeMTMVRefresh(mtmv);
}
-
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVBaseTableIf.java
b/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVBaseTableIf.java
new file mode 100644
index 00000000000..e5086cbb6c9
--- /dev/null
+++ b/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVBaseTableIf.java
@@ -0,0 +1,36 @@
+// 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.mtmv;
+
+import org.apache.doris.catalog.MTMV;
+import org.apache.doris.common.DdlException;
+
+/**
+ * The base table of the materialized view should implement this interface and
do some things when necessary,
+ * but it is currently not mandatory
+ */
+public interface MTMVBaseTableIf {
+
+ /**
+ * Do something before refreshing the MTMV
+ *
+ * @param mtmv
+ * @throws DdlException
+ */
+ void beforeMTMVRefresh(MTMV mtmv) throws DdlException;
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelatedTableIf.java
b/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelatedTableIf.java
index 516eb904e58..c40485db223 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelatedTableIf.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelatedTableIf.java
@@ -35,8 +35,10 @@ public interface MTMVRelatedTableIf extends TableIf {
/**
* Get all partitions of the table
+ * Note: This method is called every time there is a refresh and
transparent rewrite,
+ * so if this method is slow, it will significantly reduce query
performance
*
- * @return partitionId->PartitionItem
+ * @return partitionName->PartitionItem
*/
Map<String, PartitionItem> getAndCopyPartitionItems();
@@ -64,8 +66,12 @@ public interface MTMVRelatedTableIf extends TableIf {
/**
* getPartitionSnapshot
+ * It is best to use the version. If there is no version, use the last
update time
+ * If snapshots have already been obtained in bulk in the context,
+ * the results should be obtained directly from the context
*
* @param partitionName
+ * @param context
* @return partition snapshot at current time
* @throws AnalysisException
*/
@@ -73,7 +79,11 @@ public interface MTMVRelatedTableIf extends TableIf {
/**
* getTableSnapshot
+ * It is best to use the version. If there is no version, use the last
update time
+ * If snapshots have already been obtained in bulk in the context,
+ * the results should be obtained directly from the context
*
+ * @param context
* @return table snapshot at current time
* @throws AnalysisException
*/
@@ -85,7 +95,9 @@ public interface MTMVRelatedTableIf extends TableIf {
* @return If return false,The method of comparing whether to synchronize
will directly return true,
* otherwise the snapshot information will be compared
*/
- boolean needAutoRefresh();
+ default boolean needAutoRefresh() {
+ return true;
+ }
/**
* if allow partition column `isAllowNull`
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
