database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Cleanup](Nereids): delete useless ddlSql to avoid wrong usage (#29788)

Browse Source 
ddlSql is useless and some code use getDdlSql() wrong, so delete those code
This commit is contained in:
jakevin
2024-01-10 21:15:24 +08:00
committed by yiguolei
parent 2e90c457b6
commit 81d6775b7b
7 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fe/fe-core/src/main/java/org/apache/doris/catalog/MetaObject.java
View File

@ -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;
}

12
fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
View File

@ -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;
}

11
fe/fe-core/src/main/java/org/apache/doris/catalog/Table.java
View File

@ -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 + "]";

5
fe/fe-core/src/main/java/org/apache/doris/catalog/View.java
View File

@ -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.

2
fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
View File

@ -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

2
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/BindRelation.java
View File

@ -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()) {

5
fe/fe-core/src/test/java/org/apache/doris/catalog/CreateViewTest.java
View File

@ -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"));