[iotdb] branch fix_merge_template created (now 81d38ac)

[ta...@apache.org]

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

tanxinyu pushed a change to branch fix_merge_template
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


      at 81d38ac  fix

This branch includes the following new commits:

     new 81d38ac  fix

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[iotdb] 01/01: fix

[ta...@apache.org]

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

tanxinyu pushed a commit to branch fix_merge_template
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 81d38ace8d943e484e53608df847e6fdf3e4cd66
Author: LebronAl <TX...@gmail.com>
AuthorDate: Tue Jul 13 19:34:53 2021 +0800

    fix
---
 server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 5 +++++
 1 file changed, 5 insertions(+)

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 1968453..e4c3d03 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
@@ -1112,6 +1112,11 @@ public class MManager {
       throws MetadataException {
     MNode deviceMNode = getDeviceNode(device);
     MeasurementMNode measurementMNode = (MeasurementMNode) deviceMNode.getChild(measurement);
+    if (measurementMNode == null) {
+      // Just for the initial adaptation of the template functionality and merge functionality
+      // The getSeriesSchema interface needs to be cleaned up later
+      return getSeriesSchema(device.concatNode(measurement));
+    }
     return measurementMNode.getSchema();
   }