-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Table Model] table model compaction (#12428)
* table model compaction * modify ut * modify CompactionTableModelTestFileWriter * modify CompactionTableModelTestFileWriter * fix map concurrent modification * add ut * suppport ReadPointCompactionPerformer * fix read point compaction performer ut * add v3 tsfile in test resource for compaction test * add ut * skip collect tree model table schema in compaction * modify ut * empty * fix test * empty * Revert "fix test" This reverts commit b01c233. * fix v3tsfile resource no such file * fix ut * fix ut * fix ut * fix ut
- Loading branch information
Showing
48 changed files
with
2,387 additions
and
962 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
...ngine/dataregion/compaction/execute/exception/CompactionTableSchemaNotMatchException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception; | ||
|
|
||
| public class CompactionTableSchemaNotMatchException extends RuntimeException { | ||
| public CompactionTableSchemaNotMatchException(String msg) { | ||
| super(msg); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
...che/iotdb/db/storageengine/dataregion/compaction/execute/utils/CompactionTableSchema.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils; | ||
|
|
||
| import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionTableSchemaNotMatchException; | ||
|
|
||
| import org.apache.tsfile.file.metadata.TableSchema; | ||
| import org.apache.tsfile.write.record.Tablet.ColumnType; | ||
| import org.apache.tsfile.write.schema.IMeasurementSchema; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class CompactionTableSchema extends TableSchema { | ||
| public CompactionTableSchema(String tableName) { | ||
| super(tableName); | ||
| } | ||
|
|
||
| public void merge(TableSchema tableSchema) { | ||
| if (tableSchema == null) { | ||
| return; | ||
| } | ||
| if (!tableSchema.getTableName().equals(this.tableName)) { | ||
| throw new CompactionTableSchemaNotMatchException( | ||
| "this.tableName is " + tableName + " merge tableName is " + tableSchema.getTableName()); | ||
| } | ||
| // filter id columns | ||
| List<IMeasurementSchema> otherSchemaColumnSchemas = tableSchema.getColumnSchemas(); | ||
| List<ColumnType> otherSchemaColumnTypes = tableSchema.getColumnTypes(); | ||
| List<IMeasurementSchema> idColumnSchemasToMerge = new ArrayList<>(); | ||
|
|
||
| for (int i = 0; i < otherSchemaColumnTypes.size(); i++) { | ||
| ColumnType columnType = otherSchemaColumnTypes.get(i); | ||
| if (columnType != ColumnType.ID) { | ||
| break; | ||
| } | ||
| idColumnSchemasToMerge.add(otherSchemaColumnSchemas.get(i)); | ||
| } | ||
|
|
||
| // check id column prefix | ||
| int prefixLength = Math.min(this.columnTypes.size(), idColumnSchemasToMerge.size()); | ||
| for (int i = 0; i < prefixLength; i++) { | ||
| IMeasurementSchema idColumnToMerge = idColumnSchemasToMerge.get(i); | ||
| IMeasurementSchema currentIdColumn = columnSchemas.get(i); | ||
| if (!idColumnToMerge.getMeasurementId().equals(currentIdColumn.getMeasurementId())) { | ||
| throw new CompactionTableSchemaNotMatchException( | ||
| "current id column name is " | ||
| + currentIdColumn.getMeasurementId() | ||
| + ", other id column name in same position is " | ||
| + idColumnToMerge.getMeasurementId()); | ||
| } | ||
| } | ||
|
|
||
| // add new id columns | ||
| List<IMeasurementSchema> newIdColumns = | ||
| idColumnSchemasToMerge.subList(prefixLength, idColumnSchemasToMerge.size()); | ||
| for (IMeasurementSchema newIdColumn : newIdColumns) { | ||
| columnTypes.add(ColumnType.ID); | ||
| columnSchemas.add(newIdColumn); | ||
| } | ||
| } | ||
|
|
||
| public CompactionTableSchema copy() { | ||
| CompactionTableSchema tableSchema = new CompactionTableSchema(this.tableName); | ||
| tableSchema.columnSchemas = new ArrayList<>(this.columnSchemas); | ||
| tableSchema.columnTypes = new ArrayList<>(this.columnTypes); | ||
| return tableSchema; | ||
| } | ||
| } |
97 changes: 97 additions & 0 deletions
97
.../db/storageengine/dataregion/compaction/execute/utils/CompactionTableSchemaCollector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils; | ||
|
|
||
| import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; | ||
|
|
||
| import org.apache.tsfile.file.metadata.TableSchema; | ||
| import org.apache.tsfile.read.TsFileSequenceReader; | ||
| import org.apache.tsfile.write.schema.Schema; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class CompactionTableSchemaCollector { | ||
| private CompactionTableSchemaCollector() {} | ||
|
|
||
| public static List<Schema> collectSchema( | ||
| List<TsFileResource> seqFiles, | ||
| List<TsFileResource> unseqFiles, | ||
| Map<TsFileResource, TsFileSequenceReader> readerMap) | ||
| throws IOException { | ||
| List<Schema> targetSchemas = new ArrayList<>(seqFiles.size()); | ||
| Schema schema = | ||
| collectSchema( | ||
| Stream.concat(seqFiles.stream(), unseqFiles.stream()).collect(Collectors.toList()), | ||
| readerMap); | ||
|
|
||
| targetSchemas.add(schema); | ||
| for (int i = 1; i < seqFiles.size(); i++) { | ||
| Schema copySchema = new Schema(); | ||
| for (TableSchema tableSchema : schema.getTableSchemaMap().values()) { | ||
| copySchema.registerTableSchema(((CompactionTableSchema) tableSchema).copy()); | ||
| } | ||
| targetSchemas.add(copySchema); | ||
| } | ||
| return targetSchemas; | ||
| } | ||
|
|
||
| public static Schema collectSchema( | ||
| List<TsFileResource> sourceFiles, Map<TsFileResource, TsFileSequenceReader> readerMap) | ||
| throws IOException { | ||
| Schema targetSchema = new Schema(); | ||
| Map<String, TableSchema> targetTableSchemaMap = new HashMap<>(); | ||
| for (TsFileResource resource : sourceFiles) { | ||
| TsFileSequenceReader reader = readerMap.get(resource); | ||
| Map<String, TableSchema> tableSchemaMap = reader.readFileMetadata().getTableSchemaMap(); | ||
| if (tableSchemaMap == null) { | ||
| // v3 tsfile | ||
| continue; | ||
| } | ||
| for (Map.Entry<String, TableSchema> entry : tableSchemaMap.entrySet()) { | ||
| String tableName = entry.getKey(); | ||
| TableSchema currentTableSchema = entry.getValue(); | ||
| if (isTreeModel(currentTableSchema)) { | ||
| continue; | ||
| } | ||
| // merge all id columns, measurement schema will be generated automatically when end chunk | ||
| // group | ||
| CompactionTableSchema collectedTableSchema = | ||
| (CompactionTableSchema) targetTableSchemaMap.get(tableName); | ||
| if (collectedTableSchema == null) { | ||
| collectedTableSchema = new CompactionTableSchema(tableName); | ||
| targetTableSchemaMap.put(tableName, collectedTableSchema); | ||
| } | ||
| collectedTableSchema.merge(currentTableSchema); | ||
| } | ||
| } | ||
| targetTableSchemaMap.values().forEach(targetSchema::registerTableSchema); | ||
| return targetSchema; | ||
| } | ||
|
|
||
| private static boolean isTreeModel(TableSchema tableSchema) { | ||
| return tableSchema.getTableName().startsWith("root."); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.