[iotdb] branch rel/0.12 updated: [To 0.12][IOTDB-1690] Fix align by device type cast error (#3978)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.12 by this push:
     new 2999a67  [To 0.12][IOTDB-1690] Fix align by device type cast error (#3978)
2999a67 is described below

commit 2999a6710b90115720632ad42bc6ced1320e036a
Author: zyk990424 <38...@users.noreply.github.com>
AuthorDate: Thu Sep 16 12:42:42 2021 +0800

    [To 0.12][IOTDB-1690] Fix align by device type cast error (#3978)
---
 RELEASE_NOTES.md                                                | 1 +
 server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6c92ba9..a853ab7 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -35,6 +35,7 @@
 * [IOTDB-1677] Fix not generate file apache-iotdb-0.x.x-client-cpp-linux-x86_64-bin.zip.sha512
 * [IOTDB-1678] Fix client-cpp session bug: can cause connection leak.
 * [IOTDB-1679] client-cpp: Session descontruction need release server resource
+* [IOTDB-1690] Fix align by device type cast error
 * [ISSUE-3945] Fix Fuzzy query not support multiDevices and alignByDevice Dataset
 * fix IoTDB restart does not truncate broken ChunkGroup bug
 * fix merge ClassCastException: MeasurementMNode
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index f49fde7..704cc37 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -1131,8 +1131,9 @@ public class MManager {
       }
 
       for (MNode mNode : mNodeTemplatePair.left.getChildren().values()) {
-        MeasurementMNode measurementMNode = (MeasurementMNode) mNode;
-        res.add(measurementMNode.getSchema());
+        if (mNode instanceof MeasurementMNode) {
+          res.add(((MeasurementMNode) mNode).getSchema());
+        }
       }
 
       // template