Skip to content

Commit 796d5e3

Browse files
zerolbsonyzerolbsony
committed
Fix some problems after merge code from master branch.
1 parent c9d2e1a commit 796d5e3

12 files changed

Lines changed: 51 additions & 31 deletions

File tree

‎iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/table/AlterTableColumnDataTypeProcedure.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import org.apache.iotdb.confignode.consensus.request.write.table.AlterColumnDataTypePlan;
2727
import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv;
2828
import org.apache.iotdb.confignode.procedure.exception.ProcedureException;
29-
import org.apache.iotdb.confignode.procedure.exception.ProcedureSuspendedException;
30-
import org.apache.iotdb.confignode.procedure.exception.ProcedureYieldException;
3129
import org.apache.iotdb.confignode.procedure.impl.schema.SchemaUtils;
3230
import org.apache.iotdb.confignode.procedure.state.schema.AlterTableColumnDataTypeState;
3331
import org.apache.iotdb.confignode.procedure.store.ProcedureType;
@@ -76,7 +74,7 @@ protected String getActionMessage() {
7674
@Override
7775
protected Flow executeFromState(
7876
final ConfigNodeProcedureEnv env, final AlterTableColumnDataTypeState state)
79-
throws ProcedureSuspendedException, ProcedureYieldException, InterruptedException {
77+
throws InterruptedException {
8078
final long startTime = System.currentTimeMillis();
8179
try {
8280
switch (state) {

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,8 @@ protected IConfigTask visitAlterColumnDataType(
558558
ifTableExists,
559559
ifColumnExists,
560560
columnName,
561-
getDataType(dataType));
561+
getDataType(dataType),
562+
node.isView());
562563
}
563564

564565
private boolean checkTimeColumnIdempotent(

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3787,7 +3787,8 @@ public SettableFuture<ConfigTaskResult> describeTable(
37873787
} else if (Boolean.FALSE.equals(isShowCreateView)) {
37883788
ShowCreateTableTask.buildTsBlock(table, future);
37893789
} else if (isDetails) {
3790-
DescribeTableDetailsTask.buildTsBlock(table, resp.getPreDeletedColumns(), resp.preAlteredColumns, future);
3790+
DescribeTableDetailsTask.buildTsBlock(
3791+
table, resp.getPreDeletedColumns(), resp.preAlteredColumns, future);
37913792
} else {
37923793
DescribeTableTask.buildTsBlock(table, future);
37933794
}
@@ -3930,7 +3931,8 @@ public SettableFuture<ConfigTaskResult> alterColumnDataType(
39303931
TSDataType newType,
39313932
String queryId,
39323933
boolean ifTableExists,
3933-
boolean ifColumnExists) {
3934+
boolean ifColumnExists,
3935+
final boolean isView) {
39343936
final SettableFuture<ConfigTaskResult> future = SettableFuture.create();
39353937
try (final ConfigNodeClient client =
39363938
CLUSTER_DELETION_CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
@@ -3942,6 +3944,7 @@ public SettableFuture<ConfigTaskResult> alterColumnDataType(
39423944
queryId,
39433945
AlterOrDropTableOperationType.ALTER_COLUMN_DATA_TYPE,
39443946
TsTableColumnSchemaUtil.serialize(columnName, newType),
3947+
isView,
39453948
client);
39463949

39473950
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() == tsStatus.getCode()

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@ SettableFuture<ConfigTaskResult> alterColumnDataType(
352352
final TSDataType newType,
353353
final String queryId,
354354
final boolean tableIfExists,
355-
boolean ifColumnExists);
355+
boolean ifColumnExists,
356+
final boolean isView);
356357

357358
SettableFuture<ConfigTaskResult> alterTableRenameColumn(
358359
final String database,

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/AlterColumnDataTypeTask.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ public AlterColumnDataTypeTask(
3737
boolean tableIfExists,
3838
boolean ifColumnExists,
3939
String columnName,
40-
TSDataType newType) {
41-
super(database, tableName, queryId, tableIfExists);
40+
TSDataType newType,
41+
final boolean view) {
42+
super(database, tableName, queryId, tableIfExists, view);
4243
this.columnName = columnName;
4344
this.newType = newType;
4445
this.ifColumnExists = ifColumnExists;
@@ -48,6 +49,6 @@ public AlterColumnDataTypeTask(
4849
public ListenableFuture<ConfigTaskResult> execute(IConfigTaskExecutor configTaskExecutor)
4950
throws InterruptedException {
5051
return configTaskExecutor.alterColumnDataType(
51-
database, tableName, columnName, newType, queryId, tableIfExists, ifColumnExists);
52+
database, tableName, columnName, newType, queryId, tableIfExists, ifColumnExists, view);
5253
}
5354
}

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableDetailsTask.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ public static void buildTsBlock(
7171
columnStatus = "PRE_DELETE";
7272
} else if (preAlteredColumns.containsKey(columnSchema.getColumnName())) {
7373
columnStatus = "PRE_ALTER";
74-
dataTypeName += "->" + TSDataType.getTsDataType(preAlteredColumns.get(columnSchema.getColumnName())).name();
74+
dataTypeName +=
75+
"->"
76+
+ TSDataType.getTsDataType(preAlteredColumns.get(columnSchema.getColumnName()))
77+
.name();
7578
}
7679
builder
7780
.getColumnBuilder(0)

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,23 @@ public class AlterColumnDataType extends Statement {
3131
private final DataType dataType;
3232
private final boolean ifTableExists;
3333
private final boolean ifColumnExists;
34+
private final boolean view;
3435

3536
public AlterColumnDataType(
3637
@Nullable NodeLocation location,
3738
QualifiedName tableName,
3839
Identifier columnName,
3940
DataType dataType,
4041
boolean ifTableExists,
41-
boolean ifColumnExists) {
42+
boolean ifColumnExists,
43+
boolean view) {
4244
super(location);
4345
this.tableName = tableName;
4446
this.columnName = columnName;
4547
this.dataType = dataType;
4648
this.ifTableExists = ifTableExists;
4749
this.ifColumnExists = ifColumnExists;
50+
this.view = view;
4851
}
4952

5053
@Override
@@ -80,6 +83,8 @@ public String toString() {
8083
+ columnName
8184
+ ", dataType="
8285
+ dataType
86+
+ ", view="
87+
+ view
8388
+ '}';
8489
}
8590

@@ -107,4 +112,8 @@ public boolean isIfTableExists() {
107112
public boolean isIfColumnExists() {
108113
return ifColumnExists;
109114
}
115+
116+
public boolean isView() {
117+
return view;
118+
}
110119
}

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@
244244
import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseVisitor;
245245
import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer;
246246
import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser;
247-
import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser.AlterColumnDataTypeContext;
248247
import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
249248
import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator;
250249
import org.apache.iotdb.db.utils.DateTimeUtils;
@@ -547,17 +546,17 @@ public Node visitAlterColumnDataType(RelationalSqlParser.AlterColumnDataTypeCont
547546
Identifier columnName = lowerIdentifier((Identifier) visit(ctx.identifier()));
548547
DataType dataType = (DataType) visit(ctx.new_type);
549548
boolean ifTableExists =
550-
ctx.EXISTS().stream()
551-
.anyMatch(
552-
node ->
553-
node.getSymbol().getTokenIndex() < ctx.COLUMN().getSymbol().getTokenIndex());
549+
ctx.EXISTS().stream()
550+
.anyMatch(
551+
node ->
552+
node.getSymbol().getTokenIndex() < ctx.COLUMN().getSymbol().getTokenIndex());
554553
boolean ifColumnExists =
555-
ctx.EXISTS().stream()
556-
.anyMatch(
557-
node ->
558-
node.getSymbol().getTokenIndex() > ctx.COLUMN().getSymbol().getTokenIndex());
554+
ctx.EXISTS().stream()
555+
.anyMatch(
556+
node ->
557+
node.getSymbol().getTokenIndex() > ctx.COLUMN().getSymbol().getTokenIndex());
559558
return new AlterColumnDataType(
560-
getLocation(ctx), tableName, columnName, dataType, ifTableExists, ifColumnExists);
559+
getLocation(ctx), tableName, columnName, dataType, ifTableExists, ifColumnExists, false);
561560
}
562561

563562
@Override

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/fast/FastAlignedSeriesCompactionExecutor.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.apache.iotdb.db.utils.datastructure.PatternTreeMapFactory;
4242

4343
import org.apache.tsfile.common.constant.TsFileConstant;
44-
import org.apache.tsfile.enums.TSDataType;
4544
import org.apache.tsfile.exception.write.PageException;
4645
import org.apache.tsfile.file.header.ChunkHeader;
4746
import org.apache.tsfile.file.header.PageHeader;

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/fast/FastNonAlignedSeriesCompactionExecutor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ void readChunk(ChunkMetadataElement chunkMetadataElement) throws IOException {
199199
updateSummary(chunkMetadataElement, ChunkStatus.READ_IN);
200200
if (chunkMetadataElement.chunkMetadata.getNewType() != null) {
201201
chunkMetadataElement.chunk =
202-
readerCacheMap
203-
.get(chunkMetadataElement.fileElement.resource)
204-
.readMemChunk((ChunkMetadata) chunkMetadataElement.chunkMetadata)
205-
.rewrite(((ChunkMetadata) chunkMetadataElement.chunkMetadata).getNewType());
202+
readerCacheMap
203+
.get(chunkMetadataElement.fileElement.resource)
204+
.readMemChunk((ChunkMetadata) chunkMetadataElement.chunkMetadata)
205+
.rewrite(((ChunkMetadata) chunkMetadataElement.chunkMetadata).getNewType());
206206

207207
ChunkMetadata chunkMetadata = (ChunkMetadata) chunkMetadataElement.chunkMetadata;
208208
chunkMetadata.setTsDataType(chunkMetadataElement.chunkMetadata.getNewType());
@@ -212,9 +212,9 @@ void readChunk(ChunkMetadataElement chunkMetadataElement) throws IOException {
212212
chunkMetadataElement.chunkMetadata = chunkMetadata;
213213
} else {
214214
chunkMetadataElement.chunk =
215-
readerCacheMap
216-
.get(chunkMetadataElement.fileElement.resource)
217-
.readMemChunk((ChunkMetadata) chunkMetadataElement.chunkMetadata);
215+
readerCacheMap
216+
.get(chunkMetadataElement.fileElement.resource)
217+
.readMemChunk((ChunkMetadata) chunkMetadataElement.chunkMetadata);
218218
}
219219
if (!hasStartMeasurement) {
220220
// for nonAligned sensors, only after getting chunkMetadatas can we create metadata to

0 commit comments

Comments
 (0)