)]}'
{
  "commit": "1ae10b394db1bbe2d8016e387b6969dad3472567",
  "tree": "463064ca70186965a76e945e9e36343c9860a36b",
  "parents": [
    "612d3da654fd6bb77580e8e2b1360b91e33ba7eb",
    "821291e07b46f56c4f74dc4f517ed3e0e7907fc0"
  ],
  "author": {
    "name": "Tian Jiang",
    "email": "jt2594838@163.com",
    "time": "Mon Apr 22 10:22:11 2024 +0800"
  },
  "committer": {
    "name": "Tian Jiang",
    "email": "jt2594838@163.com",
    "time": "Mon Apr 22 10:22:11 2024 +0800"
  },
  "message": "Merge branch \u0027h/TableModelWrite\u0027 into removeTsFIleModule_v4\n\n# Conflicts:\n#\tiotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/ConsumeResult.java\n#\tiotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/WriteUtils.java\n#\tiotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/AsyncClientHandler.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/SessionInfo.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/DeviceIDFactory.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/timeindex/ArrayDeviceTimeIndex.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/TsFileResourceUtils.java\n#\tiotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java\n#\tiotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionRecoverTest.java\n#\tiotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/InsertionCrossSpaceCompactionSelectorTest.java\n#\tiotdb-core/pom.xml\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IDeviceID.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/PlainDeviceID.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BinaryType.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/BooleanType.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/DoubleType.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/FloatType.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/IntType.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/LongType.java\n#\tiotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/type/Type.java\n",
  "tree_diff": []
}