Skip to content

Fix template restart bug #3525

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
Jul 12, 2021
Merged

Fix template restart bug #3525

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
0e70ac8
fix template restart
OneSizeFitsQuorum Jul 7, 2021
b162ff2
fix review && add test
OneSizeFitsQuorum Jul 12, 2021
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
7 changes: 5 additions & 2 deletions server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,10 +804,13 @@ public TSDataType getSeriesType(PartialPath path) throws MetadataException {

public MeasurementMNode[] getMNodes(PartialPath deviceId, String[] measurements)
throws MetadataException {
MNode deviceNode = getNodeByPath(deviceId);
MeasurementMNode[] mNodes = new MeasurementMNode[measurements.length];
for (int i = 0; i < mNodes.length; i++) {
mNodes[i] = ((MeasurementMNode) deviceNode.getChild(measurements[i]));
try {
mNodes[i] = (MeasurementMNode) getNodeByPath(deviceId.concatNode(measurements[i]));
} catch (PathNotExistException ignored) {
logger.warn("{} does not exist in {}", measurements[i], deviceId);
}
if (mNodes[i] == null && !IoTDBDescriptor.getInstance().getConfig().isEnablePartialInsert()) {
throw new MetadataException(measurements[i] + " does not exist in " + deviceId);
}
Expand Down
8 changes: 8 additions & 0 deletions server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,14 @@ public void testTemplate() throws MetadataException {
}

assertTrue(allSchema.isEmpty());

MeasurementMNode[] mNodes =
manager.getMNodes(new PartialPath("root.sg1.d1"), new String[] {"s11"});
assertNotNull(mNodes[0]);
assertEquals(mNodes[0].getSchema(), s11);

mNodes = manager.getMNodes(new PartialPath("root.sg1.d1"), new String[] {"s100"});
assertNull(mNodes[0]);
}

private CreateTemplatePlan getCreateTemplatePlan() {
Expand Down