[iotdb] branch master updated: [IOTDB-1483]Temporarily adapt the template functionality and merge functionality (#3560)

[haonan]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5e020b5  [IOTDB-1483]Temporarily adapt the template functionality and 
merge functionality (#3560)
5e020b5 is described below

commit 5e020b5880a97c8530b39986b504c5f28fcbcd33
Author: Potato <txypot...@gmail.com>
AuthorDate: Tue Jul 13 21:37:17 2021 +0800

    [IOTDB-1483]Temporarily adapt the template functionality and merge 
functionality (#3560)
---
 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();
   }