You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/07/01 07:40:39 UTC
[doris] branch master updated: [style](*): fix declarationOrder error by rearrange code (#10347)
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 558a21d7de [style](*): fix declarationOrder error by rearrange code (#10347)
558a21d7de is described below
commit 558a21d7de608c8282d31551aa7caacbf17a3eb5
Author: husterdjx <80...@users.noreply.github.com>
AuthorDate: Fri Jul 1 15:40:34 2022 +0800
[style](*): fix declarationOrder error by rearrange code (#10347)
---
.../java/org/apache/doris/alter/AlterHandler.java | 16 +++++------
.../apache/doris/analysis/AddColumnsClause.java | 24 ++++++++--------
.../apache/doris/analysis/AddPartitionClause.java | 32 +++++++++++-----------
.../org/apache/doris/analysis/AddRollupClause.java | 32 +++++++++++-----------
.../analysis/AdminShowTabletStorageFormatStmt.java | 10 +++----
5 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java
index 473229dd1e..7fb3af736a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java
@@ -64,14 +64,6 @@ public abstract class AlterHandler extends MasterDaemon {
*/
protected ReentrantLock lock = new ReentrantLock();
- protected void lock() {
- lock.lock();
- }
-
- protected void unlock() {
- lock.unlock();
- }
-
public AlterHandler(String name) {
this(name, FeConstants.default_scheduler_interval_millisecond);
}
@@ -80,6 +72,14 @@ public abstract class AlterHandler extends MasterDaemon {
super(name, schedulerIntervalMillisecond);
}
+ protected void lock() {
+ lock.lock();
+ }
+
+ protected void unlock() {
+ lock.unlock();
+ }
+
protected void addAlterJobV2(AlterJobV2 alterJob) {
this.alterJobsV2.put(alterJob.getJobId(), alterJob);
LOG.info("add {} job {}", alterJob.getType(), alterJob.getJobId());
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java
index c3c52a4b83..8d38ec18a8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java
@@ -38,6 +38,13 @@ public class AddColumnsClause extends AlterTableClause {
// set in analyze
private List<Column> columns;
+ public AddColumnsClause(List<ColumnDef> columnDefs, String rollupName, Map<String, String> properties) {
+ super(AlterOpType.SCHEMA_CHANGE);
+ this.columnDefs = columnDefs;
+ this.rollupName = rollupName;
+ this.properties = properties;
+ }
+
public List<Column> getColumns() {
return columns;
}
@@ -46,13 +53,6 @@ public class AddColumnsClause extends AlterTableClause {
return rollupName;
}
- public AddColumnsClause(List<ColumnDef> columnDefs, String rollupName, Map<String, String> properties) {
- super(AlterOpType.SCHEMA_CHANGE);
- this.columnDefs = columnDefs;
- this.rollupName = rollupName;
- this.properties = properties;
- }
-
@Override
public void analyze(Analyzer analyzer) throws AnalysisException {
if (columnDefs == null || columnDefs.isEmpty()) {
@@ -76,11 +76,6 @@ public class AddColumnsClause extends AlterTableClause {
}
}
- @Override
- public Map<String, String> getProperties() {
- return this.properties;
- }
-
@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
@@ -100,6 +95,11 @@ public class AddColumnsClause extends AlterTableClause {
return sb.toString();
}
+ @Override
+ public Map<String, String> getProperties() {
+ return this.properties;
+ }
+
@Override
public String toString() {
return toSql();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddPartitionClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddPartitionClause.java
index ace4b4c3ab..eddac80644 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddPartitionClause.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddPartitionClause.java
@@ -31,18 +31,6 @@ public class AddPartitionClause extends AlterTableClause {
// true if this is to add a temporary partition
private boolean isTempPartition;
- public SinglePartitionDesc getSingeRangePartitionDesc() {
- return partitionDesc;
- }
-
- public DistributionDesc getDistributionDesc() {
- return distributionDesc;
- }
-
- public boolean isTempPartition() {
- return isTempPartition;
- }
-
public AddPartitionClause(SinglePartitionDesc partitionDesc,
DistributionDesc distributionDesc,
Map<String, String> properties,
@@ -56,13 +44,20 @@ public class AddPartitionClause extends AlterTableClause {
this.needTableStable = false;
}
- @Override
- public void analyze(Analyzer analyzer) throws AnalysisException {
+ public SinglePartitionDesc getSingeRangePartitionDesc() {
+ return partitionDesc;
+ }
+
+ public DistributionDesc getDistributionDesc() {
+ return distributionDesc;
+ }
+
+ public boolean isTempPartition() {
+ return isTempPartition;
}
@Override
- public Map<String, String> getProperties() {
- return this.properties;
+ public void analyze(Analyzer analyzer) throws AnalysisException {
}
@Override
@@ -76,6 +71,11 @@ public class AddPartitionClause extends AlterTableClause {
return sb.toString();
}
+ @Override
+ public Map<String, String> getProperties() {
+ return this.properties;
+ }
+
@Override
public String toString() {
return toSql();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddRollupClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddRollupClause.java
index 36d5bcdeaf..d2a2e3a88c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddRollupClause.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddRollupClause.java
@@ -42,6 +42,17 @@ public class AddRollupClause extends AlterTableClause {
private Map<String, String> properties;
+ public AddRollupClause(String rollupName, List<String> columnNames,
+ List<String> dupKeys, String baseRollupName,
+ Map<String, String> properties) {
+ super(AlterOpType.ADD_ROLLUP);
+ this.rollupName = rollupName;
+ this.columnNames = columnNames;
+ this.dupKeys = dupKeys;
+ this.baseRollupName = baseRollupName;
+ this.properties = properties;
+ }
+
public String getRollupName() {
return rollupName;
}
@@ -58,17 +69,6 @@ public class AddRollupClause extends AlterTableClause {
return baseRollupName;
}
- public AddRollupClause(String rollupName, List<String> columnNames,
- List<String> dupKeys, String baseRollupName,
- Map<String, String> properties) {
- super(AlterOpType.ADD_ROLLUP);
- this.rollupName = rollupName;
- this.columnNames = columnNames;
- this.dupKeys = dupKeys;
- this.baseRollupName = baseRollupName;
- this.properties = properties;
- }
-
@Override
public void analyze(Analyzer analyzer) throws AnalysisException {
FeNameFormat.checkTableName(rollupName);
@@ -88,11 +88,6 @@ public class AddRollupClause extends AlterTableClause {
baseRollupName = Strings.emptyToNull(baseRollupName);
}
- @Override
- public Map<String, String> getProperties() {
- return this.properties;
- }
-
@Override
public String toSql() {
StringBuilder stringBuilder = new StringBuilder();
@@ -112,6 +107,11 @@ public class AddRollupClause extends AlterTableClause {
return stringBuilder.toString();
}
+ @Override
+ public Map<String, String> getProperties() {
+ return this.properties;
+ }
+
@Override
public String toString() {
return toSql();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowTabletStorageFormatStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowTabletStorageFormatStmt.java
index 975731a5fd..3a291054f7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowTabletStorageFormatStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AdminShowTabletStorageFormatStmt.java
@@ -30,11 +30,6 @@ import org.apache.doris.qe.ShowResultSetMetaData;
public class AdminShowTabletStorageFormatStmt extends ShowStmt {
private boolean verbose;
- @Override
- public boolean isVerbose() {
- return verbose;
- }
-
public AdminShowTabletStorageFormatStmt(boolean verbose) {
this.verbose = verbose;
}
@@ -52,6 +47,11 @@ public class AdminShowTabletStorageFormatStmt extends ShowStmt {
super.analyze(analyzer);
}
+ @Override
+ public boolean isVerbose() {
+ return verbose;
+ }
+
@Override
public String toSql() {
StringBuilder sb = new StringBuilder("ADMIN SHOW TABLET STORAGE TYPE");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org