diff --git a/fe/check/checkstyle/checkstyle.xml b/fe/check/checkstyle/checkstyle.xml index b2cae47aac..39a1e5c569 100644 --- a/fe/check/checkstyle/checkstyle.xml +++ b/fe/check/checkstyle/checkstyle.xml @@ -166,6 +166,12 @@ under the License. + + + + + + diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java index b0d82758ca..7df48f4a3a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SystemHandler.java @@ -48,7 +48,7 @@ import org.apache.doris.system.SystemInfoService.HostInfo; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -103,7 +103,7 @@ public class SystemHandler extends AlterHandler { @Override public List> getAlterJobInfosByDb(Database db) { - throw new NotImplementedException(); + throw new NotImplementedException("getAlterJobInfosByDb is not supported in SystemHandler"); } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClause.java index 3213a6a2e8..d52f72be7d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClause.java @@ -19,7 +19,7 @@ package org.apache.doris.analysis; import org.apache.doris.alter.AlterOpType; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.util.Map; @@ -33,7 +33,7 @@ public abstract class AlterClause implements ParseNode { } public Map getProperties() { - throw new NotImplementedException(); + throw new NotImplementedException("AlterClause.getProperties() is not implemented"); } public AlterOpType getOpType() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClusterClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClusterClause.java index 2984a5290f..eb92be8d33 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClusterClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClusterClause.java @@ -23,7 +23,7 @@ import org.apache.doris.common.Config; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.util.Map; @@ -63,7 +63,7 @@ public class AlterClusterClause extends AlterClause { @Override public String toSql() { // TODO Auto-generated method stub - throw new NotImplementedException(); + throw new NotImplementedException("toSql is not implemented"); } public int getInstanceNum() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java index 61a45682d6..40bdb0b1fb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java @@ -40,7 +40,7 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ArrayLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ArrayLiteral.java index c0331c0318..cbd25ea117 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ArrayLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ArrayLiteral.java @@ -23,7 +23,7 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.thrift.TExprNode; import org.apache.doris.thrift.TExprNodeType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/BackendClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/BackendClause.java index 252cbc8dfb..39dde9d8a2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/BackendClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/BackendClause.java @@ -24,7 +24,7 @@ import org.apache.doris.system.SystemInfoService.HostInfo; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.util.List; import java.util.Map; @@ -59,11 +59,11 @@ public class BackendClause extends AlterClause { @Override public String toSql() { - throw new NotImplementedException(); + throw new NotImplementedException("Not support toSql for BackendClause"); } @Override public Map getProperties() { - throw new NotImplementedException(); + throw new NotImplementedException("Not support getProperties for BackendClause"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java index b94fe15d96..5fb43e3351 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java @@ -48,7 +48,7 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DistributionDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DistributionDesc.java index 02005a3985..c9bf49b116 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DistributionDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DistributionDesc.java @@ -23,7 +23,7 @@ import org.apache.doris.catalog.DistributionInfo.DistributionInfoType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.DdlException; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.util.List; import java.util.Set; @@ -55,14 +55,14 @@ public class DistributionDesc { } public void analyze(Set colSet, List columnDefs, KeysDesc keysDesc) throws AnalysisException { - throw new NotImplementedException(); + throw new NotImplementedException("analyze not implemented"); } public String toSql() { - throw new NotImplementedException(); + throw new NotImplementedException("toSql not implemented"); } public DistributionInfo toDistributionInfo(List columns) throws DdlException { - throw new NotImplementedException(); + throw new NotImplementedException("toDistributionInfo not implemented"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropIndexClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropIndexClause.java index 749ce16d98..45cde1838b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropIndexClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropIndexClause.java @@ -21,7 +21,7 @@ import org.apache.doris.alter.AlterOpType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.UserException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropStatsStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropStatsStmt.java index da67165bf8..d1d594f61d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropStatsStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropStatsStmt.java @@ -32,7 +32,7 @@ import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Set; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/FrontendClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/FrontendClause.java index 3fd8676b50..cebf84ebbe 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/FrontendClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/FrontendClause.java @@ -30,7 +30,7 @@ import org.apache.doris.system.SystemInfoService.HostInfo; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.util.Map; @@ -75,12 +75,12 @@ public class FrontendClause extends AlterClause { @Override public String toSql() { - throw new NotImplementedException(); + throw new NotImplementedException("FrontendClause.toSql() not implemented"); } @Override public Map getProperties() { - throw new NotImplementedException(); + throw new NotImplementedException("FrontendClause.getProperties() not implemented"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/LabelName.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/LabelName.java index 327b183413..84480f8544 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/LabelName.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/LabelName.java @@ -26,7 +26,7 @@ import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import com.google.common.base.Strings; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/MapLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/MapLiteral.java index 182fb40f33..c8821d51fe 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/MapLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/MapLiteral.java @@ -25,7 +25,7 @@ import org.apache.doris.thrift.TExprNodeType; import org.apache.doris.thrift.TTypeDesc; import org.apache.doris.thrift.TTypeNode; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyBrokerClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyBrokerClause.java index 11a4986586..b89b38ba18 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyBrokerClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyBrokerClause.java @@ -25,7 +25,7 @@ import org.apache.doris.system.SystemInfoService; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Sets; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.util.List; import java.util.Map; @@ -97,11 +97,11 @@ public class ModifyBrokerClause extends AlterClause { @Override public String toSql() { - throw new NotImplementedException(); + throw new NotImplementedException("toSql not implemented"); } @Override public Map getProperties() { - throw new NotImplementedException(); + throw new NotImplementedException("getProperties not implemented"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyNodeHostNameClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyNodeHostNameClause.java index 0f7115c4ef..14533cb23b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyNodeHostNameClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyNodeHostNameClause.java @@ -24,7 +24,7 @@ import org.apache.doris.system.SystemInfoService.HostInfo; import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.validator.routines.InetAddressValidator; import java.net.InetAddress; @@ -83,6 +83,6 @@ public class ModifyNodeHostNameClause extends AlterClause { @Override public String toSql() { - throw new NotImplementedException(); + throw new NotImplementedException("toSql() method not implemented"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java index 8ffcd377c9..31a28da280 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java @@ -30,7 +30,7 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.util.List; import java.util.Map; @@ -156,11 +156,11 @@ public class PartitionDesc { } public String toSql() { - throw new NotImplementedException(); + throw new NotImplementedException("toSql not implemented"); } public PartitionInfo toPartitionInfo(List schema, Map partitionNameToId, boolean isTemp) throws DdlException, AnalysisException { - throw new NotImplementedException(); + throw new NotImplementedException("toPartitionInfo not implemented"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StructLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StructLiteral.java index a06fe9e53e..0731dfd46a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StructLiteral.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StructLiteral.java @@ -24,7 +24,7 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.thrift.TExprNode; import org.apache.doris.thrift.TExprNodeType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerTable.java index 8802df9747..2d827bd50a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/BrokerTable.java @@ -26,7 +26,7 @@ import org.apache.doris.thrift.TTableType; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/DistributionInfo.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/DistributionInfo.java index 227900905e..fdb3513f7d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/DistributionInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/DistributionInfo.java @@ -22,7 +22,7 @@ import org.apache.doris.common.io.Text; import org.apache.doris.common.io.Writable; import com.google.gson.annotations.SerializedName; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.io.DataInput; import java.io.DataOutput; @@ -83,7 +83,7 @@ public abstract class DistributionInfo implements Writable { } public DistributionDesc toDistributionDesc() { - throw new NotImplementedException(); + throw new NotImplementedException("toDistributionDesc not implemented"); } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java index a0fa49950e..4595f0fc9f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java @@ -35,8 +35,8 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.apache.commons.lang.NotImplementedException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.NotImplementedException; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -481,7 +481,7 @@ public abstract class Table extends MetaObject implements Writable, TableIf { } public CreateTableStmt toCreateTableStmt(String dbName) { - throw new NotImplementedException(); + throw new NotImplementedException("toCreateTableStmt not implemented"); } @Override @@ -522,7 +522,7 @@ public abstract class Table extends MetaObject implements Writable, TableIf { @Override public BaseAnalysisTask createAnalysisTask(AnalysisTaskInfo info) { - throw new NotImplementedException(); + throw new NotImplementedException("createAnalysisTask not implemented"); } /** diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/RangerHiveAuditHandler.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/RangerHiveAuditHandler.java index 6f68c378b4..f9a5ac2bab 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/RangerHiveAuditHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/RangerHiveAuditHandler.java @@ -17,7 +17,7 @@ package org.apache.doris.catalog.authorizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType; import org.apache.ranger.audit.model.AuthzAuditEvent; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/ExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/ExternalDatabase.java index 352029872c..fec46d034c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/ExternalDatabase.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/ExternalDatabase.java @@ -33,7 +33,7 @@ import org.apache.doris.qe.ConnectContext; import org.apache.doris.qe.MasterCatalogExecutor; import com.google.gson.annotations.SerializedName; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -126,15 +126,15 @@ public class ExternalDatabase implements DatabaseIf, } protected void init() { - throw new NotImplementedException(); + throw new NotImplementedException("init() is not implemented"); } public T getTableForReplay(long tableId) { - throw new NotImplementedException(); + throw new NotImplementedException("getTableForReplay() is not implemented"); } public void replayInitDb(InitDatabaseLog log, ExternalCatalog catalog) { - throw new NotImplementedException(); + throw new NotImplementedException("replayInitDb() is not implemented"); } @Override @@ -210,42 +210,42 @@ public class ExternalDatabase implements DatabaseIf, @Override public List getTables() { - throw new NotImplementedException(); + throw new NotImplementedException("getTables() is not implemented"); } @Override public List getTablesOnIdOrder() { - throw new NotImplementedException(); + throw new NotImplementedException("getTablesOnIdOrder() is not implemented"); } @Override public List getViews() { - throw new NotImplementedException(); + throw new NotImplementedException("getViews() is not implemented"); } @Override public List getTablesOnIdOrderIfExist(List tableIdList) { - throw new NotImplementedException(); + throw new NotImplementedException("getTablesOnIdOrderIfExist() is not implemented"); } @Override public List getTablesOnIdOrderOrThrowException(List tableIdList) throws MetaNotFoundException { - throw new NotImplementedException(); + throw new NotImplementedException("getTablesOnIdOrderOrThrowException() is not implemented"); } @Override public Set getTableNamesWithLock() { - throw new NotImplementedException(); + throw new NotImplementedException("getTableNamesWithLock() is not implemented"); } @Override public T getTableNullable(String tableName) { - throw new NotImplementedException(); + throw new NotImplementedException("getTableNullable() is not implemented"); } @Override public T getTableNullable(long tableId) { - throw new NotImplementedException(); + throw new NotImplementedException("getTableNullable() is not implemented"); } @Override @@ -263,10 +263,10 @@ public class ExternalDatabase implements DatabaseIf, @Override public void dropTable(String tableName) { - throw new NotImplementedException(); + throw new NotImplementedException("dropTable() is not implemented"); } public void createTable(String tableName, long tableId) { - throw new NotImplementedException(); + throw new NotImplementedException("createTable() is not implemented"); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/ExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/ExternalTable.java index b0f4798035..2a72f4cf6e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/ExternalTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/ExternalTable.java @@ -37,7 +37,7 @@ import org.apache.doris.thrift.TTableDescriptor; import com.google.gson.annotations.SerializedName; import lombok.Getter; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -309,7 +309,7 @@ public class ExternalTable implements TableIf, Writable, GsonPostProcessable { @Override public BaseAnalysisTask createAnalysisTask(AnalysisTaskInfo info) { - throw new NotImplementedException(); + throw new NotImplementedException("createAnalysisTask not implemented"); } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java index 5824ff3665..20bc7ef270 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java @@ -24,7 +24,7 @@ import org.apache.doris.common.FeConstants; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Arrays; import java.util.List; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java index 16cd33999a..09a935e206 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java @@ -18,7 +18,7 @@ package org.apache.doris.common.util; import com.google.gson.annotations.SerializedName; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Objects; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/LiteralUtils.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/LiteralUtils.java index 0b71d1548d..990dd194ce 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/LiteralUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/LiteralUtils.java @@ -23,7 +23,7 @@ import org.apache.doris.analysis.FloatLiteral; import org.apache.doris.analysis.StringLiteral; import org.apache.doris.catalog.Type; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/URI.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/URI.java index ab26fe41b8..d480e41272 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/URI.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/URI.java @@ -19,7 +19,7 @@ package org.apache.doris.common.util; import org.apache.doris.common.AnalysisException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.parquet.Strings; import java.util.TreeMap; diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java index 324105c1fe..dd48d19938 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java @@ -41,7 +41,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; import lombok.Data; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -116,7 +116,7 @@ public abstract class ExternalCatalog implements CatalogIf, Wr * @return true if table exists, false otherwise */ public boolean tableExistInLocal(String dbName, String tblName) { - throw new NotImplementedException(); + throw new NotImplementedException("tableExistInLocal not implemented"); } /** @@ -426,11 +426,11 @@ public abstract class ExternalCatalog implements CatalogIf, Wr } public void dropDatabase(String dbName) { - throw new NotImplementedException(); + throw new NotImplementedException("dropDatabase not implemented"); } public void createDatabase(long dbId, String dbName) { - throw new NotImplementedException(); + throw new NotImplementedException("createDatabase not implemented"); } public Map getSpecifiedDatabaseMap() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java index 449ac0bfd6..40054f4af2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java @@ -32,7 +32,7 @@ import org.apache.doris.datasource.property.constants.HMSProperties; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.CurrentNotificationEventId; diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java index 39532a6785..1a15fd0151 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreCache.java @@ -51,7 +51,7 @@ import com.google.common.collect.Range; import com.google.common.collect.RangeMap; import com.google.common.collect.TreeRangeMap; import lombok.Data; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.BlockLocation; import org.apache.hadoop.fs.LocatedFileStatus; diff --git a/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java b/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java index 3e3fabe4dd..cffc22e13d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/deploy/DeployManager.java @@ -35,8 +35,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; -import org.apache.commons.lang.NotImplementedException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.NotImplementedException; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -217,7 +217,7 @@ public class DeployManager extends MasterDaemon { } public void startListenerInternal() { - throw new NotImplementedException(); + throw new NotImplementedException("startListenerInternal not implemented"); } // Call init before each runOneCycle @@ -231,7 +231,7 @@ public class DeployManager extends MasterDaemon { // Must implement in derived class. // If encounter errors, return null protected List getGroupHostInfos(NodeType nodeType) { - throw new NotImplementedException(); + throw new NotImplementedException("getGroupHostInfos not implemented"); } protected String getBrokerName() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java b/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java index 7ed5ebb4d4..b7a8fa0431 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/deploy/impl/K8sDeployManager.java @@ -40,7 +40,7 @@ import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.WatcherException; import jline.internal.Log; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java index 478a1a0e0f..9c3f114fb8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java @@ -24,7 +24,7 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java index efb3a0fe4a..8a0c7da4b2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ShowAction.java @@ -37,7 +37,7 @@ import org.apache.doris.qe.ConnectContext; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Maps; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java index ca17c31cb8..38f949b546 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java +++ b/fe/fe-core/src/main/java/org/apache/doris/journal/bdbje/BDBEnvironment.java @@ -46,7 +46,7 @@ import com.sleepycat.je.rep.RollbackException; import com.sleepycat.je.rep.StateChangeListener; import com.sleepycat.je.rep.util.DbResetRepGroup; import com.sleepycat.je.rep.util.ReplicationGroupAdmin; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/DppScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/load/DppScheduler.java index b6d19c6961..6352e766ac 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/DppScheduler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/DppScheduler.java @@ -32,7 +32,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java index 36bdaa993c..ab6ae0480c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/ExportJob.java @@ -87,7 +87,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java index a56337ce9b..5b7210741f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java @@ -42,7 +42,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gson.Gson; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/Load.java b/fe/fe-core/src/main/java/org/apache/doris/load/Load.java index 840b79ecd0..2b15a53dee 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/Load.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/Load.java @@ -86,7 +86,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gson.Gson; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java index 52a37106d5..cc8248004c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java @@ -54,7 +54,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java index 2457dacdca..a54b9f98e3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java @@ -56,7 +56,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLauncherMonitor.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLauncherMonitor.java index 4cf388f53b..304ac0218e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLauncherMonitor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLauncherMonitor.java @@ -21,7 +21,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.base.Strings; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataConsumer.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataConsumer.java index 1d930a9e34..882412dfa8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataConsumer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalSyncDataConsumer.java @@ -37,7 +37,7 @@ import com.google.common.collect.Queues; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalUtils.java b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalUtils.java index b5e9dc70c0..7a9a32b037 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/sync/canal/CanalUtils.java @@ -25,8 +25,8 @@ import com.alibaba.otter.canal.protocol.CanalEntry; import com.alibaba.otter.canal.protocol.Message; import com.google.protobuf.InvalidProtocolBufferException; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java index 7500aa2b6d..d6dd0070ff 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java @@ -90,7 +90,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Queues; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Triple; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java index d76248178e..ea2ff6938d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PrivEntry.java @@ -24,7 +24,7 @@ import org.apache.doris.common.PatternMatcherException; import org.apache.doris.common.io.Text; import com.google.common.base.Preconditions; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; import java.io.DataInput; import java.io.IOException; @@ -170,7 +170,7 @@ public abstract class PrivEntry implements Comparable { @Override public int compareTo(PrivEntry o) { - throw new NotImplementedException(); + throw new NotImplementedException("should be implemented by derived class"); } /** diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java index aea9c5d149..8b9d18e22b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/UserProperty.java @@ -37,7 +37,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/PatternGenerator.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/PatternGenerator.java index e916e6bee0..75c950f8c8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/PatternGenerator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/pattern/generator/PatternGenerator.java @@ -25,7 +25,6 @@ import org.apache.doris.nereids.pattern.generator.javaast.MethodDeclaration; import org.apache.doris.nereids.pattern.generator.javaast.VariableDeclarator; import com.google.common.base.Joiner; -import org.apache.commons.lang.math.IntRange; import org.apache.commons.lang3.StringUtils; import java.util.AbstractMap.SimpleEntry; @@ -266,51 +265,55 @@ public abstract class PatternGenerator { /** generate a pattern method code. */ public String generateTypePattern(String patterName, String className, String genericParam, String predicate, boolean specifyChildren, boolean isMemoPattern) { - int childrenNum = childrenNum(); - if (specifyChildren) { - String methodGeneric = Arrays.stream(new IntRange(1, childrenNum).toArray()) - .mapToObj(i -> "C" + i + " extends Plan") - .collect(Collectors.joining(", ", "<", ">")); + StringBuilder methodGenericBuilder = new StringBuilder("<"); + StringBuilder methodParamBuilder = new StringBuilder(); + StringBuilder childrenPatternBuilder = new StringBuilder(); + int min = Math.min(1, childrenNum); + int max = Math.max(1, childrenNum); + for (int i = min; i <= max; i++) { + methodGenericBuilder.append("C").append(i).append(" extends Plan"); + methodParamBuilder.append("PatternDescriptor child").append(i); + childrenPatternBuilder.append("child").append(i).append(".pattern"); - String methodParam = Arrays.stream(new IntRange(1, childrenNum).toArray()) - .mapToObj(i -> "PatternDescriptor child" + i) - .collect(Collectors.joining(", ")); - - String childrenPattern = Arrays.stream(new IntRange(1, childrenNum).toArray()) - .mapToObj(i -> "child" + i + ".pattern") - .collect(Collectors.joining(", ")); - if (childrenNum > 0) { - childrenPattern = ", " + childrenPattern; + if (i < max) { + methodGenericBuilder.append(", "); + methodParamBuilder.append(", "); + childrenPatternBuilder.append(", "); + } } + methodGenericBuilder.append(">"); - String pattern = "default " + methodGeneric + "\n" + if (childrenNum > 0) { + childrenPatternBuilder.insert(0, ", "); + } + String pattern = "default " + methodGenericBuilder + "\n" + "PatternDescriptor" + genericParam + "\n" - + " " + patterName + "(" + methodParam + ") {\n" + + " " + patterName + "(" + methodParamBuilder + ") {\n" + " return new PatternDescriptor" + genericParam + "(\n" - + " new TypePattern(" + className + ".class" + childrenPattern + "),\n" - + " defaultPromise()\n" - + " )" + predicate + ";\n" - + "}\n"; - generatePatterns.add(pattern); - return pattern; - } else { - String childrenPattern = StringUtils.repeat( - isMemoPattern ? "Pattern.GROUP" : "Pattern.ANY", ", ", childrenNum); - if (childrenNum > 0) { - childrenPattern = ", " + childrenPattern; - } - - String pattern = "default PatternDescriptor" + genericParam + " " + patterName + "() {\n" - + " return new PatternDescriptor" + genericParam + "(\n" - + " new TypePattern(" + className + ".class" + childrenPattern + "),\n" + + " new TypePattern(" + className + ".class" + childrenPatternBuilder + "),\n" + " defaultPromise()\n" + " )" + predicate + ";\n" + "}\n"; generatePatterns.add(pattern); return pattern; } + + String childrenPattern = StringUtils.repeat( + isMemoPattern ? "Pattern.GROUP" : "Pattern.ANY", ", ", childrenNum); + if (childrenNum > 0) { + childrenPattern = ", " + childrenPattern; + } + + String pattern = "default PatternDescriptor" + genericParam + " " + patterName + "() {\n" + + " return new PatternDescriptor" + genericParam + "(\n" + + " new TypePattern(" + className + ".class" + childrenPattern + "),\n" + + " defaultPromise()\n" + + " )" + predicate + ";\n" + + "}\n"; + generatePatterns.add(pattern); + return pattern; } public String generatePatterns() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/CheckAfterRewrite.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/CheckAfterRewrite.java index 0f1e50f144..13426b9710 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/CheckAfterRewrite.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/CheckAfterRewrite.java @@ -32,7 +32,7 @@ import org.apache.doris.nereids.trees.plans.Plan; import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate; import org.apache.doris.nereids.trees.plans.logical.LogicalSort; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Set; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/CheckAnalysis.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/CheckAnalysis.java index 8d45087b84..265ad6cc92 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/CheckAnalysis.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/CheckAnalysis.java @@ -30,7 +30,7 @@ import org.apache.doris.nereids.trees.plans.Plan; import org.apache.doris.nereids.trees.plans.logical.LogicalAggregate; import com.google.common.collect.ImmutableList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Optional; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SlotBinder.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SlotBinder.java index 659b633475..f64ee4a6b7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SlotBinder.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SlotBinder.java @@ -31,7 +31,7 @@ import org.apache.doris.nereids.trees.expressions.Slot; import org.apache.doris.nereids.trees.expressions.SlotReference; import com.google.common.base.Preconditions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Optional; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionRangeExpander.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionRangeExpander.java index 3441319b2b..8cbd5e38b2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionRangeExpander.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionRangeExpander.java @@ -34,7 +34,7 @@ import org.apache.doris.nereids.types.DataType; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; import java.math.BigInteger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalSubQueryAlias.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalSubQueryAlias.java index 1a9cbe0dad..9dea905b8c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalSubQueryAlias.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalSubQueryAlias.java @@ -28,7 +28,7 @@ import org.apache.doris.nereids.util.Utils; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Objects; diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/ExportSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/ExportSink.java index 135e88de9a..b4b86c165f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/ExportSink.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/ExportSink.java @@ -28,7 +28,7 @@ import org.apache.doris.thrift.TExportSink; import org.apache.doris.thrift.TFileType; import org.apache.doris.thrift.TNetworkAddress; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; public class ExportSink extends DataSink { private final String exportPath; diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java index 0d0df38d4a..92b5dd7780 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java @@ -71,7 +71,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Range; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginInfo.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginInfo.java index df7ceac7e0..a20030522f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginInfo.java @@ -25,7 +25,7 @@ import org.apache.doris.persist.gson.GsonUtils; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.google.gson.annotations.SerializedName; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginZip.java b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginZip.java index 7037b8a7a6..f06a0b3040 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginZip.java +++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginZip.java @@ -25,7 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/policy/Policy.java b/fe/fe-core/src/main/java/org/apache/doris/policy/Policy.java index bfedaa88cf..8c1231f35d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/policy/Policy.java +++ b/fe/fe-core/src/main/java/org/apache/doris/policy/Policy.java @@ -32,7 +32,7 @@ import org.apache.doris.qe.ConnectContext; import com.google.gson.annotations.SerializedName; import lombok.Data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/policy/RowPolicy.java b/fe/fe-core/src/main/java/org/apache/doris/policy/RowPolicy.java index 3ef7de1d18..2708462b42 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/policy/RowPolicy.java +++ b/fe/fe-core/src/main/java/org/apache/doris/policy/RowPolicy.java @@ -34,7 +34,7 @@ import org.apache.doris.qe.ShowResultSetMetaData; import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; import lombok.Data; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/RuntimeFilterTypeHelper.java b/fe/fe-core/src/main/java/org/apache/doris/qe/RuntimeFilterTypeHelper.java index 1544fee9a6..96e3a5cc62 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/RuntimeFilterTypeHelper.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/RuntimeFilterTypeHelper.java @@ -25,7 +25,7 @@ import org.apache.doris.thrift.TRuntimeFilterType; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.Maps; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SqlModeHelper.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SqlModeHelper.java index 7709ac6143..8414cfdfb2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/SqlModeHelper.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SqlModeHelper.java @@ -25,7 +25,7 @@ import org.apache.doris.common.ErrorReport; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.Maps; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java index 6041a5c83b..3cce372933 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java @@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableVarConverters.java b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableVarConverters.java index 6613a7a959..bea6155744 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableVarConverters.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableVarConverters.java @@ -20,7 +20,7 @@ package org.apache.doris.qe; import org.apache.doris.common.DdlException; import com.google.common.collect.Maps; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/resource/resourcegroup/ResourceGroup.java b/fe/fe-core/src/main/java/org/apache/doris/resource/resourcegroup/ResourceGroup.java index 92f02fecb9..bcf72cb3e2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/resource/resourcegroup/ResourceGroup.java +++ b/fe/fe-core/src/main/java/org/apache/doris/resource/resourcegroup/ResourceGroup.java @@ -28,7 +28,7 @@ import org.apache.doris.thrift.TPipelineResourceGroup; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.gson.annotations.SerializedName; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/HMSAnalysisTask.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/HMSAnalysisTask.java index cf0a34bcaf..5651f2617a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/statistics/HMSAnalysisTask.java +++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/HMSAnalysisTask.java @@ -20,7 +20,7 @@ package org.apache.doris.statistics; import org.apache.doris.catalog.external.HMSExternalTable; import org.apache.doris.common.Config; -import org.apache.commons.lang.NotImplementedException; +import org.apache.commons.lang3.NotImplementedException; public class HMSAnalysisTask extends BaseAnalysisTask { @@ -35,7 +35,7 @@ public class HMSAnalysisTask extends BaseAnalysisTask { * Collect the column level stats for external table through metadata. */ protected void getColumnStatsByMeta() throws Exception { - throw new NotImplementedException(); + throw new NotImplementedException("Code is not implemented"); } /** @@ -43,7 +43,7 @@ public class HMSAnalysisTask extends BaseAnalysisTask { * @return ColumnStatistics */ protected void getColumnStatsBySql() { - throw new NotImplementedException(); + throw new NotImplementedException("getColumnStatsBySql is not implemented"); } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/BackendEvent.java b/fe/fe-core/src/main/java/org/apache/doris/system/BackendEvent.java index 90d4d6d58f..4d616fa68b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/system/BackendEvent.java +++ b/fe/fe-core/src/main/java/org/apache/doris/system/BackendEvent.java @@ -17,7 +17,7 @@ package org.apache.doris.system; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class BackendEvent { diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java index e24f1a6cfa..74824a395c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java +++ b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java @@ -46,7 +46,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.validator.routines.InetAddressValidator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java index ceda6e8260..2a9781339b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/ColocatePlanTest.java @@ -30,7 +30,7 @@ import org.apache.doris.qe.QueryStatisticsItem; import org.apache.doris.qe.StmtExecutor; import org.apache.doris.utframe.TestWithFeService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.jupiter.api.Test; diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/DorisAssert.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/DorisAssert.java index 08fdfcc58a..0078c505dc 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/utframe/DorisAssert.java +++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/DorisAssert.java @@ -40,7 +40,7 @@ import org.apache.doris.qe.SessionVariable; import org.apache.doris.qe.StmtExecutor; import org.apache.doris.system.SystemInfoService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import java.io.IOException; diff --git a/fe/java-udf/src/main/java/org/apache/doris/jni/vec/ScanPredicate.java b/fe/java-udf/src/main/java/org/apache/doris/jni/vec/ScanPredicate.java index 0e3b58298b..74f70bc14e 100644 --- a/fe/java-udf/src/main/java/org/apache/doris/jni/vec/ScanPredicate.java +++ b/fe/java-udf/src/main/java/org/apache/doris/jni/vec/ScanPredicate.java @@ -21,7 +21,7 @@ import org.apache.doris.jni.utils.OffHeap; import org.apache.doris.jni.utils.TypeNativeBytes; import org.apache.doris.jni.vec.ColumnType.Type; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.nio.ByteBuffer;