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/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 3f202477ec4 [minor](import) modify some imports (#28206)
3f202477ec4 is described below
commit 3f202477ec4da962745b4ef4871143e0f08354c2
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Tue Dec 12 11:39:54 2023 +0800
[minor](import) modify some imports (#28206)
---
fe/check/checkstyle/import-control.xml | 3 +++
.../src/main/java/org/apache/doris/catalog/StructField.java | 7 +++----
.../src/main/java/org/apache/doris/nereids/CascadesContext.java | 2 +-
.../nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java | 2 +-
.../nereids/trees/expressions/functions/scalar/EncryptKeyRef.java | 2 +-
.../doris/nereids/trees/expressions/functions/scalar/Password.java | 2 +-
.../doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java | 2 +-
.../org/apache/doris/planner/external/iceberg/IcebergScanNode.java | 2 +-
.../org/apache/doris/planner/external/paimon/PaimonScanNode.java | 2 +-
.../src/test/java/org/apache/doris/binlog/BinlogManagerTest.java | 2 +-
.../nereids/jobs/joinorder/hypergraph/GraphSimplifierTest.java | 2 +-
.../test/java/org/apache/doris/statistics/AnalysisManagerTest.java | 6 ++----
.../org/apache/doris/statistics/StatisticsAutoCollectorTest.java | 2 +-
13 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/fe/check/checkstyle/import-control.xml
b/fe/check/checkstyle/import-control.xml
index c65299d3c3f..d96f2e9692f 100644
--- a/fe/check/checkstyle/import-control.xml
+++ b/fe/check/checkstyle/import-control.xml
@@ -23,6 +23,9 @@ under the License.
"https://checkstyle.org/dtds/import_control_1_4.dtd";>
<import-control pkg="org.apache.doris" strategyOnMismatch="allowed">
+ <disallow pkg="avro.shaded.com.google.common.base.Preconditions" />
+ <disallow pkg="avro.shaded.com.google.common.collect.ImmutableList" />
+ <disallow pkg="cfjd.com.google.common.collect.ImmutableList" />
<disallow pkg="com.clearspring.analytics.util" />
<disallow pkg="com.alibaba.google" />
<disallow pkg="org.apache.hadoop.util.Lists" />
diff --git
a/fe/fe-common/src/main/java/org/apache/doris/catalog/StructField.java
b/fe/fe-common/src/main/java/org/apache/doris/catalog/StructField.java
index 5a2b3f221ea..0dde5658576 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/StructField.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/StructField.java
@@ -23,7 +23,6 @@ import org.apache.doris.thrift.TTypeNode;
import com.google.common.base.Strings;
import com.google.gson.annotations.SerializedName;
-import org.apache.commons.lang3.StringUtils;
public class StructField {
@SerializedName(value = "name")
@@ -97,7 +96,7 @@ public class StructField {
if (type != null) {
sb.append(":").append(typeSql);
}
- if (StringUtils.isNotBlank(comment)) {
+ if (!Strings.isNullOrEmpty(comment)) {
sb.append(String.format(" COMMENT '%s'", comment));
}
return sb.toString();
@@ -117,7 +116,7 @@ public class StructField {
typeStr = typeStr.substring(lpad);
sb.append(":").append(typeStr);
}
- if (StringUtils.isNotBlank(comment)) {
+ if (!Strings.isNullOrEmpty(comment)) {
sb.append(String.format(" COMMENT '%s'", comment));
}
return sb.toString();
@@ -165,7 +164,7 @@ public class StructField {
if (type != null) {
sb.append(":").append(type);
}
- if (StringUtils.isNotBlank(comment)) {
+ if (!Strings.isNullOrEmpty(comment)) {
sb.append(String.format(" COMMENT '%s'", comment));
}
return sb.toString();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/CascadesContext.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/CascadesContext.java
index b02b7b9c32a..87177a5deaa 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/CascadesContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/CascadesContext.java
@@ -67,8 +67,8 @@ import org.apache.doris.statistics.Statistics;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.hadoop.util.Lists;
import java.util.ArrayList;
import java.util.HashMap;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java
index cc0064c6e48..e2fd4b2dee1 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/receiver/PlanReceiver.java
@@ -50,8 +50,8 @@ import org.apache.doris.nereids.util.JoinUtils;
import org.apache.doris.nereids.util.PlanUtils;
import org.apache.doris.qe.ConnectContext;
-import cfjd.com.google.common.collect.ImmutableList;
import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import java.util.ArrayList;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/EncryptKeyRef.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/EncryptKeyRef.java
index 7bbe59cfaf0..4b68bb62663 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/EncryptKeyRef.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/EncryptKeyRef.java
@@ -28,7 +28,7 @@ import org.apache.doris.nereids.types.StringType;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
-import org.apache.hadoop.util.Lists;
+import com.google.common.collect.Lists;
import java.util.List;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Password.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Password.java
index a326323361b..32bbf458cf8 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Password.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Password.java
@@ -27,7 +27,7 @@ import org.apache.doris.nereids.types.StringType;
import org.apache.doris.nereids.types.VarcharType;
import com.google.common.collect.ImmutableList;
-import org.apache.hadoop.util.Lists;
+import com.google.common.collect.Lists;
import java.util.List;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java
index 8a4daba8cd5..736c9d2a605 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java
@@ -38,7 +38,7 @@ import
org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
import org.apache.doris.nereids.util.Utils;
import org.apache.doris.statistics.Statistics;
-import avro.shaded.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergScanNode.java
index 0602da4a34d..e8e90d5096a 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergScanNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergScanNode.java
@@ -51,7 +51,7 @@ import org.apache.doris.thrift.TPlanNode;
import org.apache.doris.thrift.TPushAggOp;
import org.apache.doris.thrift.TTableFormatFileDesc;
-import avro.shaded.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
import org.apache.hadoop.fs.Path;
import org.apache.iceberg.BaseTable;
import org.apache.iceberg.CombinedScanTask;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java
index f8306391814..7e8a4b78773 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java
@@ -40,7 +40,7 @@ import org.apache.doris.thrift.TPaimonFileDesc;
import org.apache.doris.thrift.TScanRangeLocations;
import org.apache.doris.thrift.TTableFormatFileDesc;
-import avro.shaded.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.table.AbstractFileStoreTable;
import org.apache.paimon.table.source.ReadBuilder;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/binlog/BinlogManagerTest.java
b/fe/fe-core/src/test/java/org/apache/doris/binlog/BinlogManagerTest.java
index 64a539a2b86..dabd8bfc1e4 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/binlog/BinlogManagerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/binlog/BinlogManagerTest.java
@@ -29,10 +29,10 @@ import org.apache.doris.thrift.TBinlogType;
import org.apache.doris.thrift.TStatus;
import org.apache.doris.thrift.TStatusCode;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import mockit.Mock;
import mockit.MockUp;
-import org.apache.hadoop.util.Lists;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/GraphSimplifierTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/GraphSimplifierTest.java
index c26e1650781..990d7408751 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/GraphSimplifierTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/GraphSimplifierTest.java
@@ -32,8 +32,8 @@ import org.apache.doris.nereids.util.PlanConstructor;
import org.apache.doris.statistics.Statistics;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import org.apache.hadoop.util.Lists;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisManagerTest.java
b/fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisManagerTest.java
index 2bb36a9425e..41ace52b8ba 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisManagerTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisManagerTest.java
@@ -33,12 +33,12 @@ import org.apache.doris.statistics.util.SimpleQueue;
import org.apache.doris.statistics.util.StatisticsUtil;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Lists;
import mockit.Expectations;
import mockit.Injectable;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
-import org.apache.hadoop.util.Lists;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -393,9 +393,7 @@ public class AnalysisManagerTest {
}
@Mock
- public List<Column> getColumns() {
- return Lists.newArrayList(c);
- }
+ public List<Column> getColumns() { return Lists.newArrayList(c); }
};
OlapTable olapTable = new OlapTable();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/statistics/StatisticsAutoCollectorTest.java
b/fe/fe-core/src/test/java/org/apache/doris/statistics/StatisticsAutoCollectorTest.java
index fd7eaeaad90..df9e95e9d8e 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/statistics/StatisticsAutoCollectorTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/statistics/StatisticsAutoCollectorTest.java
@@ -38,12 +38,12 @@ import org.apache.doris.statistics.AnalysisInfo.JobType;
import org.apache.doris.statistics.util.StatisticsUtil;
import org.apache.doris.system.SystemInfoService;
+import com.google.common.collect.Lists;
import mockit.Expectations;
import mockit.Injectable;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
-import org.apache.hadoop.util.Lists;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
