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 223ee85 [Bug]Fix bug that PriorityQueue will throw
IllegalArgumentException (#3393)
223ee85 is described below
commit 223ee856364629479e3a29d51fd8bd84206e98fe
Author: WingC <1018957...@qq.com>
AuthorDate: Sat Apr 25 02:49:34 2020 -0500
[Bug]Fix bug that PriorityQueue will throw IllegalArgumentException (#3393)
---
.../org/apache/doris/consistency/ConsistencyChecker.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/fe/src/main/java/org/apache/doris/consistency/ConsistencyChecker.java
b/fe/src/main/java/org/apache/doris/consistency/ConsistencyChecker.java
index 7c05155..d3ca741 100644
--- a/fe/src/main/java/org/apache/doris/consistency/ConsistencyChecker.java
+++ b/fe/src/main/java/org/apache/doris/consistency/ConsistencyChecker.java
@@ -226,7 +226,7 @@ public class ConsistencyChecker extends MasterDaemon {
}
}
- /*
+ /**
* choose a tablet to check it's consistency
* we use a priority queue to sort db/table/partition/index/tablet by
'lastCheckTime'.
* chose a tablet which has the smallest 'lastCheckTime'.
@@ -242,7 +242,7 @@ public class ConsistencyChecker extends MasterDaemon {
if (dbIds.isEmpty()) {
return chosenTablets;
}
- Queue<MetaObject> dbQueue = new
PriorityQueue<MetaObject>(dbIds.size(), COMPARATOR);
+ Queue<MetaObject> dbQueue = new PriorityQueue<>(Math.max(dbIds.size(),
1), COMPARATOR);
for (Long dbId : dbIds) {
if (dbId == 0L) {
// skip 'information_schema' database
@@ -264,7 +264,7 @@ public class ConsistencyChecker extends MasterDaemon {
try {
// sort tables
List<Table> tables = db.getTables();
- Queue<MetaObject> tableQueue = new
PriorityQueue<MetaObject>(tables.size(), COMPARATOR);
+ Queue<MetaObject> tableQueue = new
PriorityQueue<>(Math.max(tables.size(), 1), COMPARATOR);
for (Table table : tables) {
if (table.getType() != TableType.OLAP) {
continue;
@@ -277,7 +277,7 @@ public class ConsistencyChecker extends MasterDaemon {
// sort partitions
Queue<MetaObject> partitionQueue =
- new
PriorityQueue<>(table.getAllPartitions().size(), COMPARATOR);
+ new
PriorityQueue<>(Math.max(table.getAllPartitions().size(), 1), COMPARATOR);
for (Partition partition : table.getPartitions()) {
// check partition's replication num. if 1
replication. skip
if
(table.getPartitionInfo().getReplicationNum(partition.getId()) == (short) 1) {
@@ -299,14 +299,14 @@ public class ConsistencyChecker extends MasterDaemon {
// sort materializedIndices
List<MaterializedIndex> visibleIndexs =
partition.getMaterializedIndices(IndexExtState.VISIBLE);
- Queue<MetaObject> indexQueue = new
PriorityQueue<MetaObject>(visibleIndexs.size(), COMPARATOR);
+ Queue<MetaObject> indexQueue = new
PriorityQueue<>(Math.max(visibleIndexs.size(), 1), COMPARATOR);
indexQueue.addAll(visibleIndexs);
while ((chosenOne = indexQueue.poll()) != null) {
MaterializedIndex index = (MaterializedIndex)
chosenOne;
// sort tablets
- Queue<MetaObject> tabletQueue = new
PriorityQueue<MetaObject>(index.getTablets().size(), COMPARATOR);
+ Queue<MetaObject> tabletQueue = new
PriorityQueue<>(Math.max(index.getTablets().size(), 1), COMPARATOR);
tabletQueue.addAll(index.getTablets());
while ((chosenOne = tabletQueue.poll()) !=
null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
