diff --git a/be/src/exec/hdfs_scanner.cpp b/be/src/exec/hdfs_scanner.cpp index b8f91b66f58a7..4863dde554dc8 100644 --- a/be/src/exec/hdfs_scanner.cpp +++ b/be/src/exec/hdfs_scanner.cpp @@ -594,29 +594,6 @@ void HdfsScannerContext::append_or_update_column_to_chunk(ChunkPtr* chunk, size_ ck->set_num_rows(row_count); } -void HdfsScannerContext::append_or_update_extended_column_to_chunk(ChunkPtr* chunk, size_t row_count) { - if (extended_columns.size() == 0) return; - ChunkPtr& ck = (*chunk); - for (size_t i = 0; i < extended_columns.size(); i++) { - SlotDescriptor* slot_desc = extended_columns[i].slot_desc; - DCHECK(extended_values[i]->is_constant()); - auto* const_column = ColumnHelper::as_raw_column(extended_values[i]); - ColumnPtr data_column = const_column->data_column(); - auto chunk_extended_column = ColumnHelper::create_column(slot_desc->type(), slot_desc->is_nullable()); - - if (row_count > 0) { - if (data_column->is_nullable()) { - chunk_extended_column->append_nulls(1); - } else { - chunk_extended_column->append(*data_column, 0, 1); - } - chunk_extended_column->assign(row_count, 0); - } - ck->append_or_update_column(std::move(chunk_extended_column), slot_desc->id()); - } - ck->set_num_rows(row_count); -} - bool HdfsScannerContext::can_use_dict_filter_on_slot(SlotDescriptor* slot) const { if (!slot->type().is_string_type()) { return false; diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/plan/IcebergEqualityDeletePlanTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/plan/IcebergEqualityDeletePlanTest.java index 66a8eaf055ae1..aaba77eae0290 100644 --- a/fe/fe-core/src/test/java/com/starrocks/sql/plan/IcebergEqualityDeletePlanTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/sql/plan/IcebergEqualityDeletePlanTest.java @@ -16,10 +16,7 @@ import com.google.common.collect.Lists; import com.starrocks.catalog.Database; -<<<<<<< HEAD import com.starrocks.common.ExceptionChecker; -======= ->>>>>>> 162e88d6db (eq-delete) import com.starrocks.common.Pair; import com.starrocks.connector.exception.StarRocksConnectorException; import com.starrocks.connector.iceberg.IcebergMetadata; @@ -490,7 +487,6 @@ org.apache.iceberg.Table getTable(String dbName, String tableName) throws StarRo () -> UtFrameUtils.getFragmentPlan(starRocksAssert.getCtx(), sql)); starRocksAssert.getCtx().getSessionVariable().setEnableReadIcebergEqDeleteWithPartitionEvolution(true); - String plan = UtFrameUtils.getFragmentPlan(starRocksAssert.getCtx(), sql); assertContains(plan, "4:Project\n" + " | : 2: k2\n" + @@ -553,8 +549,4 @@ org.apache.iceberg.Table getTable(String dbName, String tableName) throws StarRo } } } -<<<<<<< HEAD -======= - ->>>>>>> 162e88d6db (eq-delete) }