[iotdb] branch master updated: [IOTDB-5902] fix cluster restart bug about mlog.bin (#9893)

[ericpai]

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

ericpai 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 2a456baa28b [IOTDB-5902] fix cluster restart bug about mlog.bin (#9893)
2a456baa28b is described below

commit 2a456baa28b3821ad743baaf2f647ac7fdd3dbcc
Author: Jamber <jamber...@sina.com>
AuthorDate: Tue May 23 18:24:07 2023 +0800

    [IOTDB-5902] fix cluster restart bug about mlog.bin (#9893)
---
 .../plan/schemaregion/impl/SchemaRegionPlanDeserializer.java |  8 ++++----
 .../plan/schemaregion/impl/SchemaRegionPlanSerializer.java   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanDeserializer.java
 
b/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanDeserializer.java
index d0528acae85..a251b662f22 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanDeserializer.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanDeserializer.java
@@ -159,13 +159,13 @@ public class SchemaRegionPlanDeserializer implements 
IDeserializer<ISchemaRegion
 
       List<TSDataType> dataTypes = new ArrayList<>();
       for (int i = 0; i < size; i++) {
-        dataTypes.add(TSDataType.values()[buffer.get()]);
+        dataTypes.add(TSDataType.deserialize(buffer.get()));
       }
       createAlignedTimeSeriesPlan.setDataTypes(dataTypes);
 
       List<TSEncoding> encodings = new ArrayList<>();
       for (int i = 0; i < size; i++) {
-        encodings.add(TSEncoding.values()[buffer.get()]);
+        encodings.add(TSEncoding.deserialize(buffer.get()));
       }
       createAlignedTimeSeriesPlan.setEncodings(encodings);
 
@@ -226,8 +226,8 @@ public class SchemaRegionPlanDeserializer implements 
IDeserializer<ISchemaRegion
         LOGGER.error("Cannot deserialize SchemaRegionPlan from buffer", e);
       }
 
-      createTimeSeriesPlan.setDataType(TSDataType.values()[buffer.get()]);
-      createTimeSeriesPlan.setEncoding(TSEncoding.values()[buffer.get()]);
+      createTimeSeriesPlan.setDataType(TSDataType.deserialize(buffer.get()));
+      createTimeSeriesPlan.setEncoding(TSEncoding.deserialize(buffer.get()));
       
createTimeSeriesPlan.setCompressor(CompressionType.deserialize(buffer.get()));
       createTimeSeriesPlan.setTagOffset(buffer.getLong());
 
diff --git 
a/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanSerializer.java
 
b/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanSerializer.java
index 4ac2b017f88..ee56a8b7d03 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanSerializer.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/SchemaRegionPlanSerializer.java
@@ -188,15 +188,15 @@ public class SchemaRegionPlanSerializer implements 
ISerializer<ISchemaRegionPlan
         }
 
         for (TSDataType dataType : createAlignedTimeSeriesPlan.getDataTypes()) 
{
-          dataOutputStream.writeByte(dataType.ordinal());
+          dataOutputStream.writeByte(dataType.serialize());
         }
 
         for (TSEncoding tsEncoding : 
createAlignedTimeSeriesPlan.getEncodings()) {
-          dataOutputStream.writeByte(tsEncoding.ordinal());
+          dataOutputStream.writeByte(tsEncoding.serialize());
         }
 
         for (CompressionType compressionType : 
createAlignedTimeSeriesPlan.getCompressors()) {
-          dataOutputStream.writeByte(compressionType.ordinal());
+          dataOutputStream.writeByte(compressionType.serialize());
         }
 
         for (long tagOffset : createAlignedTimeSeriesPlan.getTagOffsets()) {
@@ -253,9 +253,9 @@ public class SchemaRegionPlanSerializer implements 
ISerializer<ISchemaRegionPlan
         byte[] bytes = createTimeSeriesPlan.getPath().getFullPath().getBytes();
         dataOutputStream.writeInt(bytes.length);
         dataOutputStream.write(bytes);
-        
dataOutputStream.writeByte(createTimeSeriesPlan.getDataType().ordinal());
-        
dataOutputStream.writeByte(createTimeSeriesPlan.getEncoding().ordinal());
-        
dataOutputStream.writeByte(createTimeSeriesPlan.getCompressor().ordinal());
+        
dataOutputStream.writeByte(createTimeSeriesPlan.getDataType().serialize());
+        
dataOutputStream.writeByte(createTimeSeriesPlan.getEncoding().serialize());
+        
dataOutputStream.writeByte(createTimeSeriesPlan.getCompressor().serialize());
         dataOutputStream.writeLong(createTimeSeriesPlan.getTagOffset());
 
         // alias