This is an automated email from the ASF dual-hosted git repository.
jakevin 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 8102aefc606 [Cleanup](Nereids): delete useless `ddlSql` to avoid wrong
usage (#29788)
8102aefc606 is described below
commit 8102aefc606cf0d0548477abb7c20edfa6779446
Author: jakevin <[email protected]>
AuthorDate: Wed Jan 10 21:15:24 2024 +0800
[Cleanup](Nereids): delete useless `ddlSql` to avoid wrong usage (#29788)
ddlSql is useless and some code use getDdlSql() wrong, so delete those code
---
.../src/main/java/org/apache/doris/catalog/MetaObject.java | 4 ++--
.../src/main/java/org/apache/doris/catalog/OlapTable.java | 12 ++----------
fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java | 11 -----------
fe/fe-core/src/main/java/org/apache/doris/catalog/View.java | 5 -----
.../java/org/apache/doris/datasource/InternalCatalog.java | 2 +-
.../apache/doris/nereids/rules/analysis/BindRelation.java | 2 +-
.../test/java/org/apache/doris/catalog/CreateViewTest.java | 5 -----
7 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
index 09930b09594..2de2234ea16 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
@@ -26,14 +26,14 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-public class MetaObject implements Writable {
+public abstract class MetaObject implements Writable {
@SerializedName(value = "signature")
protected long signature;
@SerializedName(value = "lastCheckTime")
protected long lastCheckTime; // last check consistency time
- public MetaObject() {
+ protected MetaObject() {
signature = -1L;
lastCheckTime = -1L;
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index a8d7fc085bd..3236fc09ec9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -21,7 +21,6 @@ import org.apache.doris.alter.MaterializedViewHandler;
import org.apache.doris.analysis.AggregateInfo;
import org.apache.doris.analysis.Analyzer;
import org.apache.doris.analysis.ColumnDef;
-import org.apache.doris.analysis.CreateTableStmt;
import org.apache.doris.analysis.DataSortInfo;
import org.apache.doris.analysis.Expr;
import org.apache.doris.analysis.SlotDescriptor;
@@ -1264,11 +1263,6 @@ public class OlapTable extends Table {
return dataSize;
}
- @Override
- public CreateTableStmt toCreateTableStmt(String dbName) {
- throw new RuntimeException("Don't support anymore");
- }
-
// Get the md5 of signature string of this table with specified partitions.
// This method is used to determine whether the tables have the same
schema.
// Contains:
@@ -2396,7 +2390,7 @@ public class OlapTable extends Table {
&& getEnableUniqueKeyMergeOnWrite());
}
- public void initAutoIncrentGenerator(long dbId) {
+ public void initAutoIncrementGenerator(long dbId) {
for (Column column : fullSchema) {
if (column.isAutoInc()) {
autoIncrementGenerator = new AutoIncrementGenerator(dbId, id,
column.getUniqueId());
@@ -2498,9 +2492,7 @@ public class OlapTable extends Table {
public List<Tablet> getAllTablets() throws AnalysisException {
List<Tablet> tablets = Lists.newArrayList();
for (Partition partition : getPartitions()) {
- for (Tablet tablet : partition.getBaseIndex().getTablets()) {
- tablets.add(tablet);
- }
+ tablets.addAll(partition.getBaseIndex().getTablets());
}
return tablets;
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
index d0df5bad714..3395da6b58e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
@@ -18,7 +18,6 @@
package org.apache.doris.catalog;
import org.apache.doris.alter.AlterCancelException;
-import org.apache.doris.analysis.CreateTableStmt;
import org.apache.doris.catalog.constraint.Constraint;
import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
@@ -116,8 +115,6 @@ public abstract class Table extends MetaObject implements
Writable, TableIf {
// table(view)'s comment
@SerializedName(value = "comment")
protected String comment = "";
- // sql for creating this table, default is "";
- protected String ddlSql = "";
@SerializedName(value = "constraints")
private HashMap<String, Constraint> constraintsMap = new HashMap<>();
@@ -353,10 +350,6 @@ public abstract class Table extends MetaObject implements
Writable, TableIf {
return fullSchema;
}
- public String getDdlSql() {
- return ddlSql;
- }
-
// should override in subclass if necessary
public List<Column> getBaseSchema() {
return getBaseSchema(Util.showHiddenColumns());
@@ -550,10 +543,6 @@ public abstract class Table extends MetaObject implements
Writable, TableIf {
this.id = id;
}
- public CreateTableStmt toCreateTableStmt(String dbName) {
- throw new NotImplementedException("toCreateTableStmt not implemented");
- }
-
@Override
public String toString() {
return "Table [id=" + id + ", name=" + name + ", type=" + type + "]";
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/View.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/View.java
index bc2608d7b67..ff7c5ae3fc9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/View.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/View.java
@@ -147,11 +147,6 @@ public class View extends Table {
return inlineViewDef;
}
- @Override
- public String getDdlSql() {
- return inlineViewDef;
- }
-
/**
* Initializes the originalViewDef, inlineViewDef, and queryStmt members
* by parsing the expanded view definition SQL-string.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
index 280ebf3e67f..677292c7ca2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
@@ -2445,7 +2445,7 @@ public class InternalCatalog implements
CatalogIf<Database> {
}
olapTable.initSchemaColumnUniqueId();
- olapTable.initAutoIncrentGenerator(db.getId());
+ olapTable.initAutoIncrementGenerator(db.getId());
olapTable.rebuildFullSchema();
// analyze version info
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
index 6274956ccea..f97fa4eeb48 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
@@ -222,7 +222,7 @@ public class BindRelation extends OneAnalysisRuleFactory {
case MATERIALIZED_VIEW:
return makeOlapScan(table, unboundRelation, tableQualifier);
case VIEW:
- Plan viewPlan = parseAndAnalyzeView(((View)
table).getDdlSql(), cascadesContext);
+ Plan viewPlan = parseAndAnalyzeView(((View)
table).getInlineViewDef(), cascadesContext);
return new LogicalSubQueryAlias<>(tableQualifier, viewPlan);
case HMS_EXTERNAL_TABLE:
if (Config.enable_query_hive_views && ((HMSExternalTable)
table).isView()) {
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateViewTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateViewTest.java
index b30fff05b7c..b7945e0b6de 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateViewTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateViewTest.java
@@ -133,11 +133,6 @@ public class CreateViewTest {
Assert.assertEquals(1, view4.getFullSchema().size());
Assert.assertNotNull(view4.getColumn("s1"));
- View view5 = (View) db.getTableOrDdlException("view5");
- Assert.assertTrue(view5.getDdlSql().contains("hour"));
- Assert.assertTrue(view5.getDdlSql().contains("now"));
- Assert.assertTrue(view5.getDdlSql().contains("curdate"));
-
View view6 = (View) db.getTableOrDdlException("view6");
Assert.assertEquals(4, view6.getFullSchema().size());
Assert.assertNotNull(view6.getColumn("k1"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
