fix

Author: Caideyipi

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableFlushTaskTest.java

@@ -41,7 +41,7 @@
 public class MemTableFlushTaskTest {
 
   private RestorableTsFileIOWriter writer;
-  private String storageGroup = "storage_group1";
+  private String database = "database1";
   private String dataRegionId = "1";
   private String filePath =
       TestConstant.OUTPUT_DATA_DIR.concat("testUnsealedTsFileProcessor.tsfile");
@@ -53,7 +53,7 @@ public class MemTableFlushTaskTest {
   public void setUp() throws Exception {
     EnvironmentUtils.envSetUp();
     writer = new RestorableTsFileIOWriter(FSFactoryProducer.getFSFactory().getFile(filePath));
-    memTable = new PrimitiveMemTable(storageGroup, dataRegionId);
+    memTable = new PrimitiveMemTable(database, dataRegionId);
   }
 
   @After
@@ -74,7 +74,7 @@ public void testFlushMemTable()
         MemTableTestUtils.measurementId0,
         MemTableTestUtils.dataType0);
     MemTableFlushTask memTableFlushTask =
-        new MemTableFlushTask(memTable, writer, storageGroup, dataRegionId);
+        new MemTableFlushTask(memTable, writer, database, dataRegionId);
     assertTrue(
         writer
             .getVisibleMetadataList(
@@ -111,7 +111,7 @@ public void testFlushVectorMemTable()
       throws ExecutionException, InterruptedException, IllegalPathException, WriteProcessException {
     MemTableTestUtils.produceVectorData(memTable);
     MemTableFlushTask memTableFlushTask =
-        new MemTableFlushTask(memTable, writer, storageGroup, dataRegionId);
+        new MemTableFlushTask(memTable, writer, database, dataRegionId);
     assertTrue(
         writer
             .getVisibleMetadataList(MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN)
@@ -139,7 +139,7 @@ public void testFlushNullableVectorMemTable()
       throws ExecutionException, InterruptedException, IllegalPathException, WriteProcessException {
     MemTableTestUtils.produceNullableVectorData(memTable);
     MemTableFlushTask memTableFlushTask =
-        new MemTableFlushTask(memTable, writer, storageGroup, dataRegionId);
+        new MemTableFlushTask(memTable, writer, database, dataRegionId);
     assertTrue(
         writer
             .getVisibleMetadataList(MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN)

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java

@@ -19,7 +19,6 @@
 
 package org.apache.iotdb.commons.schema;
 
-import org.apache.iotdb.commons.conf.IoTDBConstant;
 import org.apache.iotdb.commons.path.PartialPath;
 import org.apache.iotdb.commons.path.PathPatternTree;
 import org.apache.iotdb.commons.path.fa.dfa.PatternDFA;
@@ -33,22 +32,10 @@ private SchemaConstant() {
     // allowed to do nothing
   }
 
-  public static final String MTREE_PREFIX = "mtree";
-  private static final String MTREE_VERSION = "1";
-  public static final String MTREE_TXT_SNAPSHOT_OLD_VERSION =
-      MTREE_PREFIX + IoTDBConstant.FILE_NAME_SEPARATOR + MTREE_VERSION + ".snapshot";
-  public static final String MTREE_SNAPSHOT_OLD_VERSION =
-      MTREE_PREFIX + IoTDBConstant.FILE_NAME_SEPARATOR + MTREE_VERSION + ".snapshot.bin";
-  public static final String MTREE_SNAPSHOT_TMP_OLDVERSION =
-      MTREE_PREFIX + IoTDBConstant.FILE_NAME_SEPARATOR + MTREE_VERSION + ".snapshot.bin.tmp";
-
   public static final String ROOT = "root";
-  public static final String METADATA_TXT_LOG = "mlog.txt";
   public static final String METADATA_LOG = "mlog.bin";
   public static final String METADATA_LOG_DESCRIPTION = "mlog.description";
   public static final String TAG_LOG = "tlog.txt";
-  public static final String TEMPLATE_FILE = "template_log.bin";
-  public static final String STORAGE_GROUP_LOG = "storage_group_log.bin";
   public static final String PBTREE_FILE_NAME = "pbtree.pst";
   public static final String PBTREE_LOG_FILE_NAME = "pbtree_log.bin";
 
@@ -110,9 +97,6 @@ private SchemaConstant() {
 
   public static final String TABLE_MNODE_TYPE_NAME = "TableMNode";
 
-  public static final String SCHEMA_REGION_METRIC_NAME = "schema_region";
-  public static final String SCHEMA_ENGINE_METRIC_NAME = "pbtree";
-
   public static final String DEFAULT_SCHEMA_ENGINE_MODE = "Memory";
   public static final String DEFAULT_MNODE_FACTORY_ENV = "IoTDB";
 

iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PartialPathTest.java

@@ -139,9 +139,9 @@ public void testLegalPath() throws IllegalPathException {
     nodes = new String[] {"root", "sg", "abc"};
     checkNodes(nodes, t.getNodes());
 
-    PartialPath u = new PartialPath("root.db.set_storage_group");
-    Assert.assertEquals("root.db.set_storage_group", u.getFullPath());
-    nodes = new String[] {"root", "sg", "set_storage_group"};
+    PartialPath u = new PartialPath("root.db.set_database");
+    Assert.assertEquals("root.db.set_database", u.getFullPath());
+    nodes = new String[] {"root", "sg", "set_database"};
     checkNodes(nodes, u.getNodes());
   }