fix comments

Signed-off-by: shuming.li <ming.moriarty@gmail.com>

Author: LiShuMing

fe/fe-core/src/main/java/com/starrocks/alter/AlterMVJobExecutor.java

@@ -151,7 +151,7 @@ public Void visitModifyTablePropertiesClause(ModifyTablePropertiesClause modifyT
             partitionRefreshStrategy = PropertyAnalyzer.analyzePartitionRefreshStrategy(properties);
         }
         String mvRefreshMode = null;
-        if (properties.containsKey(PropertyAnalyzer.PROPERTIES_REFRESH_MODE)) {
+        if (properties.containsKey(PropertyAnalyzer.PROPERTIES_MV_REFRESH_MODE)) {
             mvRefreshMode = PropertyAnalyzer.analyzeRefreshMode(properties);
         }
         String resourceGroup = null;
@@ -346,9 +346,9 @@ public Void visitModifyTablePropertiesClause(ModifyTablePropertiesClause modifyT
             curProp.put(PropertyAnalyzer.PROPERTIES_PARTITION_REFRESH_STRATEGY, String.valueOf(partitionRefreshStrategy));
             materializedView.getTableProperty().setPartitionRefreshStrategy(partitionRefreshStrategy);
             isChanged = true;
-        } else if (propClone.containsKey(PropertyAnalyzer.PROPERTIES_REFRESH_MODE) &&
+        } else if (propClone.containsKey(PropertyAnalyzer.PROPERTIES_MV_REFRESH_MODE) &&
                 !materializedView.getTableProperty().getMvRefreshMode().equals(mvRefreshMode)) {
-            curProp.put(PropertyAnalyzer.PROPERTIES_REFRESH_MODE, String.valueOf(mvRefreshMode));
+            curProp.put(PropertyAnalyzer.PROPERTIES_MV_REFRESH_MODE, String.valueOf(mvRefreshMode));
             materializedView.getTableProperty().setMvRefreshMode(mvRefreshMode);
             isChanged = true;
         } else if (propClone.containsKey(PropertyAnalyzer.PROPERTIES_AUTO_REFRESH_PARTITIONS_LIMIT) &&

fe/fe-core/src/main/java/com/starrocks/catalog/MaterializedView.java

@@ -549,9 +549,6 @@ public String toString() {
     // This is the original user's view define SQL which can be used to generate ast key in text based rewrite.
     @SerializedName(value = "originalViewDefineSql")
     private String originalViewDefineSql;
-    // This is the rewritten view define SQL which is used to generate IVM refresh tasks.
-    @SerializedName(value = "ivmDefineSql")
-    private String ivmDefineSql;
     // This is the original database name when the mv is created.
     private String originalDBName;
     // Deprecated field which is used to store single partition ref table exprs of the mv in old version.
@@ -740,15 +737,6 @@ public void setOriginalViewDefineSql(String originalViewDefineSql) {
         this.originalViewDefineSql = originalViewDefineSql;
     }
 
-    public String setIvmDefineSql(String ivmDefineSql) {
-        this.ivmDefineSql = ivmDefineSql;
-        return this.ivmDefineSql;
-    }
-
-    public String getIvmDefineSql() {
-        return ivmDefineSql;
-    }
-
     public String getOriginalDBName() {
         return originalDBName;
     }
@@ -762,11 +750,7 @@ public String getTaskDefinition() {
     }
 
     public String getIVMTaskDefinition() {
-        String ivmDefineSql = getIvmDefineSql();
-        if (Strings.isNullOrEmpty(ivmDefineSql)) {
-            ivmDefineSql = getViewDefineSql();
-        }
-        return String.format("INSERT INTO `%s` %s", getName(), ivmDefineSql);
+        return String.format("INSERT INTO `%s` %s", getName(), getViewDefineSql());
     }
 
     /**

fe/fe-core/src/main/java/com/starrocks/catalog/TableProperty.java

@@ -570,7 +570,7 @@ public TableProperty buildMVPartitionRefreshStrategy() {
     }
 
     public TableProperty buildMVRefreshMode() {
-        mvRefreshMode = properties.getOrDefault(PropertyAnalyzer.PROPERTIES_REFRESH_MODE,
+        mvRefreshMode = properties.getOrDefault(PropertyAnalyzer.PROPERTIES_MV_REFRESH_MODE,
                 Config.default_mv_refresh_mode);
         return this;
     }

fe/fe-core/src/main/java/com/starrocks/common/util/PropertyAnalyzer.java

@@ -215,7 +215,7 @@ public class PropertyAnalyzer {
     public static final String PROPERTIES_PARTITION_REFRESH_NUMBER = "partition_refresh_number";
     public static final String PROPERTIES_EXCLUDED_TRIGGER_TABLES = "excluded_trigger_tables";
     public static final String PROPERTIES_EXCLUDED_REFRESH_TABLES = "excluded_refresh_tables";
-    public static final String PROPERTIES_REFRESH_MODE = "refresh_mode";
+    public static final String PROPERTIES_MV_REFRESH_MODE = "refresh_mode";
 
     // 1. `force_external_table_query_rewrite` is used to control whether external table can be rewritten or not
     // 2. external table can be rewritten by default if not specific.
@@ -680,8 +680,8 @@ public static String analyzePartitionRefreshStrategy(Map<String, String> propert
 
     public static String analyzeRefreshMode(Map<String, String> properties) {
         String refreshMode = null;
-        if (properties != null && properties.containsKey(PROPERTIES_REFRESH_MODE)) {
-            refreshMode = properties.get(PROPERTIES_REFRESH_MODE);
+        if (properties != null && properties.containsKey(PROPERTIES_MV_REFRESH_MODE)) {
+            refreshMode = properties.get(PROPERTIES_MV_REFRESH_MODE);
             try {
                 MaterializedView.RefreshMode.valueOf(refreshMode.toUpperCase());
             } catch (IllegalArgumentException e) {
@@ -691,7 +691,7 @@ public static String analyzeRefreshMode(Map<String, String> properties) {
                                 .collect(Collectors.joining(", ")) +
                         " are supported.");
             }
-            properties.remove(PROPERTIES_REFRESH_MODE);
+            properties.remove(PROPERTIES_MV_REFRESH_MODE);
         }
         return refreshMode;
     }
@@ -1762,10 +1762,10 @@ public static void analyzeMVProperties(Database db,
                 materializedView.getTableProperty().setPartitionRefreshStrategy(strategy);
             }
             // refresh mode
-            if (properties.containsKey(PropertyAnalyzer.PROPERTIES_REFRESH_MODE)) {
+            if (properties.containsKey(PropertyAnalyzer.PROPERTIES_MV_REFRESH_MODE)) {
                 String mvRefreshMode = PropertyAnalyzer.analyzeRefreshMode(properties);
                 materializedView.getTableProperty().getProperties()
-                        .put(PropertyAnalyzer.PROPERTIES_REFRESH_MODE, mvRefreshMode);
+                        .put(PropertyAnalyzer.PROPERTIES_MV_REFRESH_MODE, mvRefreshMode);
                 materializedView.getTableProperty().setMvRefreshMode(mvRefreshMode);
             }
             // exclude trigger tables

fe/fe-core/src/main/java/com/starrocks/connector/iceberg/IcebergMetadata.java

@@ -1008,13 +1008,16 @@ private Iterator<FileScanTask> buildFileScanTaskIterator(IcebergTable icebergTab
                     incrementalAppendScan.fromSnapshotExclusive(tvrVersionRange.from.getVersion());
             incrementalAppendScan =
                     incrementalAppendScan.toSnapshot(snapshotId);
-            scan = incrementalAppendScan;
+            scan = incrementalAppendScan
+                    .metricsReporter(metricsReporter)
+                    .planWith(jobPlanningExecutor);
         } else {
             scan = icebergCatalog.getTableScan(nativeTbl, scanContext)
                     .useSnapshot(snapshotId)
                     .metricsReporter(metricsReporter)
                     .planWith(jobPlanningExecutor);
         }
+
         if (enableCollectColumnStats) {
             scan = (Scan) scan.includeColumnStats();
         }

fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java

@@ -3064,7 +3064,6 @@ public void createMaterializedView(CreateMaterializedViewStatement stmt)
         materializedView.setViewDefineSql(stmt.getInlineViewDef());
         materializedView.setSimpleDefineSql(stmt.getSimpleViewDef());
         materializedView.setOriginalViewDefineSql(stmt.getOriginalViewDefineSql());
-        materializedView.setIvmDefineSql(stmt.getIvmViewDef());
         materializedView.setOriginalDBName(stmt.getOriginalDBName());
         // set partitionRefTableExprs
         if (stmt.getPartitionRefTableExpr() != null) {

fe/fe-core/src/main/java/com/starrocks/sql/ast/CreateMaterializedViewStatement.java

@@ -76,8 +76,6 @@ public class CreateMaterializedViewStatement extends DdlStmt {
     private String simpleViewDef;
     // original view definition of the mv query without any rewrite which can be used in text based rewrite.
     private String originalViewDefineSql;
-    // IVM view definition of the mv which is rewritten by IVMAnalyzer#rewrite
-    private String ivmViewDef;
     // current db name when creating mv
     private String originalDBName;
     private List<BaseTableInfo> baseTableInfos;
@@ -263,14 +261,6 @@ public void setOriginalViewDefineSql(String originalViewDefineSql) {
         this.originalViewDefineSql = originalViewDefineSql;
     }
 
-    public String getIvmViewDef() {
-        return ivmViewDef;
-    }
-
-    public void setIvmViewDef(String ivmViewDef) {
-        this.ivmViewDef = ivmViewDef;
-    }
-
     public int getQueryStartIndex() {
         return queryStartIndex;
     }