You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/07/05 03:05:45 UTC
[doris] branch master updated: [format](*): using guava package header (#10325)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new e444ac7a87 [format](*): using guava package header (#10325)
e444ac7a87 is described below
commit e444ac7a87e6251f2ea65d4b8645ef716a16d26f
Author: jakevin <30...@users.noreply.github.com>
AuthorDate: Tue Jul 5 11:05:39 2022 +0800
[format](*): using guava package header (#10325)
---
.../apache/doris/analysis/AddColumnsClause.java | 4 +-
.../apache/doris/catalog/ListPartitionItem.java | 48 +++++++++++-----------
.../apache/doris/catalog/ReplicaAllocation.java | 8 ++--
.../common/profile/MultiProfileTreeBuilder.java | 18 ++++----
.../doris/common/profile/PlanTreeBuilder.java | 2 +-
.../apache/doris/httpv2/rest/SetConfigAction.java | 8 ++--
.../apache/doris/journal/bdbje/BDBDebugger.java | 41 ++++++++++--------
.../doris/nereids/analyzer/UnboundRelation.java | 2 +-
.../glue/translator/PlanTranslatorContext.java | 2 +-
.../apache/doris/nereids/memo/GroupExpression.java | 2 +-
.../operators/plans/physical/PhysicalOlapScan.java | 2 +-
.../apache/doris/persist/ColocatePersistInfo.java | 33 ++++++++-------
.../doris/persist/meta/PersistMetaModules.java | 2 +-
.../org/apache/doris/analysis/CaseExprTest.java | 2 +-
.../org/apache/doris/analysis/InPredicateTest.java | 2 +-
.../org/apache/doris/analysis/UpdateStmtTest.java | 2 +-
.../doris/catalog/DynamicPartitionTableTest.java | 2 +-
.../common/util/DynamicPartitionUtilTest.java | 2 +-
.../java/org/apache/doris/ldap/LdapClientTest.java | 2 +-
.../doris/load/update/UpdateManagerTest.java | 2 +-
.../doris/load/update/UpdateStmtExecutorTest.java | 2 +-
.../BatchRemoveTransactionOperationTest.java | 2 +-
.../apache/doris/planner/UpdatePlannerTest.java | 2 +-
.../rewrite/ExtractCommonFactorsRuleTest.java | 2 +-
24 files changed, 104 insertions(+), 90 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java
index 8d38ec18a8..3180331faa 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java
@@ -29,7 +29,9 @@ import com.google.common.collect.Lists;
import java.util.List;
import java.util.Map;
-// add some columns to one index.
+/**
+ * add some columns to one index.
+ */
public class AddColumnsClause extends AlterTableClause {
private List<ColumnDef> columnDefs;
private String rollupName;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ListPartitionItem.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ListPartitionItem.java
index 5395d83fda..0f7d69fc69 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ListPartitionItem.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ListPartitionItem.java
@@ -17,7 +17,7 @@
package org.apache.doris.catalog;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import java.io.DataInput;
import java.io.DataOutput;
@@ -26,18 +26,39 @@ import java.util.ArrayList;
import java.util.List;
public class ListPartitionItem extends PartitionItem {
- private List<PartitionKey> partitionKeys;
-
public static ListPartitionItem DUMMY_ITEM = new ListPartitionItem(Lists.newArrayList());
+ private List<PartitionKey> partitionKeys;
+
public ListPartitionItem(List<PartitionKey> partitionKeys) {
this.partitionKeys = partitionKeys;
}
+ public static ListPartitionItem read(DataInput input) throws IOException {
+ int counter = input.readInt();
+ List<PartitionKey> partitionKeys = new ArrayList<>();
+ for (int i = 0; i < counter; i++) {
+ PartitionKey partitionKey = PartitionKey.read(input);
+ partitionKeys.add(partitionKey);
+ }
+ return new ListPartitionItem(partitionKeys);
+ }
+
public List<PartitionKey> getItems() {
return partitionKeys;
}
+ @Override
+ public PartitionItem getIntersect(PartitionItem newItem) {
+ List<PartitionKey> newKeys = newItem.getItems();
+ for (PartitionKey newKey : newKeys) {
+ if (partitionKeys.contains(newKey)) {
+ return newItem;
+ }
+ }
+ return null;
+ }
+
@Override
public void write(DataOutput out) throws IOException {
out.writeInt(partitionKeys.size());
@@ -46,16 +67,6 @@ public class ListPartitionItem extends PartitionItem {
}
}
- public static ListPartitionItem read(DataInput input) throws IOException {
- int counter = input.readInt();
- List<PartitionKey> partitionKeys = new ArrayList<>();
- for (int i = 0; i < counter; i++) {
- PartitionKey partitionKey = PartitionKey.read(input);
- partitionKeys.add(partitionKey);
- }
- return new ListPartitionItem(partitionKeys);
- }
-
@Override
public int compareTo(PartitionItem other) {
int thisKeyLen = this.partitionKeys.size();
@@ -70,17 +81,6 @@ public class ListPartitionItem extends PartitionItem {
return Integer.compare(thisKeyLen, otherKeyLen);
}
- @Override
- public PartitionItem getIntersect(PartitionItem newItem) {
- List<PartitionKey> newKeys = newItem.getItems();
- for (PartitionKey newKey : newKeys) {
- if (partitionKeys.contains(newKey)) {
- return newItem;
- }
- }
- return null;
- }
-
@Override
public boolean equals(Object obj) {
if (this == obj) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ReplicaAllocation.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ReplicaAllocation.java
index 80ad94349a..e81864402f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ReplicaAllocation.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ReplicaAllocation.java
@@ -23,8 +23,8 @@ import org.apache.doris.common.util.PropertyAnalyzer;
import org.apache.doris.persist.gson.GsonUtils;
import org.apache.doris.resource.Tag;
-import com.clearspring.analytics.util.Lists;
import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.annotations.SerializedName;
@@ -35,8 +35,10 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-// ReplicaAllocation is used to describe the distribution of replicas of a tablet.
-// By default, 3 replicas of a tablet are distributed on 3 BE nodes with Tag "default".
+/**
+ * ReplicaAllocation is used to describe the distribution of replicas of a tablet.
+ * By default, 3 replicas of a tablet are distributed on 3 BE nodes with Tag "default".
+ */
public class ReplicaAllocation implements Writable {
public static final ReplicaAllocation DEFAULT_ALLOCATION;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java
index a8d800e4cf..4e150ae6a0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java
@@ -23,7 +23,7 @@ import org.apache.doris.common.UserException;
import org.apache.doris.common.util.Counter;
import org.apache.doris.common.util.RuntimeProfile;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.commons.lang3.tuple.Triple;
@@ -34,15 +34,17 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-// MultiProfileTreeBuilder saves a set of ProfileTreeBuilder.
-// For a query profile, there is usually only one ExecutionProfile node.
-// For a load job profile, it may produce multiple subtasks, so there may be multiple ExecutionProfile nodes.
-//
-// Each ExecutionProfile node corresponds to a ProfileTreeBuilder
+
+/**
+ * MultiProfileTreeBuilder saves a set of ProfileTreeBuilder.
+ * For a query profile, there is usually only one ExecutionProfile node.
+ * For a load job profile, it may produce multiple subtasks, so there may be multiple ExecutionProfile nodes.
+ * <p>
+ * Each ExecutionProfile node corresponds to a ProfileTreeBuilder
+ */
public class MultiProfileTreeBuilder {
- private static final Set<String> PROFILE_ROOT_NAMES;
public static final String PROFILE_NAME_EXECUTION = "Execution Profile";
-
+ private static final Set<String> PROFILE_ROOT_NAMES;
private static final String EXECUTION_ID_PATTERN_STR = "^Execution Profile (.*)";
private static final Pattern EXECUTION_ID_PATTERN;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/profile/PlanTreeBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/common/profile/PlanTreeBuilder.java
index f388af4225..beecbd6263 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/profile/PlanTreeBuilder.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/profile/PlanTreeBuilder.java
@@ -25,7 +25,7 @@ import org.apache.doris.planner.PlanNode;
import org.apache.doris.planner.PlanNodeId;
import org.apache.doris.thrift.TExplainLevel;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import java.util.List;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java
index c579df68cd..8c3ffecc48 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/SetConfigAction.java
@@ -23,8 +23,8 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
-import com.clearspring.analytics.util.Lists;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.annotations.SerializedName;
import lombok.AllArgsConstructor;
@@ -43,10 +43,10 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-/*
- * used to set fe config
+/**
+ * used to set fe config.
* eg:
- * fe_host:http_port/api/_set_config?config_key1=config_value1&config_key2=config_value2&...
+ * fe_host:http_port/api/_set_config?config_key1=config_value1&config_key2=config_value2&...
*/
@RestController
public class SetConfigAction extends RestBaseController {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBDebugger.java b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBDebugger.java
index 313f4becb3..bcde003e99 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBDebugger.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBDebugger.java
@@ -26,8 +26,8 @@ import org.apache.doris.meta.MetaContext;
import org.apache.doris.qe.QeService;
import org.apache.doris.service.ExecuteEnv;
-import com.clearspring.analytics.util.Lists;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
import com.sleepycat.bind.tuple.TupleBinding;
import com.sleepycat.je.Cursor;
import com.sleepycat.je.Database;
@@ -56,17 +56,15 @@ import java.util.List;
*/
public class BDBDebugger {
private static final Logger LOG = LogManager.getLogger(BDBDebugger.class);
-
- private static class SingletonHolder {
- private static final BDBDebugger INSTANCE = new BDBDebugger();
- }
+ private BDBDebugEnv debugEnv;
public static BDBDebugger get() {
return SingletonHolder.INSTANCE;
}
- private BDBDebugEnv debugEnv;
-
+ /**
+ * Start in BDB Debug mode.
+ */
public void startDebugMode(String dorisHomeDir) {
try {
initDebugEnv();
@@ -89,8 +87,8 @@ public class BDBDebugger {
httpServer.start();
// MySQl server
- QeService qeService = new QeService(Config.query_port,
- Config.mysql_service_nio_enabled, ExecuteEnv.getInstance().getScheduler());
+ QeService qeService = new QeService(Config.query_port, Config.mysql_service_nio_enabled,
+ ExecuteEnv.getInstance().getScheduler());
qeService.start();
ThreadPoolManager.registerAllThreadPoolMetric();
@@ -101,8 +99,16 @@ public class BDBDebugger {
debugEnv.init();
}
+ public BDBDebugEnv getEnv() {
+ return debugEnv;
+ }
+
+ private static class SingletonHolder {
+ private static final BDBDebugger INSTANCE = new BDBDebugger();
+ }
+
/**
- * A wrapper class of the BDBJE environment, used to obtain information in bdbje
+ * A wrapper class of the BDBJE environment, used to obtain information in bdbje.
*/
public static class BDBDebugEnv {
// the dir of bdbje data dir
@@ -141,7 +147,9 @@ public class BDBDebugger {
return db.count();
}
- // get list of journal id (key) in specified database
+ /**
+ * get list of journal id (key) in specified database.
+ */
public List<Long> getJournalIds(String dbName) throws BDBDebugException {
DatabaseConfig dbConfig = new DatabaseConfig();
dbConfig.setAllowCreate(false);
@@ -171,7 +179,9 @@ public class BDBDebugger {
return journalIds;
}
- // get the journal entity of the specified journal id.
+ /**
+ * get the journal entity of the specified journal id.
+ */
public JournalEntityWrapper getJournalEntity(String dbName, Long journalId) {
// meta version
// TODO(cmy): currently the journal data will be read with VERSION_CURRENT
@@ -225,10 +235,9 @@ public class BDBDebugger {
}
}
- public BDBDebugEnv getEnv() {
- return debugEnv;
- }
-
+ /**
+ * BDBDebugException.
+ */
public static class BDBDebugException extends Exception {
public BDBDebugException(String msg) {
super(msg);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundRelation.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundRelation.java
index 1a5f485c41..c3280286a4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundRelation.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/analyzer/UnboundRelation.java
@@ -28,7 +28,7 @@ import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.util.Utils;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PlanTranslatorContext.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PlanTranslatorContext.java
index 6002c07bf1..afde344669 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PlanTranslatorContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PlanTranslatorContext.java
@@ -32,7 +32,7 @@ import org.apache.doris.planner.PlanFragmentId;
import org.apache.doris.planner.PlanNodeId;
import org.apache.doris.planner.ScanNode;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java
index 19c70fa550..bb7da075cd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupExpression.java
@@ -23,8 +23,8 @@ import org.apache.doris.nereids.properties.PhysicalProperties;
import org.apache.doris.nereids.rules.Rule;
import org.apache.doris.nereids.rules.RuleType;
-import com.clearspring.analytics.util.Lists;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.BitSet;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/operators/plans/physical/PhysicalOlapScan.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/operators/plans/physical/PhysicalOlapScan.java
index 89835e3511..f177da5359 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/operators/plans/physical/PhysicalOlapScan.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/operators/plans/physical/PhysicalOlapScan.java
@@ -25,8 +25,8 @@ import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.PlanOperatorVisitor;
import org.apache.doris.nereids.trees.plans.physical.PhysicalLeafPlan;
-import com.clearspring.analytics.util.Lists;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/ColocatePersistInfo.java b/fe/fe-core/src/main/java/org/apache/doris/persist/ColocatePersistInfo.java
index f9e68eeac7..408839c616 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/ColocatePersistInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/ColocatePersistInfo.java
@@ -23,7 +23,7 @@ import org.apache.doris.common.io.Writable;
import org.apache.doris.persist.gson.GsonUtils;
import org.apache.doris.resource.Tag;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.annotations.SerializedName;
@@ -36,7 +36,7 @@ import java.util.Map;
import java.util.Objects;
/**
- * PersistInfo for ColocateTableIndex
+ * PersistInfo for ColocateTableIndex.
*/
public class ColocatePersistInfo implements Writable {
@SerializedName(value = "groupId")
@@ -50,13 +50,19 @@ public class ColocatePersistInfo implements Writable {
}
- public static ColocatePersistInfo createForAddTable(GroupId groupId,
- long tableId, Map<Tag, List<List<Long>>> backendsPerBucketSeq) {
+ private ColocatePersistInfo(GroupId groupId, long tableId, Map<Tag, List<List<Long>>> backendsPerBucketSeq) {
+ this.groupId = groupId;
+ this.tableId = tableId;
+ this.backendsPerBucketSeq = backendsPerBucketSeq;
+ }
+
+ public static ColocatePersistInfo createForAddTable(GroupId groupId, long tableId,
+ Map<Tag, List<List<Long>>> backendsPerBucketSeq) {
return new ColocatePersistInfo(groupId, tableId, backendsPerBucketSeq);
}
public static ColocatePersistInfo createForBackendsPerBucketSeq(GroupId groupId,
- Map<Tag, List<List<Long>>> backendsPerBucketSeq) {
+ Map<Tag, List<List<Long>>> backendsPerBucketSeq) {
return new ColocatePersistInfo(groupId, -1L, backendsPerBucketSeq);
}
@@ -72,10 +78,9 @@ public class ColocatePersistInfo implements Writable {
return new ColocatePersistInfo(new GroupId(-1, -1), tableId, Maps.newHashMap());
}
- private ColocatePersistInfo(GroupId groupId, long tableId, Map<Tag, List<List<Long>>> backendsPerBucketSeq) {
- this.groupId = groupId;
- this.tableId = tableId;
- this.backendsPerBucketSeq = backendsPerBucketSeq;
+ public static ColocatePersistInfo read(DataInput in) throws IOException {
+ String json = Text.readString(in);
+ return GsonUtils.GSON.fromJson(json, ColocatePersistInfo.class);
}
public long getTableId() {
@@ -90,11 +95,6 @@ public class ColocatePersistInfo implements Writable {
return backendsPerBucketSeq;
}
- public static ColocatePersistInfo read(DataInput in) throws IOException {
- String json = Text.readString(in);
- return GsonUtils.GSON.fromJson(json, ColocatePersistInfo.class);
- }
-
@Override
public void write(DataOutput out) throws IOException {
Text.writeString(out, GsonUtils.GSON.toJson(this));
@@ -136,9 +136,8 @@ public class ColocatePersistInfo implements Writable {
ColocatePersistInfo info = (ColocatePersistInfo) obj;
- return tableId == info.tableId
- && groupId.equals(info.groupId)
- && backendsPerBucketSeq.equals(info.backendsPerBucketSeq);
+ return tableId == info.tableId && groupId.equals(info.groupId) && backendsPerBucketSeq.equals(
+ info.backendsPerBucketSeq);
}
@Override
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/meta/PersistMetaModules.java b/fe/fe-core/src/main/java/org/apache/doris/persist/meta/PersistMetaModules.java
index 74c56c4d69..164c44567e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/meta/PersistMetaModules.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/meta/PersistMetaModules.java
@@ -17,8 +17,8 @@
package org.apache.doris.persist.meta;
-import com.clearspring.analytics.util.Lists;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.List;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CaseExprTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CaseExprTest.java
index 72bf214c36..86d91c8976 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CaseExprTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CaseExprTest.java
@@ -20,7 +20,7 @@ package org.apache.doris.analysis;
import org.apache.doris.catalog.PrimitiveType;
import org.apache.doris.catalog.ScalarType;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import mockit.Expectations;
import mockit.Injectable;
import org.junit.Assert;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/InPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/InPredicateTest.java
index d2f32e37c9..9942301c37 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/InPredicateTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/InPredicateTest.java
@@ -20,7 +20,7 @@ package org.apache.doris.analysis;
import org.apache.doris.catalog.Type;
import org.apache.doris.common.AnalysisException;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import org.junit.Assert;
import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/UpdateStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/UpdateStmtTest.java
index 47da2382c0..164ad7477a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/UpdateStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/UpdateStmtTest.java
@@ -19,7 +19,7 @@ package org.apache.doris.analysis;
import org.apache.doris.common.UserException;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import mockit.Expectations;
import mockit.Injectable;
import org.junit.Assert;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java
index 9f12eb7f10..9d95f30680 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java
@@ -30,7 +30,7 @@ import org.apache.doris.qe.ConnectContext;
import org.apache.doris.thrift.TStorageMedium;
import org.apache.doris.utframe.UtFrameUtils;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/util/DynamicPartitionUtilTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/util/DynamicPartitionUtilTest.java
index 39ac9122fa..8a6bab6aa0 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/common/util/DynamicPartitionUtilTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/DynamicPartitionUtilTest.java
@@ -23,7 +23,7 @@ import org.apache.doris.catalog.RangePartitionInfo;
import org.apache.doris.catalog.Type;
import org.apache.doris.common.jmockit.Deencapsulation;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.junit.Assert;
import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java
index 8367e0e2e5..ac07321fe4 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java
@@ -22,7 +22,7 @@ import org.apache.doris.common.LdapConfig;
import org.apache.doris.mysql.privilege.PaloAuth;
import org.apache.doris.persist.LdapInfo;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import mockit.Delegate;
import mockit.Expectations;
import mockit.Mocked;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateManagerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateManagerTest.java
index 67f1b22f94..5d48093ad4 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateManagerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateManagerTest.java
@@ -22,7 +22,7 @@ import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.jmockit.Deencapsulation;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import mockit.Expectations;
import mockit.Injectable;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateStmtExecutorTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateStmtExecutorTest.java
index 72f1fa26a5..f8a3a8b7ac 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateStmtExecutorTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/update/UpdateStmtExecutorTest.java
@@ -34,7 +34,7 @@ import org.apache.doris.qe.Coordinator;
import org.apache.doris.thrift.TUniqueId;
import org.apache.doris.transaction.GlobalTransactionMgr;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import mockit.Expectations;
import mockit.Injectable;
import mockit.Mocked;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchRemoveTransactionOperationTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchRemoveTransactionOperationTest.java
index 3f80366baf..d20989c1d4 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchRemoveTransactionOperationTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchRemoveTransactionOperationTest.java
@@ -20,7 +20,7 @@ package org.apache.doris.persist;
import org.apache.doris.common.FeConstants;
import org.apache.doris.meta.MetaContext;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.junit.Assert;
import org.junit.Test;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/UpdatePlannerTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/UpdatePlannerTest.java
index 35ab8d3eac..ee79d80c7c 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/UpdatePlannerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/UpdatePlannerTest.java
@@ -35,7 +35,7 @@ import org.apache.doris.common.IdGenerator;
import org.apache.doris.common.jmockit.Deencapsulation;
import org.apache.doris.load.update.UpdatePlanner;
-import com.clearspring.analytics.util.Lists;
+import com.google.common.collect.Lists;
import mockit.Expectations;
import mockit.Injectable;
import org.junit.Assert;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleTest.java
index 430d45e1d3..35a4cc12fa 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleTest.java
@@ -26,8 +26,8 @@ import org.apache.doris.analysis.SlotRef;
import org.apache.doris.analysis.TableName;
import org.apache.doris.common.jmockit.Deencapsulation;
-import com.clearspring.analytics.util.Lists;
import com.google.common.collect.BoundType;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Range;
import com.google.common.collect.RangeSet;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org