apache · yiguolei · Mar 28, 2023 · Mar 28, 2023
diff --git a/bin/start_fe.sh b/bin/start_fe.sh
@@ -205,15 +205,15 @@ fi
 
 if [[ "${IMAGE_TOOL}" -eq 1 ]]; then
     if [[ -n "${IMAGE_PATH}" ]]; then
-        ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} org.apache.doris.PaloFe -i "${IMAGE_PATH}"
+        ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} org.apache.doris.DorisFE -i "${IMAGE_PATH}"
     else
         echo "Internal Error. USE IMAGE_TOOL like : ./start_fe.sh --image image_path"
     fi
 elif [[ "${RUN_DAEMON}" -eq 1 ]]; then
-    nohup ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" org.apache.doris.PaloFe ${HELPER:+${HELPER}} "$@" >>"${LOG_DIR}/fe.out" 2>&1 </dev/null &
+    nohup ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" org.apache.doris.DorisFE ${HELPER:+${HELPER}} "$@" >>"${LOG_DIR}/fe.out" 2>&1 </dev/null &
 else
     export DORIS_LOG_TO_STDERR=1
-    ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" org.apache.doris.PaloFe ${HELPER:+${HELPER}} ${OPT_VERSION:+${OPT_VERSION}} "$@" </dev/null
+    ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" org.apache.doris.DorisFE ${HELPER:+${HELPER}} ${OPT_VERSION:+${OPT_VERSION}} "$@" </dev/null
 fi
 
 echo $! >"${pidfile}"
diff --git a/docs/en/community/developer-guide/fe-eclipse-dev.md b/docs/en/community/developer-guide/fe-eclipse-dev.md
@@ -165,13 +165,13 @@ You can directly start an FE process in Eclipse to facilitate debugging the code
 
     Create the configuration file `fe.conf` in the `conf/` directory created in the first step. You can directly copy `conf/fe.conf` in the source directory and make simple changes.
 
-3. Find the `src/main/java/org/apache/doris/PaloFe.java` file in Eclipse, right-click and select `Run As -> Run Configurations...`. Add the following environment variables to the `Environment` tab:
+3. Find the `src/main/java/org/apache/doris/DorisFE.java` file in Eclipse, right-click and select `Run As -> Run Configurations...`. Add the following environment variables to the `Environment` tab:
 
     * `DORIS_HOME: /path/to/doris/fe/run/`
     * `PID_DIR: /path/to/doris/fe/run/`
     * `LOG_DIR: /path/to/doris/fe/run/log`
 
-4. Right-click `PaloFe.java` and select `Run As -> Java Application` to start FE.
+4. Right-click `DorisFE.java` and select `Run As -> Java Application` to start FE.
 
 To run a UT, a FE service will be started at first. And then, UT cases execute as client and test corresponding logics. When errors occur, only client logs will be print in UT logs. If you need more information from **server logs**, you can view logs in `${DORIS_HOME}/fe/mocked`.
 

diff --git a/docs/en/docs/admin-manual/config/fe-config.md b/docs/en/docs/admin-manual/config/fe-config.md
@@ -1596,7 +1596,7 @@ The max size of one sys log and audit log
 
 #### `sys_log_dir`
 
-Default：PaloFe.DORIS_HOME_DIR + "/log"
+Default：DorisFE.DORIS_HOME_DIR + "/log"
 
 sys_log_dir:
 
@@ -2406,7 +2406,7 @@ Default：{
 
 #### `yarn_config_dir`
 
-Default：PaloFe.DORIS_HOME_DIR + "/lib/yarn-config"
+Default：DorisFE.DORIS_HOME_DIR + "/lib/yarn-config"
 
 Default yarn config file directory ，Each time before running the yarn command, we need to check that the  config file exists under this path, and if not, create them.
 
@@ -2444,13 +2444,13 @@ Default spark dpp version
 
 #### `tmp_dir`
 
-Default：PaloFe.DORIS_HOME_DIR + "/temp_dir"
+Default：DorisFE.DORIS_HOME_DIR + "/temp_dir"
 
 temp dir is used to save intermediate results of some process, such as backup and restore process.  file in this dir will be cleaned after these process is finished.
 
 #### `custom_config_dir`
 
-Default：PaloFe.DORIS_HOME_DIR + "/conf"
+Default：DorisFE.DORIS_HOME_DIR + "/conf"
 
 Custom configuration file directory
 

diff --git a/docs/zh-CN/community/developer-guide/fe-eclipse-dev.md b/docs/zh-CN/community/developer-guide/fe-eclipse-dev.md
@@ -167,13 +167,13 @@ FE的单元测试会首先启动一个FE服务，然后由测试用例作为客
 
     在第一步创建的 `conf/` 目录下创建配置文件 `fe.conf`。你可以直接将源码目录下 `conf/fe.conf` 拷贝过来并做简单修改。
 
-3. 在 Eclipse 中找到 `src/main/java/org/apache/doris/PaloFe.java` 文件，右击选择 `Run As -> Run Configurations...`。在 `Environment` 标签页中添加如下环境变量：
+3. 在 Eclipse 中找到 `src/main/java/org/apache/doris/DorisFE.java` 文件，右击选择 `Run As -> Run Configurations...`。在 `Environment` 标签页中添加如下环境变量：
 
     * `DORIS_HOME: /path/to/doris/fe/run/`
     * `PID_DIR: /path/to/doris/fe/run/`
     * `LOG_DIR: /path/to/doris/fe/run/log`
 
-4. 右击 `PaloFe.java`，选择 `Run As -> Java Application`，则可以启动 FE。
+4. 右击 `DorisFE.java`，选择 `Run As -> Java Application`，则可以启动 FE。
 
 ## 代码更新
 

diff --git a/docs/zh-CN/docs/admin-manual/config/fe-config.md b/docs/zh-CN/docs/admin-manual/config/fe-config.md
@@ -127,7 +127,7 @@ FE 的配置项有两种方式进行配置：
 
 #### `meta_dir`
 
-默认值：PaloFe.DORIS_HOME_DIR + "/doris-meta"
+默认值：DorisFE.DORIS_HOME_DIR + "/doris-meta"
 
 Doris 元数据将保存在这里。 强烈建议将此目录的存储为：
 
@@ -1596,7 +1596,7 @@ load 标签清理器将每隔 `label_clean_interval_second` 运行一次以清
 
 #### `sys_log_dir`
 
-默认值：PaloFe.DORIS_HOME_DIR + "/log"
+默认值：DorisFE.DORIS_HOME_DIR + "/log"
 
 sys_log_dir:
 
@@ -1657,7 +1657,7 @@ sys_log_dir:
 
 #### `audit_log_dir`
 
-默认值：PaloFe.DORIS_HOME_DIR + "/log"
+默认值：DorisFE.DORIS_HOME_DIR + "/log"
 
 审计日志目录：
 这指定了 FE 审计日志目录。
@@ -2406,13 +2406,13 @@ FE 会在每隔 es_state_sync_interval_secs 调用 es api 获取 es 索引分片
 
 #### `yarn_config_dir`
 
-默认值：PaloFe.DORIS_HOME_DIR + "/lib/yarn-config"
+默认值：DorisFE.DORIS_HOME_DIR + "/lib/yarn-config"
 
 默认的 Yarn 配置文件目录每次运行 Yarn 命令之前，我们需要检查一下这个路径下是否存在 config 文件，如果不存在，则创建它们。
 
 #### `yarn_client_path`
 
-默认值：PaloFe.DORIS_HOME_DIR + "/lib/yarn-client/hadoop/bin/yarn"
+默认值：DorisFE.DORIS_HOME_DIR + "/lib/yarn-client/hadoop/bin/yarn"
 
 默认 Yarn 客户端路径
 
@@ -2430,7 +2430,7 @@ FE 会在每隔 es_state_sync_interval_secs 调用 es api 获取 es 索引分片
 
 #### `spark_home_default_dir`
 
-默认值：PaloFe.DORIS_HOME_DIR + "/lib/spark2x"
+默认值：DorisFE.DORIS_HOME_DIR + "/lib/spark2x"
 
 默认的 Spark home 路径
 
@@ -2444,13 +2444,13 @@ Spark 默认版本号
 
 #### `tmp_dir`
 
-默认值：PaloFe.DORIS_HOME_DIR + "/temp_dir"
+默认值：DorisFE.DORIS_HOME_DIR + "/temp_dir"
 
 temp dir 用于保存某些过程的中间结果，例如备份和恢复过程。 这些过程完成后，将清除此目录中的文件。
 
 #### `custom_config_dir`
 
-默认值：PaloFe.DORIS_HOME_DIR + "/conf"
+默认值：DorisFE.DORIS_HOME_DIR + "/conf"
 
 自定义配置文件目录
 

diff --git a/fe/check/checkstyle/suppressions.xml b/fe/check/checkstyle/suppressions.xml
@@ -31,25 +31,25 @@ under the License.
 
     <!-- Suppress some rules except nereids -->
     <!-- Java doc -->
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="AtclauseOrder" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="JavadocMethod" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="JavadocParagraph" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="JavadocStyle" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="JavadocTagContinuationIndentation" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="InvalidJavadocPosition" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="MissingJavadocMethod" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="MissingJavadocType" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="NonEmptyAtclauseDescription" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="RequireEmptyLineBeforeBlockTagGroup" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="SummaryJavadoc" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="SingleLineJavadoc" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="AtclauseOrder" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="JavadocMethod" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="JavadocParagraph" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="JavadocStyle" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="JavadocTagContinuationIndentation" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="InvalidJavadocPosition" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="MissingJavadocMethod" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="MissingJavadocType" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="NonEmptyAtclauseDescription" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="RequireEmptyLineBeforeBlockTagGroup" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="SummaryJavadoc" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="SingleLineJavadoc" />
 
     <!-- other -->
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="DeclarationOrder" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="OverloadMethodsDeclarationOrder" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="SingleSpaceSeparator" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="VariableDeclarationUsageDistance" />
-    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|PaloFe\.java" checks="EmptyLineSeparator" id="forNereids" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="DeclarationOrder" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="OverloadMethodsDeclarationOrder" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="SingleSpaceSeparator" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="VariableDeclarationUsageDistance" />
+    <suppress files="org[\\/]apache[\\/]doris[\\/](?!nereids)[^\\/]+[\\/]|DorisFE\.java" checks="EmptyLineSeparator" id="forNereids" />
 
     <!-- exclude rules for special files -->
     <suppress files="org[\\/]apache[\\/]doris[\\/]load[\\/]loadv2[\\/]dpp[\\/]ColumnParser\.java" checks="OneTopLevelClass" />

diff --git a/...rc/main/java/org/apache/doris/PaloFe.java → ...c/main/java/org/apache/doris/DorisFE.java b/...rc/main/java/org/apache/doris/PaloFe.java → ...c/main/java/org/apache/doris/DorisFE.java
@@ -56,8 +56,8 @@
 import java.nio.channels.FileLock;
 import java.nio.channels.OverlappingFileLockException;
 
-public class PaloFe {
-    private static final Logger LOG = LogManager.getLogger(PaloFe.class);
+public class DorisFE {
+    private static final Logger LOG = LogManager.getLogger(DorisFE.class);
 
     static {
         InternalLoggerFactory.setDefaultFactory(Log4JLoggerFactory.INSTANCE);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpServer.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/HttpServer.java
@@ -17,7 +17,7 @@
 
 package org.apache.doris.httpv2;
 
-import org.apache.doris.PaloFe;
+import org.apache.doris.DorisFE;
 import org.apache.doris.common.Config;
 import org.apache.doris.common.FeConstants;
 import org.apache.doris.httpv2.config.SpringLog4j2Config;
@@ -124,8 +124,8 @@ public void start() {
         // To avoid some unexpected behavior.
         System.setProperty("spring.devtools.restart.enabled", "false");
         // Value of `DORIS_HOME_DIR` is null in unit test.
-        if (PaloFe.DORIS_HOME_DIR != null) {
-            System.setProperty("spring.http.multipart.location", PaloFe.DORIS_HOME_DIR);
+        if (DorisFE.DORIS_HOME_DIR != null) {
+            System.setProperty("spring.http.multipart.location", DorisFE.DORIS_HOME_DIR);
         }
         System.setProperty("spring.banner.image.location", "doris-logo.png");
         if (FeConstants.runningUnitTest) {

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
@@ -17,7 +17,7 @@
 
 package org.apache.doris.load;
 
-import org.apache.doris.PaloFe;
+import org.apache.doris.DorisFE;
 import org.apache.doris.common.Config;
 import org.apache.doris.common.FeConstants;
 import org.apache.doris.common.LoadException;
@@ -53,11 +53,11 @@
 public class DppScheduler {
     private static final Logger LOG = LogManager.getLogger(DppScheduler.class);
 
-    private static final String HADOOP_CLIENT = PaloFe.DORIS_HOME_DIR + Config.dpp_hadoop_client_path;
+    private static final String HADOOP_CLIENT = DorisFE.DORIS_HOME_DIR + Config.dpp_hadoop_client_path;
     private static final String DPP_OUTPUT_DIR = "export";
-    private static final String JOB_CONFIG_DIR = PaloFe.DORIS_HOME_DIR + "/temp/job_conf";
+    private static final String JOB_CONFIG_DIR = DorisFE.DORIS_HOME_DIR + "/temp/job_conf";
     private static final String JOB_CONFIG_FILE = "jobconfig.json";
-    private static final String LOCAL_DPP_DIR = PaloFe.DORIS_HOME_DIR + "/lib/dpp/" + FeConstants.dpp_version;
+    private static final String LOCAL_DPP_DIR = DorisFE.DORIS_HOME_DIR + "/lib/dpp/" + FeConstants.dpp_version;
     private static final int DEFAULT_REDUCE_NUM = 1000;
     private static final long GB = 1024 * 1024 * 1024L;
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkRepository.java b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkRepository.java
@@ -17,7 +17,7 @@
 
 package org.apache.doris.load.loadv2;
 
-import org.apache.doris.PaloFe;
+import org.apache.doris.DorisFE;
 import org.apache.doris.analysis.BrokerDesc;
 import org.apache.doris.common.Config;
 import org.apache.doris.common.LoadException;
@@ -85,7 +85,7 @@ public SparkRepository(String remoteRepositoryPath, BrokerDesc brokerDesc) {
         this.brokerDesc = brokerDesc;
         this.currentDppVersion = Config.spark_dpp_version;
         this.currentArchive = new SparkArchive(getRemoteArchivePath(currentDppVersion), currentDppVersion);
-        this.localDppPath = PaloFe.DORIS_HOME_DIR + DPP_RESOURCE_DIR + SPARK_DPP_JAR;
+        this.localDppPath = DorisFE.DORIS_HOME_DIR + DPP_RESOURCE_DIR + SPARK_DPP_JAR;
         if (!Strings.isNullOrEmpty(Config.spark_resource_path)) {
             this.localSpark2xPath = Config.spark_resource_path;
         } else {

diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedFrontend.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/MockedFrontend.java
@@ -17,8 +17,8 @@
 
 package org.apache.doris.utframe;
 
-import org.apache.doris.PaloFe;
-import org.apache.doris.PaloFe.StartupOptions;
+import org.apache.doris.DorisFE;
+import org.apache.doris.DorisFE.StartupOptions;
 import org.apache.doris.catalog.Env;
 import org.apache.doris.common.util.PrintableMap;
 
@@ -180,7 +180,7 @@ public void run() {
             // And it also cost time to start up.
             options.enableHttpServer = false;
             options.enableQeService = false;
-            PaloFe.start(frontend.getRunningDir(), frontend.getRunningDir(), args, options);
+            DorisFE.start(frontend.getRunningDir(), frontend.getRunningDir(), args, options);
         }
     }
 

diff --git a/tools/single-node-cluster/multi-fe b/tools/single-node-cluster/multi-fe
@@ -214,7 +214,7 @@ function start_fe() {
 		nohup java -cp "$(
 		IFS=:
 		echo "${classpath[*]}"
-	)" org.apache.doris.PaloFe ${helper:+${helper}} >>"${log_dir}/fe.out" 2>&1 &
+	)" org.apache.doris.DorisFE ${helper:+${helper}} >>"${log_dir}/fe.out" 2>&1 &
 	if kill -0 $!; then
 		log_info "Start FE(${id}) successfully"
 	else