database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Bug] Fix bug that ConcurrentModificationException thrown

Browse Source 
Fix: #3588
When truncate the table, a ConcurrentModificationException may thrown when there
are temp partitions in this table.

NOTICE(#3622 ):
This is a "revert of revert pull request".
This pr is mainly used to synthesize the PRs whose commits were
scattered and submitted due to the wrong merge method into a complete single commit.
This commit is contained in:
Mingyu Chen
2020-05-18 14:51:25 +08:00
committed by GitHub
parent 8398fa9b75
commit fa27012da2
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/src/main/java/org/apache/doris/catalog/Catalog.java
View File

@ -4521,7 +4521,7 @@ public class Catalog {
for (Partition partition : olapTable.getAllPartitions()) {
long partitionId = partition.getId();
DataProperty dataProperty = partitionInfo.getDataProperty(partition.getId());
Preconditions.checkNotNull(dataProperty);
Preconditions.checkNotNull(dataProperty, partition.getName() + ", pId:" + partitionId + ", db: " + dbId + ", tbl: " + tableId);
if (dataProperty.getStorageMedium() == TStorageMedium.SSD
&& dataProperty.getCooldownTimeMs() < currentTimeMs) {
// expire. change to HDD.

3
fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java
View File

@ -76,6 +76,9 @@ public class PartitionInfo implements Writable {
}
public short getReplicationNum(long partitionId) {
if (!idToReplicationNum.containsKey(partitionId)) {
LOG.debug("failed to get replica num for partition: {}", partitionId);
}
return idToReplicationNum.get(partitionId);
}

5
fe/src/main/java/org/apache/doris/catalog/TempPartitions.java
View File

@ -26,6 +26,7 @@ import org.apache.doris.persist.gson.GsonUtils;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gson.annotations.SerializedName;
import java.io.DataInput;
@ -33,6 +34,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Set;
// This class saved all temp partitions of a table.
// temp partition is used to implement the overwrite load.
@ -108,7 +110,8 @@ public class TempPartitions implements Writable, GsonPostProcessable {
// drop all temp partitions
public void dropAll() {
for (String partName : nameToPartition.keySet()) {
Set<String> partNames = Sets.newHashSet(nameToPartition.keySet());
for (String partName : partNames) {
dropPartition(partName, true);
}
}

2
fe/src/main/java/org/apache/doris/cluster/Cluster.java
View File

@ -17,12 +17,12 @@
package org.apache.doris.cluster;
import com.google.common.base.Preconditions;
import org.apache.doris.catalog.InfoSchemaDb;
import org.apache.doris.common.io.Text;
import org.apache.doris.common.io.Writable;
import org.apache.doris.persist.LinkDbInfo;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;