fix conflict

Signed-off-by: yanz <[email protected]>
StarRocks · Nov 22, 2024 · b247521 · b247521
1 parent 50c0e26
commit b247521
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/connector/iceberg/IcebergPartitionUtils.java b/fe/fe-core/src/main/java/com/starrocks/connector/iceberg/IcebergPartitionUtils.java
@@ -221,11 +221,7 @@ public static Expr toTransformExpr(IcebergTable table,
         PartitionField partitionField = table.getPartitionFiled(partitionColumn);
         if (partitionField == null) {
             throw new StarRocksConnectorException("Partition column %s not found in table %s.%s.%s",
-<<<<<<< HEAD
-                    partitionColumn, table.getCatalogName(), table.getRemoteDbName(), table.getRemoteTableName());
-=======
-                    partitionColName, table.getCatalogName(), table.getCatalogDBName(), table.getCatalogTableName());
->>>>>>> 89be537d51 ([Refactor] add `getCatalogDbName` and `getCatalogTableName` in `Table` (#53072))
+                    partitionColumn, table.getCatalogName(), table.getCatalogDBName(), table.getCatalogTableName());
         }
         IcebergPartitionTransform transform = IcebergPartitionTransform.fromString(partitionField.transform().toString());
         if (transform == IcebergPartitionTransform.IDENTITY) {

diff --git a/...rrocks/sql/optimizer/rule/transformation/materialization/compensation/OptCompensator.java b/...rrocks/sql/optimizer/rule/transformation/materialization/compensation/OptCompensator.java
@@ -136,15 +136,9 @@ private LogicalScanOperator getExternalTableCompensatePlan(LogicalScanOperator s
             // refresh iceberg table's metadata
             IcebergTable cachedIcebergTable = (IcebergTable) refBaseTable;
             String catalogName = cachedIcebergTable.getCatalogName();
-<<<<<<< HEAD
-            String dbName = cachedIcebergTable.getRemoteDbName();
-            TableName tableName = new TableName(catalogName, dbName, cachedIcebergTable.getName());
-            Table currentTable = GlobalStateMgr.getCurrentState().getMetadataMgr().getTable(tableName).orElse(null);
-=======
             String dbName = cachedIcebergTable.getCatalogDBName();
             TableName refTableName = new TableName(catalogName, dbName, cachedIcebergTable.getName());
             Table currentTable = GlobalStateMgr.getCurrentState().getMetadataMgr().getTable(refTableName).orElse(null);
->>>>>>> 89be537d51 ([Refactor] add `getCatalogDbName` and `getCatalogTableName` in `Table` (#53072))
             if (currentTable == null) {
                 return null;
             }