[incubator-iotdb] branch cluster updated: update

[east]

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

east pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/cluster by this push:
     new 075e3b5  update
075e3b5 is described below

commit 075e3b5a5b9f3b13b0b8c6d3edd70ddb1c8da7f5
Author: mdf369 <952945...@qq.com>
AuthorDate: Fri Apr 19 10:25:16 2019 +0800

    update
---
 iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java 
b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java
index 22236da..8438cc6 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/MTree.java
@@ -52,6 +52,15 @@ public class MTree implements Serializable {
   private static final String NOT_SERIES_PATH = "The prefix of the seriesPath 
%s is not one storage group seriesPath";
   private MNode root;
 
+  private static final Set<String> TIMESERIES_METADATA_NAMESET = new 
HashSet<>();
+  static {
+    TIMESERIES_METADATA_NAMESET.add("DataType");
+    TIMESERIES_METADATA_NAMESET.add("Encoding");
+    TIMESERIES_METADATA_NAMESET.add("Compressor");
+    TIMESERIES_METADATA_NAMESET.add("args");
+    TIMESERIES_METADATA_NAMESET.add("StorageGroup");
+  }
+
   public MTree(String rootName) {
     this.root = new MNode(rootName, null, false);
   }
@@ -1053,6 +1062,9 @@ public class MTree implements Serializable {
 
   private static JSONObject combineJSONObjects(JSONObject a, JSONObject b) {
     JSONObject res = new JSONObject();
+    if (a.keySet().equals(TIMESERIES_METADATA_NAMESET) && 
b.keySet().equals(TIMESERIES_METADATA_NAMESET)) {
+      return a;
+    }
 
     Set<String> retainSet = new HashSet<>(a.keySet());
     retainSet.retainAll(b.keySet());