Skip to content

Commit da13610

Browse files
guojn1githubgxll
authored andcommitted
[fix][dingo-calcite] Resolve the issue where views with order by column asc/desc cannot run
1 parent ec56d3d commit da13610

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

dingo-calcite/src/main/java/io/dingodb/calcite/DingoDdlExecutor.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ public void execute(DingoSqlCreateView sqlCreateView, CalcitePrepare.Context con
794794
throw DINGO_RESOURCE.tableExists(tableName).ex();
795795
}
796796
SqlNode query = renameColumns(sqlCreateView.columnList, sqlCreateView.query);
797-
797+
String sql = query.toSqlString(CalciteSqlDialect.DEFAULT).getSql();
798798
List<String> schemas = new ArrayList<>();
799799
schemas.add(schema.getSchemaName());
800800
List<List<String>> schemaPaths = new ArrayList<>();
@@ -841,7 +841,6 @@ public void execute(DingoSqlCreateView sqlCreateView, CalcitePrepare.Context con
841841

842842
String schemaName = schema.getSchemaName();
843843

844-
String sql = query.toSqlString(CalciteSqlDialect.DEFAULT).getSql();
845844
// build tableDefinition
846845
TableDefinition tableDefinition = TableDefinition.builder()
847846
.name(tableName)

dingo-calcite/src/main/java/io/dingodb/calcite/executor/ShowCreateTableExecutor.java

+3
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ private String getCreateTable() {
256256
}
257257
}
258258
createTableSqlStr.append(" replica=").append(indexTable.getReplica());
259+
if (!"TXN_LSM".equalsIgnoreCase(indexTable.getEngine())) {
260+
createTableSqlStr.append(" engine=").append(indexTable.getEngine());
261+
}
259262
appendPart(indexTable, createTableSqlStr);
260263
}
261264
}

dingo-common/src/main/java/io/dingodb/common/mysql/scope/ScopeVariables.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public static boolean getJob2Table() {
131131

132132
public static boolean getNeedGc() {
133133
try {
134-
String jobNeedGc = executorProp.getOrDefault("job_need_gc", "on").toString();
134+
String jobNeedGc = executorProp.getOrDefault("job_need_gc", "off").toString();
135135
return jobNeedGc.equals("on");
136136
} catch (Exception e) {
137137
return false;

dingo-executor/src/main/java/io/dingodb/server/executor/ddl/DdlWorker.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -1951,8 +1951,13 @@ public Pair<Long, String> onAddPart(DdlContext dc, DdlJob job) {
19511951
}
19521952
TableDefinitionWithId tableWithId = tableRes.getKey();
19531953
PartitionDetailDefinition part = (PartitionDetailDefinition) job.getArgs().get(0);
1954-
long partId = MetaService.root().addDistribution(job.getSchemaName(), job.getTableName(), part);
1955-
1954+
long partId;
1955+
try {
1956+
partId = MetaService.root().addDistribution(job.getSchemaName(), job.getTableName(), part);
1957+
} catch (Exception e) {
1958+
job.setState(JobState.jobStateCancelled);
1959+
return Pair.of(0L, "add distribution failed");
1960+
}
19561961
TableDefinitionWithId newTableWithId = (TableDefinitionWithId) MetaService.root().addPart(
19571962
job.getSchemaName(), job.getTableName(), part, partId, tableWithId);
19581963
job.finishTableJob(JobState.jobStateDone, SchemaState.SCHEMA_PUBLIC);

0 commit comments

Comments
 (0)