This is an automated email from the ASF dual-hosted git repository. dataroaring pushed a commit to branch branch-4.0-preview in repository https://gitbox.apache.org/repos/asf/doris.git
commit 74c24a2066d470699be8554c08c17768f269ebb0 Author: Luwei <[email protected]> AuthorDate: Wed Apr 17 19:48:35 2024 +0800 [fix](merge-cloud) fix truncate table transaction exceeding limit (#33780) --- .../org/apache/doris/cloud/datasource/CloudInternalCatalog.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java index 42ca4bfe99c..a46fddb2a4b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java @@ -67,10 +67,12 @@ import doris.segment_v2.SegmentV2; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.stream.Collectors; public class CloudInternalCatalog extends InternalCatalog { private static final Logger LOG = LogManager.getLogger(CloudInternalCatalog.class); @@ -616,7 +618,7 @@ public class CloudInternalCatalog extends InternalCatalog { long tableId = -1; List<Long> partitionIds = Lists.newArrayList(); - List<Long> indexIds = Lists.newArrayList(); + Set<Long> indexIds = new HashSet<>(); for (Partition partition : partitions) { for (MaterializedIndex index : partition.getMaterializedIndices(IndexExtState.ALL)) { indexIds.add(index.getId()); @@ -637,7 +639,8 @@ public class CloudInternalCatalog extends InternalCatalog { break; } try { - dropCloudPartition(partition0.getDbId(), tableId, partitionIds, indexIds); + dropCloudPartition(partition0.getDbId(), tableId, partitionIds, + indexIds.stream().collect(Collectors.toList())); } catch (Exception e) { LOG.warn("failed to drop partition {} of table {}, try cnt {}, execption {}", partitionIds, tableId, tryCnt, e); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
