This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new d028a72 Revert "[Bug] Fix bug that ConcurrentModificationException
thrown " (#3612)
d028a72 is described below
commit d028a728e4309e43d4c4d9323f44648454b9b18d
Author: Mingyu Chen <[email protected]>
AuthorDate: Mon May 18 13:10:33 2020 +0800
Revert "[Bug] Fix bug that ConcurrentModificationException thrown " (#3612)
This revert is used to correct the mess of the commit
timeline caused by the wrong merge method.
---
fe/src/main/java/org/apache/doris/catalog/Catalog.java | 2 +-
fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java | 3 ---
fe/src/main/java/org/apache/doris/catalog/TempPartitions.java | 5 +----
fe/src/main/java/org/apache/doris/cluster/Cluster.java | 2 +-
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/fe/src/main/java/org/apache/doris/catalog/Catalog.java
b/fe/src/main/java/org/apache/doris/catalog/Catalog.java
index ed0564c..b68c0d9 100755
--- a/fe/src/main/java/org/apache/doris/catalog/Catalog.java
+++ b/fe/src/main/java/org/apache/doris/catalog/Catalog.java
@@ -4516,7 +4516,7 @@ public class Catalog {
for (Partition partition : olapTable.getAllPartitions()) {
long partitionId = partition.getId();
DataProperty dataProperty =
partitionInfo.getDataProperty(partition.getId());
- Preconditions.checkNotNull(dataProperty,
partition.getName() + ", pId:" + partitionId + ", db: " + dbId + ", tbl: " +
tableId);
+ Preconditions.checkNotNull(dataProperty);
if (dataProperty.getStorageMedium() ==
TStorageMedium.SSD
&& dataProperty.getCooldownTimeMs() <
currentTimeMs) {
// expire. change to HDD.
diff --git a/fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java
b/fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java
index f41f595..ee7d6f2 100644
--- a/fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java
+++ b/fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java
@@ -76,9 +76,6 @@ 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);
}
diff --git a/fe/src/main/java/org/apache/doris/catalog/TempPartitions.java
b/fe/src/main/java/org/apache/doris/catalog/TempPartitions.java
index 4a1c59d..a84b8d5 100644
--- a/fe/src/main/java/org/apache/doris/catalog/TempPartitions.java
+++ b/fe/src/main/java/org/apache/doris/catalog/TempPartitions.java
@@ -26,7 +26,6 @@ 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;
@@ -34,7 +33,6 @@ 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.
@@ -110,8 +108,7 @@ public class TempPartitions implements Writable,
GsonPostProcessable {
// drop all temp partitions
public void dropAll() {
- Set<String> partNames = Sets.newHashSet(nameToPartition.keySet());
- for (String partName : partNames) {
+ for (String partName : nameToPartition.keySet()) {
dropPartition(partName, true);
}
}
diff --git a/fe/src/main/java/org/apache/doris/cluster/Cluster.java
b/fe/src/main/java/org/apache/doris/cluster/Cluster.java
index 4754dc0..bc378ac 100644
--- a/fe/src/main/java/org/apache/doris/cluster/Cluster.java
+++ b/fe/src/main/java/org/apache/doris/cluster/Cluster.java
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
