Idtable add auto inc

server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java

@@ -25,7 +25,7 @@
 import org.apache.iotdb.db.engine.memtable.IWritableMemChunk;
 import org.apache.iotdb.db.engine.memtable.IWritableMemChunkGroup;
 import org.apache.iotdb.db.exception.runtime.FlushRunTimeException;
-import org.apache.iotdb.db.metadata.idtable.entry.IDeviceID;
+import org.apache.iotdb.db.metadata.idtable.deviceID.IDeviceID;
 import org.apache.iotdb.db.rescon.SystemInfo;
 import org.apache.iotdb.db.service.metrics.MetricService;
 import org.apache.iotdb.db.service.metrics.enums.Metric;

server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java

@@ -26,8 +26,8 @@
 import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk;
 import org.apache.iotdb.db.exception.WriteProcessException;
 import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.metadata.idtable.deviceID.IDeviceID;
 import org.apache.iotdb.db.metadata.idtable.entry.DeviceIDFactory;
-import org.apache.iotdb.db.metadata.idtable.entry.IDeviceID;
 import org.apache.iotdb.db.metadata.utils.ResourceByPathUtils;
 import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;
 import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode;

server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java

@@ -25,7 +25,7 @@
 import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk;
 import org.apache.iotdb.db.exception.WriteProcessException;
 import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.metadata.idtable.entry.IDeviceID;
+import org.apache.iotdb.db.metadata.idtable.deviceID.IDeviceID;
 import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;
 import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode;
 import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan;

server/src/main/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTable.java

@@ -19,7 +19,7 @@
 
 package org.apache.iotdb.db.engine.memtable;
 
-import org.apache.iotdb.db.metadata.idtable.entry.IDeviceID;
+import org.apache.iotdb.db.metadata.idtable.deviceID.IDeviceID;
 
 import java.util.HashMap;
 import java.util.Map;

server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java

@@ -44,8 +44,8 @@
 import org.apache.iotdb.db.exception.WriteProcessException;
 import org.apache.iotdb.db.exception.WriteProcessRejectException;
 import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.metadata.idtable.deviceID.IDeviceID;
 import org.apache.iotdb.db.metadata.idtable.entry.DeviceIDFactory;
-import org.apache.iotdb.db.metadata.idtable.entry.IDeviceID;
 import org.apache.iotdb.db.metadata.path.AlignedPath;
 import org.apache.iotdb.db.metadata.utils.ResourceByPathUtils;
 import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;

server/src/main/java/org/apache/iotdb/db/metadata/idtable/AppendOnlyDiskSchemaManager.java

@@ -21,6 +21,7 @@
 
 import org.apache.iotdb.commons.exception.MetadataException;
 import org.apache.iotdb.commons.utils.TestOnly;
+import org.apache.iotdb.db.metadata.idtable.deviceID.IStatefulDeviceID;
 import org.apache.iotdb.db.metadata.idtable.entry.DeviceIDFactory;
 import org.apache.iotdb.db.metadata.idtable.entry.DiskSchemaEntry;
 import org.apache.iotdb.db.metadata.idtable.entry.SchemaEntry;
@@ -38,6 +39,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -158,11 +160,29 @@ public void recover(IDTable idTable) {
                   TSEncoding.deserialize(cur.encoding),
                   CompressionType.deserialize(cur.compressor),
                   loc);
+          if (IStatefulDeviceID.class.isAssignableFrom(
+              DeviceIDFactory.getInstance().getDeviceIDClass())) {
+            IStatefulDeviceID statefulDeviceID =
+                (IStatefulDeviceID)
+                    DeviceIDFactory.getInstance()
+                        .getDeviceIDClass()
+                        .getDeclaredConstructor()
+                        .newInstance();
+            statefulDeviceID.recover(
+                cur.seriesKey.substring(
+                    0, cur.seriesKey.length() - cur.measurementName.length() - 1),
+                cur.deviceID);
+          }
           idTable.putSchemaEntry(cur.deviceID, cur.measurementName, schemaEntry, cur.isAligned);
         }
         loc += cur.entrySize;
       }
-    } catch (IOException | MetadataException e) {
+    } catch (IOException
+        | MetadataException
+        | NoSuchMethodException
+        | InvocationTargetException
+        | InstantiationException
+        | IllegalAccessException e) {
       logger.info("Last entry is incomplete, we will recover as much as we can.");
       try {
         outputStream.getChannel().truncate(loc);

server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java

@@ -24,10 +24,10 @@
 import org.apache.iotdb.commons.utils.TestOnly;
 import org.apache.iotdb.db.conf.IoTDBConfig;
 import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.db.metadata.idtable.deviceID.IDeviceID;
 import org.apache.iotdb.db.metadata.idtable.entry.DeviceEntry;
 import org.apache.iotdb.db.metadata.idtable.entry.DeviceIDFactory;
 import org.apache.iotdb.db.metadata.idtable.entry.DiskSchemaEntry;
-import org.apache.iotdb.db.metadata.idtable.entry.IDeviceID;
 import org.apache.iotdb.db.metadata.idtable.entry.SchemaEntry;
 import org.apache.iotdb.db.metadata.idtable.entry.TimeseriesID;
 import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode;

server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableHashmapImpl.java

@@ -25,10 +25,10 @@
 import org.apache.iotdb.db.conf.IoTDBConfig;
 import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException;
+import org.apache.iotdb.db.metadata.idtable.deviceID.IDeviceID;
 import org.apache.iotdb.db.metadata.idtable.entry.DeviceEntry;
 import org.apache.iotdb.db.metadata.idtable.entry.DeviceIDFactory;
 import org.apache.iotdb.db.metadata.idtable.entry.DiskSchemaEntry;
-import org.apache.iotdb.db.metadata.idtable.entry.IDeviceID;
 import org.apache.iotdb.db.metadata.idtable.entry.InsertMeasurementMNode;
 import org.apache.iotdb.db.metadata.idtable.entry.SchemaEntry;
 import org.apache.iotdb.db.metadata.idtable.entry.TimeseriesID;

server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/IDeviceID.java → server/src/main/java/org/apache/iotdb/db/metadata/idtable/deviceID/IDeviceID.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.iotdb.db.metadata.idtable.entry;
+package org.apache.iotdb.db.metadata.idtable.deviceID;
 
 import java.nio.ByteBuffer;
 
@@ -29,7 +29,7 @@ public interface IDeviceID {
    *
    * @return string format device id
    */
-  public String toStringID();
+  String toStringID();
 
-  public void serialize(ByteBuffer byteBuffer);
+  void serialize(ByteBuffer byteBuffer);
 }

server/src/main/java/org/apache/iotdb/db/metadata/idtable/deviceID/IStatefulDeviceID.java

@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.metadata.idtable.deviceID;
+
+/** stateful device id interface */
+public interface IStatefulDeviceID extends IDeviceID {
+
+  /**
+   * recover state from devicePath and deviceID
+   *
+   * @param devicePath device path read from the non-volatile storage medium, like: "root.sg.x.d1"
+   * @param deviceID device ID read from the non-volatile storage medium
+   */
+  void recover(String devicePath, String deviceID);
+}

server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/PlainDeviceID.java → server/src/main/java/org/apache/iotdb/db/metadata/idtable/deviceID/PlainDeviceID.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.iotdb.db.metadata.idtable.entry;
+package org.apache.iotdb.db.metadata.idtable.deviceID;
 
 import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
 

server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/SHA256DeviceID.java → server/src/main/java/org/apache/iotdb/db/metadata/idtable/deviceID/SHA256DeviceID.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.db.metadata.idtable.entry;
+package org.apache.iotdb.db.metadata.idtable.deviceID;
 
 import org.apache.iotdb.db.metadata.idtable.IDTable;
 import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;

server/src/main/java/org/apache/iotdb/db/metadata/idtable/deviceID/StandAloneAutoIncDeviceID.java

@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.metadata.idtable.deviceID;
+
+import org.apache.iotdb.commons.utils.TestOnly;
+import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/** Using auto-incrementing int as device id */
+public class StandAloneAutoIncDeviceID implements IStatefulDeviceID {
+
+  // maintain the mapping relationship of devicePath to autoIncrementID，in order reducing memory
+  // consumption, the devicePath will actually be converted to SHA256DeviceID in advance
+  private static final Map<SHA256DeviceID, StandAloneAutoIncDeviceID> devicePath2autoIncrementID;
+
+  // increment from 0
+  int autoIncrementID;
+
+  static {
+    devicePath2autoIncrementID = new ConcurrentHashMap<>();
+  }
+
+  public StandAloneAutoIncDeviceID() {}
+
+  public StandAloneAutoIncDeviceID(int id) {
+    this.autoIncrementID = id;
+  }
+
+  public StandAloneAutoIncDeviceID(String deviceID) {
+    // if the device id string is a autoIncrementDeviceID form, like: "`1`",
+    // convert string directly to autoIncrementID
+    if (deviceID.startsWith("`") && deviceID.endsWith("`")) {
+      fromAutoIncrementDeviceID(deviceID);
+    } else {
+      buildAutoIncrementDeviceID(deviceID);
+    }
+  }
+
+  /**
+   * convert string directly to autoIncrementID
+   *
+   * @param deviceID device ID， like: "`1`"
+   */
+  private void fromAutoIncrementDeviceID(String deviceID) {
+    deviceID = deviceID.substring(1, deviceID.length() - 1);
+    this.autoIncrementID = Integer.parseInt(deviceID);
+  }
+
+  /**
+   * build device id from a device path
+   *
+   * @param devicePath device path, like: "root.sg.x.d1"
+   */
+  private void buildAutoIncrementDeviceID(String devicePath) {
+    SHA256DeviceID sha256DeviceID = new SHA256DeviceID(devicePath);
+    this.autoIncrementID =
+        devicePath2autoIncrementID.computeIfAbsent(
+                sha256DeviceID,
+                sha256DeviceID1 -> new StandAloneAutoIncDeviceID(devicePath2autoIncrementID.size()))
+            .autoIncrementID;
+  }
+
+  /**
+   * make sure the hashcode of any AutoIncrementDeviceID object with the equal autoIncrementID are
+   * equal,so use the autoIncrementID of type Long as the hashcode of the object
+   */
+  @Override
+  public int hashCode() {
+    return this.autoIncrementID;
+  }
+
+  /** make sure any AutoIncrementDeviceID objects with equal autoIncrementID variables are equal */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof StandAloneAutoIncDeviceID)) {
+      return false;
+    }
+    StandAloneAutoIncDeviceID that = (StandAloneAutoIncDeviceID) o;
+    return this.autoIncrementID == that.autoIncrementID;
+  }
+
+  @Override
+  public String toString() {
+    return "AutoIncrementDeviceID{" + "autoIncrementID=" + autoIncrementID + '}';
+  }
+
+  /**
+   * to string format
+   *
+   * @return string format device id
+   */
+  @Override
+  public String toStringID() {
+    return "`" + autoIncrementID + "`";
+  }
+
+  /**
+   * recover map devicePath2autoIncrementID
+   *
+   * @param devicePath device path read from the non-volatile storage medium, like: "root.sg.x.d1"
+   * @param deviceID device ID read from the non-volatile storage medium, like: ""
+   */
+  @Override
+  public void recover(String devicePath, String deviceID) {
+    SHA256DeviceID sha256DeviceID = new SHA256DeviceID(devicePath);
+    fromAutoIncrementDeviceID(deviceID);
+    devicePath2autoIncrementID.put(sha256DeviceID, this);
+  }
+
+  @TestOnly
+  public static void reset() {
+    devicePath2autoIncrementID.clear();
+  }
+
+  @Override
+  public void serialize(ByteBuffer byteBuffer) {
+    ReadWriteIOUtils.write(autoIncrementID, byteBuffer);
+  }
+
+  public static StandAloneAutoIncDeviceID deserialize(ByteBuffer byteBuffer) {
+    StandAloneAutoIncDeviceID autoIncrementDeviceID = new StandAloneAutoIncDeviceID();
+    autoIncrementDeviceID.autoIncrementID = ReadWriteIOUtils.readInt(byteBuffer);
+    return autoIncrementDeviceID;
+  }
+}

server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/DeviceEntry.java

@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.db.metadata.idtable.entry;
 
+import org.apache.iotdb.db.metadata.idtable.deviceID.IDeviceID;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;