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 7e7fd5d049 [cleanup](fe) cleanup useless code. (#16129)
7e7fd5d049 is described below
commit 7e7fd5d0496dc54cc8353ea6138d92bb99b5bdbe
Author: jakevin <[email protected]>
AuthorDate: Sat Jan 28 18:44:43 2023 +0800
[cleanup](fe) cleanup useless code. (#16129)
* [cleanup](Nereids): cleanup useless code.
* revert ErrorCode.java
---
.../java/org/apache/doris/catalog/ScalarType.java | 45 ----------------------
.../main/java/org/apache/doris/catalog/Type.java | 6 +--
.../java/org/apache/doris/analysis/ExprId.java | 5 ---
.../java/org/apache/doris/analysis/SlotId.java | 5 ---
.../java/org/apache/doris/analysis/TupleId.java | 5 ---
.../java/org/apache/doris/common/ErrorReport.java | 4 --
.../java/org/apache/doris/common/IdGenerator.java | 2 -
.../main/java/org/apache/doris/common/Status.java | 1 -
.../java/org/apache/doris/common/ThriftServer.java | 7 +---
.../org/apache/doris/cooldown/CooldownHandler.java | 2 +-
.../org/apache/doris/cooldown/CooldownJob.java | 4 +-
.../org/apache/doris/datasource/MetaObjCache.java | 32 ---------------
.../org/apache/doris/nereids/memo/GroupId.java | 5 ---
.../doris/nereids/trees/expressions/ExprId.java | 5 ---
.../doris/nereids/trees/plans/RelationId.java | 5 ---
.../org/apache/doris/planner/PlanFragmentId.java | 5 ---
.../java/org/apache/doris/planner/PlanNodeId.java | 5 ---
.../org/apache/doris/planner/RuntimeFilterId.java | 5 ---
18 files changed, 5 insertions(+), 143 deletions(-)
diff --git
a/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
b/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
index 9015099f8c..9c18f02eab 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
@@ -1096,51 +1096,6 @@ public class ScalarType extends Type {
return PrimitiveType.isImplicitCast(type.getPrimitiveType(),
targetType.getPrimitiveType());
}
- @Override
- public int getStorageLayoutBytes() {
- switch (type) {
- case BOOLEAN:
- case TINYINT:
- return 1;
- case SMALLINT:
- return 2;
- case INT:
- case FLOAT:
- case DECIMAL32:
- return 4;
- case BIGINT:
- case TIME:
- case DATETIME:
- // TODO(Gabriel): unify execution engine and storage engine
- case TIMEV2:
- case DATETIMEV2:
- case DECIMAL64:
- return 8;
- case LARGEINT:
- case DECIMALV2:
- case DECIMAL128:
- return 16;
- case DOUBLE:
- return 12;
- case DATEV2:
- case DATE:
- return 3;
- case CHAR:
- case VARCHAR:
- return len;
- case HLL:
- return 16385;
- case BITMAP:
- return 1024; // this is a estimated value
- case QUANTILE_STATE:
- return 1024; // TODO(weixiang): no used in FE, figure out
whether can delete this funcion?
- case STRING:
- return 1024;
- default:
- return 0;
- }
- }
-
@Override
public TColumnType toColumnTypeThrift() {
TColumnType thrift = new TColumnType();
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
b/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
index 0fb6a779b6..e6c2e3a4cd 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
@@ -1704,13 +1704,9 @@ public abstract class Type {
}
}
- public int getStorageLayoutBytes() {
- return 0;
- }
-
public int getIndexSize() {
if (this.getPrimitiveType() == PrimitiveType.CHAR) {
- return ((ScalarType) this).getLength();
+ return this.getLength();
} else {
return this.getPrimitiveType().getOlapColumnIndexSize();
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprId.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprId.java
index 303d2fbb9d..2c3e64941d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExprId.java
@@ -35,11 +35,6 @@ public class ExprId extends Id<ExprId> {
public ExprId getNextId() {
return new ExprId(nextId++);
}
-
- @Override
- public ExprId getMaxId() {
- return new ExprId(nextId - 1);
- }
};
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotId.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotId.java
index 0ecaf4965e..432dbd4530 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SlotId.java
@@ -34,11 +34,6 @@ public class SlotId extends Id<SlotId> {
public SlotId getNextId() {
return new SlotId(nextId++);
}
-
- @Override
- public SlotId getMaxId() {
- return new SlotId(nextId - 1);
- }
};
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleId.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleId.java
index f962a32005..5077cc562b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TupleId.java
@@ -37,11 +37,6 @@ public class TupleId extends Id<TupleId> {
public TupleId getNextId() {
return new TupleId(nextId++);
}
-
- @Override
- public TupleId getMaxId() {
- return new TupleId(nextId - 1);
- }
};
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ErrorReport.java
b/fe/fe-core/src/main/java/org/apache/doris/common/ErrorReport.java
index e2f55a34ba..b92b9cbe54 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/ErrorReport.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/ErrorReport.java
@@ -68,10 +68,6 @@ public class ErrorReport {
throw new DdlException(reportCommon(pattern, errorCode, objs));
}
- public static void report(String pattern, Object... objs) {
- report(pattern, ErrorCode.ERR_UNKNOWN_ERROR, objs);
- }
-
public static void report(ErrorCode errorCode, Object... objs) {
report(null, errorCode, objs);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/IdGenerator.java
b/fe/fe-core/src/main/java/org/apache/doris/common/IdGenerator.java
index 120a9a924e..4770a8cd92 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/IdGenerator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/IdGenerator.java
@@ -28,6 +28,4 @@ public abstract class IdGenerator<IdType extends Id<IdType>> {
protected int nextId = 0;
public abstract IdType getNextId();
-
- public abstract IdType getMaxId();
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/Status.java
b/fe/fe-core/src/main/java/org/apache/doris/common/Status.java
index 3dfe2018e1..5a7c1e9d63 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/Status.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/Status.java
@@ -24,7 +24,6 @@ import org.apache.doris.thrift.TStatusCode;
public class Status {
public static final Status OK = new Status();
public static final Status CANCELLED = new Status(TStatusCode.CANCELLED,
"Cancelled");
- public static final Status THRIFT_RPC_ERROR = new
Status(TStatusCode.THRIFT_RPC_ERROR, "Thrift RPC failed");
public TStatusCode getErrorCode() {
return errorCode;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServer.java
b/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServer.java
index d101f5d227..a471ff5b25 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/ThriftServer.java
@@ -141,12 +141,7 @@ public class ThriftServer {
ThriftServerEventProcessor eventProcessor = new
ThriftServerEventProcessor(this);
server.setServerEventHandler(eventProcessor);
- serverThread = new Thread(new Runnable() {
- @Override
- public void run() {
- server.serve();
- }
- });
+ serverThread = new Thread(() -> server.serve());
serverThread.setDaemon(true);
serverThread.start();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownHandler.java
b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownHandler.java
index 867ad8aee7..fe0815c370 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownHandler.java
@@ -153,7 +153,7 @@ public class CooldownHandler extends MasterDaemon {
}
public void replayCooldownJob(CooldownJob cooldownJob) {
- CooldownJob replayCooldownJob = null;
+ CooldownJob replayCooldownJob;
if (!runableCooldownJobs.containsKey(cooldownJob.getJobId())) {
replayCooldownJob = new CooldownJob(cooldownJob.jobId,
cooldownJob.getCooldownConfList(),
cooldownJob.timeoutMs);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownJob.java
b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownJob.java
index 9a77b77724..99643b874a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cooldown/CooldownJob.java
@@ -269,7 +269,7 @@ public class CooldownJob implements Writable {
replayCreateJob(replayedJob);
break;
case SEND_CONF:
- replayPengingJob();
+ replayPendingJob();
break;
case FINISHED:
replayRunningJob(replayedJob);
@@ -321,7 +321,7 @@ public class CooldownJob implements Writable {
/**
* Replay job in PENDING state. set cooldown type in Replica
*/
- private void replayPengingJob() throws CooldownException {
+ private void replayPendingJob() throws CooldownException {
for (CooldownConf cooldownConf : cooldownConfList) {
setCooldownReplica(cooldownConf.getDbId(),
cooldownConf.getTableId(), cooldownConf.getPartitionId(),
cooldownConf.getIndexId(), cooldownConf.getTabletId(),
cooldownConf.getCooldownReplicaId(),
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/MetaObjCache.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/MetaObjCache.java
deleted file mode 100644
index 87ea4b7a92..0000000000
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/MetaObjCache.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package org.apache.doris.datasource;
-
-/**
- * MetaObjCache caches and manages all meta objects fetched from external
catalogs.
- * So that we don't need to get meta objects every time.
- */
-public class MetaObjCache {
- private static class SingletonHolder {
- private static final MetaObjCache INSTANCE = new MetaObjCache();
- }
-
- public static MetaObjCache get() {
- return SingletonHolder.INSTANCE;
- }
-}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupId.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupId.java
index ee2b8ff87a..b3870dd84a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/memo/GroupId.java
@@ -39,11 +39,6 @@ public class GroupId extends Id<GroupId> {
public GroupId getNextId() {
return new GroupId(nextId++);
}
-
- @Override
- public GroupId getMaxId() {
- return new GroupId(nextId - 1);
- }
};
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/ExprId.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/ExprId.java
index 6ed30f678f..71b5c16ca7 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/ExprId.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/ExprId.java
@@ -52,11 +52,6 @@ public class ExprId extends Id<ExprId> {
public ExprId getNextId() {
return new ExprId(nextId++);
}
-
- @Override
- public ExprId getMaxId() {
- return new ExprId(nextId++);
- }
};
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/RelationId.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/RelationId.java
index bdaae33101..834bc19e48 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/RelationId.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/RelationId.java
@@ -51,11 +51,6 @@ public class RelationId extends Id<RelationId> {
public RelationId getNextId() {
return new RelationId(nextId++);
}
-
- @Override
- public RelationId getMaxId() {
- return new RelationId(nextId);
- }
};
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragmentId.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragmentId.java
index ef5764489b..81b3274077 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragmentId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanFragmentId.java
@@ -34,11 +34,6 @@ public class PlanFragmentId extends Id<PlanFragmentId> {
public PlanFragmentId getNextId() {
return new PlanFragmentId(nextId++);
}
-
- @Override
- public PlanFragmentId getMaxId() {
- return new PlanFragmentId(nextId - 1);
- }
};
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNodeId.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNodeId.java
index 406fcd2894..b3ddbc23cd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNodeId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/PlanNodeId.java
@@ -34,11 +34,6 @@ public class PlanNodeId extends Id<PlanNodeId> {
public PlanNodeId getNextId() {
return new PlanNodeId(nextId++);
}
-
- @Override
- public PlanNodeId getMaxId() {
- return new PlanNodeId(nextId - 1);
- }
};
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterId.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterId.java
index f4c8e4ff1a..68fe2b636c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterId.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/RuntimeFilterId.java
@@ -32,11 +32,6 @@ public class RuntimeFilterId extends Id<RuntimeFilterId> {
public RuntimeFilterId getNextId() {
return new RuntimeFilterId(nextId++);
}
-
- @Override
- public RuntimeFilterId getMaxId() {
- return new RuntimeFilterId(nextId - 1);
- }
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
