From 3c9f5796f2b755352c5d36679d8cbc1c8415546e Mon Sep 17 00:00:00 2001 From: Yulv-git Date: Thu, 19 May 2022 12:24:53 +0800 Subject: [PATCH] Fix some typos in fe/. --- .../src/main/java/org/apache/doris/analysis/RevokeStmt.java | 2 +- .../src/main/java/org/apache/doris/analysis/TableRef.java | 2 +- fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java | 2 +- .../src/main/java/org/apache/doris/common/ErrorCode.java | 2 +- .../main/java/org/apache/doris/httpv2/rest/UploadAction.java | 2 +- .../src/main/java/org/apache/doris/load/LoadChecker.java | 2 +- .../src/main/java/org/apache/doris/mysql/MysqlPassword.java | 2 +- .../main/java/org/apache/doris/planner/SingleNodePlanner.java | 2 +- .../src/main/java/org/apache/doris/planner/SortNode.java | 4 ++-- .../test/java/org/apache/doris/utframe/MockedFrontend.java | 2 +- .../main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/RevokeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/RevokeStmt.java index 9d2ce60c7cb3e6..05e229d1a6977a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/RevokeStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/RevokeStmt.java @@ -100,7 +100,7 @@ public void analyze(Analyzer analyzer) throws AnalysisException { } else { // TODO(wyb): spark-load if (!Config.enable_spark_load) { - throw new AnalysisException("REVOKE ON RESOURCE is comming soon"); + throw new AnalysisException("REVOKE ON RESOURCE is coming soon"); } resourcePattern.analyze(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/TableRef.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/TableRef.java index 7bf37905840da7..3af884cffd5487 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/TableRef.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/TableRef.java @@ -260,7 +260,7 @@ public TupleId getId() { } /** - * Return the list of of materialized tuple ids from the TableRef. + * Return the list of materialized tuple ids from the TableRef. * This method should only be called after the TableRef has been analyzed. */ public List getMaterializedTupleIds() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java index e23302d96c7c2d..c5b03364452f49 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Type.java @@ -658,7 +658,7 @@ public TPrimitiveType getTPrimitiveType(TTypeDesc ttype) { * For datetime types this is the length in characters of the String representation * (assuming the maximum allowed precision of the fractional seconds component). * For binary data this is the length in bytes. - * Null is returned for for data types where the column size is not applicable. + * Null is returned for data types where the column size is not applicable. */ public Integer getColumnSize() { if (!isScalarType()) return null; diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/ErrorCode.java b/fe/fe-core/src/main/java/org/apache/doris/common/ErrorCode.java index d3ffad3760ec14..39b705fa64f4b1 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/ErrorCode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/ErrorCode.java @@ -947,7 +947,7 @@ public enum ErrorCode { "past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation."), ERR_EVENT_CANNOT_ALTER_IN_THE_PAST(1589, new byte[]{'H', 'Y', '0', '0', '0'}, "Event execution time is in the " + "past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation."), - ERR_SLAVE_INCIDENT(1590, new byte[]{'H', 'Y', '0', '0', '0'}, "The incident %s occured on the master. Message: %s"), + ERR_SLAVE_INCIDENT(1590, new byte[]{'H', 'Y', '0', '0', '0'}, "The incident %s occurred on the master. Message: %s"), ERR_NO_PARTITION_FOR_GIVEN_VALUE_SILENT(1591, new byte[]{'H', 'Y', '0', '0', '0'}, "Table has no partition for " + "some existing values"), ERR_BINLOG_UNSAFE_STATEMENT(1592, new byte[]{'H', 'Y', '0', '0', '0'}, "Unsafe statement written to the binary " + diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java index b2aa3bf9344886..adb9d7d9d3bc0b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/UploadAction.java @@ -165,7 +165,7 @@ public Object submit( /** * Get all uploaded file or specified file - * If preview is true, also return the the preview of the file + * If preview is true, also return the preview of the file * @param ns * @param dbName * @param tblName diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/LoadChecker.java b/fe/fe-core/src/main/java/org/apache/doris/load/LoadChecker.java index 4f14b63365d129..3e79763ce974ad 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/LoadChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/LoadChecker.java @@ -370,7 +370,7 @@ private Set submitPushTasks(LoadJob job, Database db) { OlapTable table = (OlapTable) db.getTableNullable(tableId); if (table == null) { LOG.warn("table does not exist. id: {}", tableId); - // if table is dropped during load, the the job is failed + // if table is dropped during load, the job is failed return null; } TableLoadInfo tableLoadInfo = tableEntry.getValue(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlPassword.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlPassword.java index 5d2f277ae79f9d..64f1a026a2250a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlPassword.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlPassword.java @@ -110,7 +110,7 @@ private static byte[] xorCrypt(byte[] s1, byte[] s2) { } // Check that scrambled message corresponds to the password; the function - // is used by server to check that recieved reply is authentic. + // is used by server to check that received reply is authentic. // This function does not check lengths of given strings: message must be // null-terminated, reply and hash_stage2 must be at least SHA1_HASH_SIZE // long (if not, something fishy is going on). diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java index 8d125c12047126..75b5b4b2aa36dd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java @@ -1378,7 +1378,7 @@ private PlanNode createInlineViewPlan(Analyzer analyzer, InlineViewRef inlineVie rootNode.setWithoutTupleIsNullOutputSmap(outputSmap); // Exprs against non-matched rows of an outer join should always return NULL. // Make the rhs exprs of the output smap nullable, if necessary. This expr wrapping - // must be performed on the composed smap, and not on the the inline view's smap, + // must be performed on the composed smap, and not on the inline view's smap, // because the rhs exprs must first be resolved against the physical output of // 'planRoot' to correctly determine whether wrapping is necessary. List nullableRhs = TupleIsNullPredicate.wrapExprs( diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java index 4da0fff5b156c2..3fb3800a0583f2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SortNode.java @@ -254,8 +254,8 @@ public void init(Analyzer analyzer) throws UserException { // Remap the ordering exprs to the tuple materialized by this sort node. The mapping // is a composition of the childSmap and the outputSmap_ because the child node may - // have also remapped its input (e.g., as in a a series of (sort->analytic)* nodes). - // Parent nodes have have to do the same so set the composition as the outputSmap_. + // have also remapped its input (e.g., as in a series of (sort->analytic)* nodes). + // Parent nodes have to do the same so set the composition as the outputSmap_. outputSmap = ExprSubstitutionMap.compose(childSmap, outputSmap, analyzer); info.substituteOrderingExprs(outputSmap, analyzer); 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 index 67820328e8353b..37346b2b154bf3 100644 --- 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 @@ -99,7 +99,7 @@ public int getRpcPort() { private boolean isInit = false; // init the fe process. This must be called before starting the frontend process. - // 1. check if all neccessary environment variables are set. + // 1. check if all necessary environment variables are set. // 2. clear and create 3 dirs: runningDir/log/, runningDir/palo-meta/, runningDir/conf/ // 3. init fe.conf // The content of "fe.conf" is a merge set of input `feConf` and MIN_FE_CONF diff --git a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java index 60697bf79eb2cb..0717de3053b086 100644 --- a/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java +++ b/fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java @@ -989,7 +989,7 @@ private void process() throws Exception { } } - // get key column names and value column names seperately + // get key column names and value column names separately List keyColumnNames = new ArrayList<>(); List valueColumnNames = new ArrayList<>(); for (EtlJobConfig.EtlColumn etlColumn : baseIndex.columns) {