You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2023/01/04 14:22:35 UTC
[iotdb] 01/01: remove conflict code
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/rel1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 224ec12354b1725916a981c18e410a73349d8476
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed Jan 4 22:22:16 2023 +0800
remove conflict code
---
.../java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
index 986d9be6c2..2b76fa13e5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
@@ -118,7 +118,6 @@ public class ColumnHeaderConstant {
public static final String DATA_NODE_ID = "DataNodeId";
public static final String SERIES_SLOT_ID = "SeriesSlotId";
public static final String TIME_SLOT_ID = "TimeSlotId";
- public static final String SERIES_SLOT_NUM = "SeriesSlotNum";
public static final String TIME_SLOT_NUM = "TimeSlotNum";
public static final String ROLE = "Role";