Skip to content

Register TableSchema to TsfileWriter when recover from wal #14228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HTHou merged 2 commits into from
Nov 27, 2024
Merged

Register TableSchema to TsfileWriter when recover from wal #14228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6138d85
Register TableSchema to TsfileWriter when recover from wal
HTHou Nov 27, 2024
21df7f5
add UT
HTHou Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions ...he/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema;
import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
import org.apache.iotdb.db.storageengine.dataregion.flush.CompressionRatio;
import org.apache.iotdb.db.storageengine.dataregion.flush.MemTableFlushTask;
import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable;
Expand Down Expand Up @@ -191,16 +193,23 @@ public void redoLog(WALEntry walEntry) {
}
}
}
for (IDeviceID deviceID : memTable.getMemTableMap().keySet()) {
if (deviceID.isTableModel()) {
registerToTsFile(deviceID.getTableName());
}
}
walRedoer.resetRecoveryMemTable(memTable);
}
// update memtable's database and dataRegionId
memTable.setDatabaseAndDataRegionId(databaseName, dataRegionId);
break;
case INSERT_ROW_NODE:
case INSERT_TABLET_NODE:
registerToTsFile(((InsertNode) walEntry.getValue()).getTableName());
walRedoer.redoInsert((InsertNode) walEntry.getValue());
break;
case INSERT_ROWS_NODE:
registerToTsFile(((InsertRowsNode) walEntry.getValue()).getTableName());
walRedoer.redoInsertRows((InsertRowsNode) walEntry.getValue());
break;
case DELETE_DATA_NODE:
Expand All @@ -222,6 +231,19 @@ public void redoLog(WALEntry walEntry) {
}
}

private void registerToTsFile(String tableName) {
if (tableName != null) {
writer
.getSchema()
.getTableSchemaMap()
.computeIfAbsent(
tableName,
t ->
TableSchema.of(DataNodeTableCache.getInstance().getTable(databaseName, t))
.toTsFileTableSchemaNoAttribute());
}
}

/**
* Run last procedures to end this recovery.
*
Expand Down
47 changes: 47 additions & 0 deletions ...otdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,18 @@
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.MeasurementColumnSchema;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.DataRegionException;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode;
import org.apache.iotdb.db.queryengine.plan.statement.StatementTestUtils;
import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable;
import org.apache.iotdb.db.storageengine.dataregion.memtable.PrimitiveMemTable;
import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile;
Expand All @@ -42,6 +47,9 @@
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.file.metadata.ChunkMetadata;
import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.file.metadata.TableSchema;
import org.apache.tsfile.file.metadata.TsFileMetadata;
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.read.TsFileSequenceReader;
import org.apache.tsfile.read.common.BatchData;
Expand All @@ -66,9 +74,11 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand Down Expand Up @@ -172,6 +182,43 @@ public void testRedoInsertPlan() throws Exception {
assertTrue(new File(FILE_NAME.concat(TsFileResource.RESOURCE_SUFFIX)).exists());
}

@Test
public void testRedoRelationalInsertPlan() throws Exception {

// fake table schema
final TsTable testTable1 = new TsTable("table1");
testTable1.addColumnSchema(
new MeasurementColumnSchema("m1", TSDataType.INT32, TSEncoding.RLE, CompressionType.GZIP));
DataNodeTableCache.getInstance().preUpdateTable(SG_NAME, testTable1);
DataNodeTableCache.getInstance().commitUpdateTable(SG_NAME, "table1");
// generate crashed .tsfile
File file = new File(FILE_NAME);
Files.createDirectories(file.getParentFile().toPath());
Files.createFile(file.toPath());
// generate insertTabletNode
RelationalInsertTabletNode insertTabletNode = StatementTestUtils.genInsertTabletNode(10, 0);
int fakeMemTableId = 1;
WALEntry walEntry = new WALInfoEntry(fakeMemTableId, insertTabletNode);
// recover
tsFileResource = new TsFileResource(file);
try (UnsealedTsFileRecoverPerformer recoverPerformer =
new UnsealedTsFileRecoverPerformer(
tsFileResource, true, performer -> assertFalse(performer.canWrite()))) {
recoverPerformer.startRecovery();
assertTrue(recoverPerformer.hasCrashed());
assertTrue(recoverPerformer.canWrite());
recoverPerformer.redoLog(walEntry);
recoverPerformer.endRecovery();
}
// check file content
TsFileSequenceReader reader = new TsFileSequenceReader(FILE_NAME);
TsFileMetadata metadata = reader.readFileMetadata();
Map<String, TableSchema> tableSchemaMap = reader.readFileMetadata().getTableSchemaMap();
assertEquals(1, tableSchemaMap.size());
assertTrue(tableSchemaMap.containsKey("table1"));
reader.close();
}

@Test
public void testRedoDeletePlan() throws Exception {
// generate crashed .tsfile
Expand Down