From f3659c87c10b944287c8307be5d5663c5ab85111 Mon Sep 17 00:00:00 2001 From: Mingyu Chen Date: Tue, 29 Mar 2022 11:32:52 +0800 Subject: [PATCH] [fix][chore](repository)(fe) check reponame when creating repository and modify build.sh (#8671) 1. We need to check repo name when creating repository 2. modify build.sh to not install spark-dpp when spark-dpp is not compiled --- build.sh | 40 +++++++++---------- dist/LICENSE-dist.txt | 2 +- .../doris/analysis/CreateRepositoryStmt.java | 2 + .../doris/analysis/DropRepositoryStmt.java | 3 -- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/build.sh b/build.sh index 2380ebc097..7194dc80c3 100755 --- a/build.sh +++ b/build.sh @@ -368,31 +368,27 @@ DORIS_OUTPUT=${DORIS_HOME}/output/ mkdir -p ${DORIS_OUTPUT} # Copy Frontend and Backend -if [ ${BUILD_FE} -eq 1 -o ${BUILD_SPARK_DPP} -eq 1 ]; then - if [ ${BUILD_FE} -eq 1 ]; then - install -d ${DORIS_OUTPUT}/fe/bin ${DORIS_OUTPUT}/fe/conf \ - ${DORIS_OUTPUT}/fe/webroot/ ${DORIS_OUTPUT}/fe/lib/ \ - ${DORIS_OUTPUT}/fe/spark-dpp/ +if [ ${BUILD_FE} -eq 1 ]; then + install -d ${DORIS_OUTPUT}/fe/bin ${DORIS_OUTPUT}/fe/conf \ + ${DORIS_OUTPUT}/fe/webroot/ ${DORIS_OUTPUT}/fe/lib/ - cp -r -p ${DORIS_HOME}/bin/*_fe.sh ${DORIS_OUTPUT}/fe/bin/ - cp -r -p ${DORIS_HOME}/conf/fe.conf ${DORIS_OUTPUT}/fe/conf/ - rm -rf ${DORIS_OUTPUT}/fe/lib/* - cp -r -p ${DORIS_HOME}/fe/fe-core/target/lib/* ${DORIS_OUTPUT}/fe/lib/ - cp -r -p ${DORIS_HOME}/fe/fe-core/target/palo-fe.jar ${DORIS_OUTPUT}/fe/lib/ - cp -r -p ${DORIS_HOME}/docs/build/help-resource.zip ${DORIS_OUTPUT}/fe/lib/ - cp -r -p ${DORIS_HOME}/webroot/static ${DORIS_OUTPUT}/fe/webroot/ - cp -r -p ${DORIS_HOME}/fe/spark-dpp/target/spark-dpp-*-jar-with-dependencies.jar ${DORIS_OUTPUT}/fe/spark-dpp/ + cp -r -p ${DORIS_HOME}/bin/*_fe.sh ${DORIS_OUTPUT}/fe/bin/ + cp -r -p ${DORIS_HOME}/conf/fe.conf ${DORIS_OUTPUT}/fe/conf/ + rm -rf ${DORIS_OUTPUT}/fe/lib/* + cp -r -p ${DORIS_HOME}/fe/fe-core/target/lib/* ${DORIS_OUTPUT}/fe/lib/ + cp -r -p ${DORIS_HOME}/fe/fe-core/target/palo-fe.jar ${DORIS_OUTPUT}/fe/lib/ + cp -r -p ${DORIS_HOME}/docs/build/help-resource.zip ${DORIS_OUTPUT}/fe/lib/ + cp -r -p ${DORIS_HOME}/webroot/static ${DORIS_OUTPUT}/fe/webroot/ - cp -r -p ${DORIS_THIRDPARTY}/installed/webroot/* ${DORIS_OUTPUT}/fe/webroot/static/ - mkdir -p ${DORIS_OUTPUT}/fe/log - mkdir -p ${DORIS_OUTPUT}/fe/doris-meta - - elif [ ${BUILD_SPARK_DPP} -eq 1 ]; then - install -d ${DORIS_OUTPUT}/fe/spark-dpp/ - rm -rf ${DORIS_OUTPUT}/fe/spark-dpp/* - cp -r -p ${DORIS_HOME}/fe/spark-dpp/target/spark-dpp-*-jar-with-dependencies.jar ${DORIS_OUTPUT}/fe/spark-dpp/ - fi + cp -r -p ${DORIS_THIRDPARTY}/installed/webroot/* ${DORIS_OUTPUT}/fe/webroot/static/ + mkdir -p ${DORIS_OUTPUT}/fe/log + mkdir -p ${DORIS_OUTPUT}/fe/doris-meta +fi +if [ ${BUILD_SPARK_DPP} -eq 1 ]; then + install -d ${DORIS_OUTPUT}/fe/spark-dpp/ + rm -rf ${DORIS_OUTPUT}/fe/spark-dpp/* + cp -r -p ${DORIS_HOME}/fe/spark-dpp/target/spark-dpp-*-jar-with-dependencies.jar ${DORIS_OUTPUT}/fe/spark-dpp/ fi if [ ${BUILD_BE} -eq 1 ]; then diff --git a/dist/LICENSE-dist.txt b/dist/LICENSE-dist.txt index 2be7638159..0e4989fcab 100644 --- a/dist/LICENSE-dist.txt +++ b/dist/LICENSE-dist.txt @@ -1283,7 +1283,7 @@ The Apache Software License, Version 2.0 * oro: - oro:oro:2.0.8 (no url defined) * je: - - com.sleepycat:je:7.3.7 (no url defined) + - com.sleepycat:je:18.3.12 (no url defined) ### The following components use multiple licenses and we choose APLv2 * JAX-RS provider for JSON content type: - org.codehaus.jackson:jackson-jaxrs:1.8.3 (http://jackson.codehaus.org) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java index a83e10bbf1..42f137d6e6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRepositoryStmt.java @@ -20,6 +20,7 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; +import org.apache.doris.common.FeNameFormat; import org.apache.doris.common.UserException; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; @@ -69,6 +70,7 @@ public class CreateRepositoryStmt extends DdlStmt { if (!Catalog.getCurrentCatalog().getAuth().checkGlobalPriv(ConnectContext.get(), PrivPredicate.ADMIN)) { ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR, "ADMIN"); } + FeNameFormat.checkCommonName("repository", name); } @Override diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropRepositoryStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropRepositoryStmt.java index 5a711fc504..a2b9b10f08 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropRepositoryStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropRepositoryStmt.java @@ -20,7 +20,6 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Catalog; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; -import org.apache.doris.common.FeNameFormat; import org.apache.doris.common.UserException; import org.apache.doris.mysql.privilege.PrivPredicate; import org.apache.doris.qe.ConnectContext; @@ -45,8 +44,6 @@ public class DropRepositoryStmt extends DdlStmt { if (!Catalog.getCurrentCatalog().getAuth().checkGlobalPriv(ConnectContext.get(), PrivPredicate.ADMIN)) { ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR, "ADMIN"); } - - FeNameFormat.checkCommonName("repository", repoName); } @Override