fix reviewed issues

Author: shuwenwei

integration-test/src/test/java/org/apache/iotdb/db/it/orderBy/IoTDBOrderByIT.java

@@ -100,6 +100,10 @@ public class IoTDBOrderByIT {
   @BeforeClass
   public static void setUp() throws Exception {
     EnvFactory.getEnv().getConfig().getDataNodeCommonConfig().setSortBufferSize(1024 * 1024L);
+    EnvFactory.getEnv()
+        .getConfig()
+        .getDataNodeCommonConfig()
+        .setQueryMemoryProportion("1:100:200:50:200:400:200:50");
     EnvFactory.getEnv().initClusterEnvironment();
     insertData();
   }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java

@@ -163,7 +163,7 @@ public TsBlock next() throws Exception {
     boolean isFirstBatch = schemaNodeIteratorForSerialize == null;
     prepareSchemaNodeIteratorForSerialize();
     // to indicate this binary data is database info
-    ReadWriteIOUtils.write((byte) 1, baos);
+    ReadWriteIOUtils.write((byte) 2, baos);
     // the estimated mem cost to deserialize the total schema tree
     if (isFirstBatch) {
       ReadWriteIOUtils.write(schemaTreeMemCost, baos);
@@ -178,7 +178,7 @@ public TsBlock next() throws Exception {
     isFinished = !schemaNodeIteratorForSerialize.hasNext();
     if (isFinished) {
       // indicate all continuous binary data is finished
-      currentBatch[0] = 2;
+      currentBatch[0] = 3;
       releaseSchemaTree();
       baos = null;
     }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java

@@ -303,14 +303,23 @@ private void parseFetchedData(
         for (int i = 0; i < size; i++) {
           databaseSet.add(ReadWriteIOUtils.readString(inputStream));
         }
-      } else if (type == 1 || type == 2) {
+      } else if (type == 1) {
+        // for data from old version
+        ClusterSchemaTree deserializedSchemaTree = ClusterSchemaTree.deserialize(inputStream);
+        if (context != null) {
+          context.reserveMemoryForSchemaTree(deserializedSchemaTree.ramBytesUsed());
+        }
+        resultSchemaTree.mergeSchemaTree(deserializedSchemaTree);
+      } else if (type == 2 || type == 3) {
         if (deserializer.isFirstBatch()) {
           long memCost = ReadWriteIOUtils.readLong(inputStream);
-          context.reserveMemoryForSchemaTree(memCost);
+          if (context != null) {
+            context.reserveMemoryForSchemaTree(memCost);
+          }
         }
         deserializer.deserializeFromBatch(inputStream);
-        if (type == 2) {
-          // 'type == 2' indicates this batch is finished
+        if (type == 3) {
+          // 'type == 3' indicates this batch is finished
           resultSchemaTree.mergeSchemaTree(deserializer.finish());
         }
       } else {

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperatorTest.java

@@ -101,15 +101,15 @@ public void testSchemaFetchResult() throws Exception {
       Binary binary = tsBlock.getColumn(0).getBinary(0);
       InputStream inputStream = new ByteArrayInputStream(binary.getValues());
       if (!deserializer.isFirstBatch()) {
-        Assert.assertEquals(1, type);
+        Assert.assertEquals(2, type);
       }
       type = ReadWriteIOUtils.readByte(inputStream);
       if (deserializer.isFirstBatch()) {
         ReadWriteIOUtils.readLong(inputStream);
       }
       deserializer.deserializeFromBatch(inputStream);
     }
-    Assert.assertEquals(2, type);
+    Assert.assertEquals(3, type);
     Assert.assertFalse(schemaFetchScanOperator.hasNext());
     ClusterSchemaTree schemaTree = deserializer.finish();