This is an automated email from the ASF dual-hosted git repository.
justinchen 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 c72f67e80bf Pipe: Banned the audit / system DB from configNode sync
(#16592)
c72f67e80bf is described below
commit c72f67e80bf2bc8ca0b2bb81267f945fa2c281c3
Author: Caideyipi <[email protected]>
AuthorDate: Thu Oct 16 14:22:01 2025 +0800
Pipe: Banned the audit / system DB from configNode sync (#16592)
---
.../org/apache/iotdb/db/it/utils/TestUtils.java | 9 +++++
.../treemodel/manual/IoTDBPipeInclusionIT.java | 46 +++++++++++-----------
.../pipe/source/ConfigRegionListeningFilter.java | 20 ++++++++++
.../schema/CNPhysicalPlanGenerator.java | 19 +++++----
.../confignode/persistence/schema/ConfigMTree.java | 8 ++--
.../impl/mem/snapshot/MemMTreeSnapshotUtil.java | 6 +--
.../db/tools/schema/SRStatementGenerator.java | 4 +-
.../iotdb/commons/schema/SchemaConstant.java | 6 +--
8 files changed, 76 insertions(+), 42 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
index 0f772036ce0..31c9b49bc38 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
@@ -1104,6 +1104,10 @@ public class TestUtils {
}
}
+ public static boolean tryExecuteNonQuery(BaseEnv env, String sql) {
+ return tryExecuteNonQuery(env, sql, null);
+ }
+
public static boolean tryExecuteNonQuery(BaseEnv env, String sql, Connection
defaultConnection) {
return tryExecuteNonQuery(
env, sql, SessionConfig.DEFAULT_USER, SessionConfig.DEFAULT_PASSWORD,
defaultConnection);
@@ -1115,6 +1119,11 @@ public class TestUtils {
env, Collections.singletonList(sql), userName, password,
defaultConnection);
}
+ public static boolean tryExecuteNonQueriesWithRetry(BaseEnv env,
List<String> sqlList) {
+ return tryExecuteNonQueriesWithRetry(
+ env, sqlList, SessionConfig.DEFAULT_USER,
SessionConfig.DEFAULT_PASSWORD, null);
+ }
+
public static boolean tryExecuteNonQueriesWithRetry(
BaseEnv env,
List<String> sqlList,
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
index c58a3ef6010..4d98ebee37f 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeInclusionIT.java
@@ -51,20 +51,20 @@ public class IoTDBPipeInclusionIT extends
AbstractPipeDualTreeModelManualIT {
try (final SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient)
senderEnv.getLeaderConfigNodeConnection()) {
- final Map<String, String> extractorAttributes = new HashMap<>();
+ final Map<String, String> sourceAttributes = new HashMap<>();
final Map<String, String> processorAttributes = new HashMap<>();
- final Map<String, String> connectorAttributes = new HashMap<>();
+ final Map<String, String> sinkAttributes = new HashMap<>();
- extractorAttributes.put("extractor.inclusion", "schema");
+ sourceAttributes.put("source.inclusion", "schema");
- connectorAttributes.put("connector", "iotdb-thrift-connector");
- connectorAttributes.put("connector.ip", receiverIp);
- connectorAttributes.put("connector.port",
Integer.toString(receiverPort));
+ sinkAttributes.put("sink", "iotdb-thrift-sink");
+ sinkAttributes.put("sink.ip", receiverIp);
+ sinkAttributes.put("sink.port", Integer.toString(receiverPort));
final TSStatus status =
client.createPipe(
- new TCreatePipeReq("testPipe", connectorAttributes)
- .setExtractorAttributes(extractorAttributes)
+ new TCreatePipeReq("testPipe", sinkAttributes)
+ .setExtractorAttributes(sourceAttributes)
.setProcessorAttributes(processorAttributes));
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(),
status.getCode());
@@ -113,18 +113,18 @@ public class IoTDBPipeInclusionIT extends
AbstractPipeDualTreeModelManualIT {
(SyncConfigNodeIServiceClient)
senderEnv.getLeaderConfigNodeConnection()) {
final Map<String, String> extractorAttributes = new HashMap<>();
final Map<String, String> processorAttributes = new HashMap<>();
- final Map<String, String> connectorAttributes = new HashMap<>();
+ final Map<String, String> sinkAttributes = new HashMap<>();
extractorAttributes.put("extractor.inclusion", "all");
extractorAttributes.put("extractor.inclusion.exclusion", "auth");
- connectorAttributes.put("connector", "iotdb-thrift-connector");
- connectorAttributes.put("connector.ip", receiverIp);
- connectorAttributes.put("connector.port",
Integer.toString(receiverPort));
+ sinkAttributes.put("sink", "iotdb-thrift-sink");
+ sinkAttributes.put("sink.ip", receiverIp);
+ sinkAttributes.put("sink.port", Integer.toString(receiverPort));
final TSStatus status =
client.createPipe(
- new TCreatePipeReq("testPipe", connectorAttributes)
+ new TCreatePipeReq("testPipe", sinkAttributes)
.setExtractorAttributes(extractorAttributes)
.setProcessorAttributes(processorAttributes));
@@ -151,18 +151,18 @@ public class IoTDBPipeInclusionIT extends
AbstractPipeDualTreeModelManualIT {
(SyncConfigNodeIServiceClient)
senderEnv.getLeaderConfigNodeConnection()) {
final Map<String, String> extractorAttributes = new HashMap<>();
final Map<String, String> processorAttributes = new HashMap<>();
- final Map<String, String> connectorAttributes = new HashMap<>();
+ final Map<String, String> sinkAttributes = new HashMap<>();
extractorAttributes.put("extractor.inclusion", "auth");
extractorAttributes.put("path", "root.ln.**");
- connectorAttributes.put("connector", "iotdb-thrift-connector");
- connectorAttributes.put("connector.ip", receiverIp);
- connectorAttributes.put("connector.port",
Integer.toString(receiverPort));
+ sinkAttributes.put("sink", "iotdb-thrift-sink");
+ sinkAttributes.put("sink.ip", receiverIp);
+ sinkAttributes.put("sink.port", Integer.toString(receiverPort));
final TSStatus status =
client.createPipe(
- new TCreatePipeReq("testPipe", connectorAttributes)
+ new TCreatePipeReq("testPipe", sinkAttributes)
.setExtractorAttributes(extractorAttributes)
.setProcessorAttributes(processorAttributes));
@@ -203,17 +203,17 @@ public class IoTDBPipeInclusionIT extends
AbstractPipeDualTreeModelManualIT {
(SyncConfigNodeIServiceClient)
senderEnv.getLeaderConfigNodeConnection()) {
final Map<String, String> extractorAttributes = new HashMap<>();
final Map<String, String> processorAttributes = new HashMap<>();
- final Map<String, String> connectorAttributes = new HashMap<>();
+ final Map<String, String> sinkAttributes = new HashMap<>();
extractorAttributes.put("extractor.inclusion", "data.delete");
- connectorAttributes.put("connector", "iotdb-thrift-connector");
- connectorAttributes.put("connector.ip", receiverIp);
- connectorAttributes.put("connector.port",
Integer.toString(receiverPort));
+ sinkAttributes.put("sink", "iotdb-thrift-sink");
+ sinkAttributes.put("sink.ip", receiverIp);
+ sinkAttributes.put("sink.port", Integer.toString(receiverPort));
final TSStatus status =
client.createPipe(
- new TCreatePipeReq("testPipe", connectorAttributes)
+ new TCreatePipeReq("testPipe", sinkAttributes)
.setExtractorAttributes(extractorAttributes)
.setProcessorAttributes(processorAttributes));
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningFilter.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningFilter.java
index b21afa42a42..edec328a723 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningFilter.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/ConfigRegionListeningFilter.java
@@ -23,8 +23,11 @@ import
org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern;
import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern;
+import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;
+import
org.apache.iotdb.confignode.consensus.request.write.database.DatabaseSchemaPlan;
+import
org.apache.iotdb.confignode.consensus.request.write.database.DeleteDatabasePlan;
import
org.apache.iotdb.confignode.consensus.request.write.template.CommitSetSchemaTemplatePlan;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
@@ -248,6 +251,23 @@ public class ConfigRegionListeningFilter {
return false;
}
+ // system / audit DB
+ if (type.equals(ConfigPhysicalPlanType.DeleteDatabase)
+ && (((DeleteDatabasePlan)
plan).getName().equals(SchemaConstant.AUDIT_DATABASE)
+ || ((DeleteDatabasePlan)
plan).getName().equals(SchemaConstant.SYSTEM_DATABASE))
+ || (type.equals(ConfigPhysicalPlanType.CreateDatabase)
+ || type.equals(ConfigPhysicalPlanType.AlterDatabase))
+ && (((DatabaseSchemaPlan) plan)
+ .getSchema()
+ .getName()
+ .equals(SchemaConstant.SYSTEM_DATABASE)
+ || ((DatabaseSchemaPlan) plan)
+ .getSchema()
+ .getName()
+ .equals(SchemaConstant.AUDIT_DATABASE))) {
+ return false;
+ }
+
// PipeEnriched & UnsetTemplate are not listened directly,
// but their inner plan or converted plan are listened.
return type.equals(ConfigPhysicalPlanType.PipeEnriched)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/CNPhysicalPlanGenerator.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/CNPhysicalPlanGenerator.java
index 87b7f685096..711c1215540 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/CNPhysicalPlanGenerator.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/CNPhysicalPlanGenerator.java
@@ -23,6 +23,7 @@ import
org.apache.iotdb.commons.auth.entity.PrivilegeModelType;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.SchemaConstant;
import org.apache.iotdb.commons.schema.node.role.IDatabaseMNode;
import org.apache.iotdb.commons.schema.node.utils.IMNodeFactory;
import org.apache.iotdb.commons.schema.table.TsTable;
@@ -41,6 +42,7 @@ import
org.apache.iotdb.confignode.consensus.request.write.template.CreateSchema
import org.apache.iotdb.confignode.persistence.schema.mnode.IConfigMNode;
import
org.apache.iotdb.confignode.persistence.schema.mnode.factory.ConfigMNodeFactory;
import
org.apache.iotdb.confignode.persistence.schema.mnode.impl.ConfigTableNode;
+import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.schemaengine.template.Template;
import org.apache.commons.io.IOUtils;
@@ -72,8 +74,8 @@ import java.util.Set;
import java.util.Stack;
import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_ROOT;
+import static
org.apache.iotdb.commons.schema.SchemaConstant.DATABASE_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.INTERNAL_MNODE_TYPE;
-import static
org.apache.iotdb.commons.schema.SchemaConstant.STORAGE_GROUP_MNODE_TYPE;
import static org.apache.iotdb.commons.schema.SchemaConstant.TABLE_MNODE_TYPE;
import static org.apache.iotdb.commons.utils.IOUtils.readString;
@@ -440,7 +442,7 @@ public class CNPhysicalPlanGenerator
final Set<TsTable> tableSet = new HashSet<>();
- if (type == STORAGE_GROUP_MNODE_TYPE) {
+ if (type == DATABASE_MNODE_TYPE) {
databaseMNode = deserializeDatabaseMNode(bufferedInputStream);
name = databaseMNode.getName();
stack.push(new Pair<>(databaseMNode, true));
@@ -472,7 +474,7 @@ public class CNPhysicalPlanGenerator
stack.push(new Pair<>(internalMNode, hasDB));
name = internalMNode.getName();
break;
- case STORAGE_GROUP_MNODE_TYPE:
+ case DATABASE_MNODE_TYPE:
databaseMNode =
deserializeDatabaseMNode(bufferedInputStream).getAsMNode();
while (!stack.isEmpty() && !stack.peek().right) {
databaseMNode.addChild(stack.pop().left);
@@ -548,10 +550,13 @@ public class CNPhysicalPlanGenerator
templateNodeList.add((IConfigMNode) databaseMNode);
}
- final DatabaseSchemaPlan createDBPlan =
- new DatabaseSchemaPlan(
- ConfigPhysicalPlanType.CreateDatabase,
databaseMNode.getAsMNode().getDatabaseSchema());
- planDeque.add(createDBPlan);
+ final TDatabaseSchema schema =
databaseMNode.getAsMNode().getDatabaseSchema();
+ if (!schema.getName().equals(SchemaConstant.AUDIT_DATABASE)
+ && !schema.getName().equals(SchemaConstant.SYSTEM_DATABASE)) {
+ final DatabaseSchemaPlan createDBPlan =
+ new DatabaseSchemaPlan(ConfigPhysicalPlanType.CreateDatabase,
schema);
+ planDeque.add(createDBPlan);
+ }
return databaseMNode.getAsMNode();
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
index 18d57535339..36c4ccc2f05 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
@@ -91,10 +91,10 @@ import static
org.apache.iotdb.commons.conf.IoTDBConstant.PATH_ROOT;
import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_SCOPE;
import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES;
import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_TEMPLATE;
+import static
org.apache.iotdb.commons.schema.SchemaConstant.DATABASE_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.INTERNAL_MNODE_TYPE;
import static org.apache.iotdb.commons.schema.SchemaConstant.NON_TEMPLATE;
import static org.apache.iotdb.commons.schema.SchemaConstant.ROOT;
-import static
org.apache.iotdb.commons.schema.SchemaConstant.STORAGE_GROUP_MNODE_TYPE;
import static org.apache.iotdb.commons.schema.SchemaConstant.TABLE_MNODE_TYPE;
import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME;
@@ -1070,7 +1070,7 @@ public class ConfigMTree {
throws IOException {
serializeChildren(storageGroupNode.getAsMNode(), outputStream);
- ReadWriteIOUtils.write(STORAGE_GROUP_MNODE_TYPE, outputStream);
+ ReadWriteIOUtils.write(DATABASE_MNODE_TYPE, outputStream);
ReadWriteIOUtils.write(storageGroupNode.getName(), outputStream);
ReadWriteIOUtils.write(storageGroupNode.getAsMNode().getSchemaTemplateId(),
outputStream);
ThriftConfigNodeSerDeUtils.serializeTDatabaseSchema(
@@ -1100,7 +1100,7 @@ public class ConfigMTree {
IConfigMNode internalMNode;
IConfigMNode tableNode;
- if (type == STORAGE_GROUP_MNODE_TYPE) {
+ if (type == DATABASE_MNODE_TYPE) {
databaseMNode = deserializeDatabaseMNode(inputStream);
name = databaseMNode.getName();
stack.push(new Pair<>(databaseMNode, true));
@@ -1132,7 +1132,7 @@ public class ConfigMTree {
stack.push(new Pair<>(internalMNode, hasDB));
name = internalMNode.getName();
break;
- case STORAGE_GROUP_MNODE_TYPE:
+ case DATABASE_MNODE_TYPE:
databaseMNode = deserializeDatabaseMNode(inputStream).getAsMNode();
while (!stack.isEmpty() && Boolean.FALSE.equals(stack.peek().right))
{
databaseMNode.addChild(stack.pop().left);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/snapshot/MemMTreeSnapshotUtil.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/snapshot/MemMTreeSnapshotUtil.java
index 2977c7be3fe..71d78712afb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/snapshot/MemMTreeSnapshotUtil.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/snapshot/MemMTreeSnapshotUtil.java
@@ -56,12 +56,12 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
+import static
org.apache.iotdb.commons.schema.SchemaConstant.DATABASE_MNODE_TYPE;
import static org.apache.iotdb.commons.schema.SchemaConstant.ENTITY_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.INTERNAL_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.LOGICAL_VIEW_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.MEASUREMENT_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.STORAGE_GROUP_ENTITY_MNODE_TYPE;
-import static
org.apache.iotdb.commons.schema.SchemaConstant.STORAGE_GROUP_MNODE_TYPE;
import static org.apache.iotdb.commons.schema.SchemaConstant.TABLE_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.isStorageGroupType;
@@ -249,7 +249,7 @@ public class MemMTreeSnapshotUtil {
currentTableName.set(node.getName());
}
break;
- case STORAGE_GROUP_MNODE_TYPE:
+ case DATABASE_MNODE_TYPE:
childrenNum = ReadWriteIOUtils.readInt(inputStream);
node = deserializer.deserializeStorageGroupMNode(inputStream);
break;
@@ -353,7 +353,7 @@ public class MemMTreeSnapshotUtil {
// database node in schemaRegion doesn't store any database schema
return true;
} else {
- ReadWriteIOUtils.write(STORAGE_GROUP_MNODE_TYPE, outputStream);
+ ReadWriteIOUtils.write(DATABASE_MNODE_TYPE, outputStream);
serializeBasicMNode(node.getBasicMNode(), outputStream);
ReadWriteIOUtils.write(0, outputStream); // for compatibly
ReadWriteIOUtils.write(false, outputStream); // for compatibly
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/schema/SRStatementGenerator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/schema/SRStatementGenerator.java
index d3e24d6eb6d..239b55b521b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/schema/SRStatementGenerator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/schema/SRStatementGenerator.java
@@ -71,12 +71,12 @@ import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.stream.Collectors;
+import static
org.apache.iotdb.commons.schema.SchemaConstant.DATABASE_MNODE_TYPE;
import static org.apache.iotdb.commons.schema.SchemaConstant.ENTITY_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.INTERNAL_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.LOGICAL_VIEW_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.MEASUREMENT_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.STORAGE_GROUP_ENTITY_MNODE_TYPE;
-import static
org.apache.iotdb.commons.schema.SchemaConstant.STORAGE_GROUP_MNODE_TYPE;
import static org.apache.iotdb.commons.schema.SchemaConstant.TABLE_MNODE_TYPE;
import static
org.apache.iotdb.commons.schema.SchemaConstant.isStorageGroupType;
import static
org.apache.iotdb.db.schemaengine.schemaregion.tag.TagLogFile.parseByteBuffer;
@@ -287,7 +287,7 @@ public class SRStatementGenerator implements
Iterator<Object>, Iterable<Object>
this.tableName = node.getName();
}
break;
- case STORAGE_GROUP_MNODE_TYPE:
+ case DATABASE_MNODE_TYPE:
childrenNum = ReadWriteIOUtils.readInt(inputStream);
node = deserializer.deserializeStorageGroupMNode(inputStream);
break;
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java
index 4f46de7a083..2edece1c76d 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/SchemaConstant.java
@@ -91,7 +91,7 @@ public class SchemaConstant {
public static final int ALL_TEMPLATE = -2;
public static final byte INTERNAL_MNODE_TYPE = 0;
- public static final byte STORAGE_GROUP_MNODE_TYPE = 1;
+ public static final byte DATABASE_MNODE_TYPE = 1;
public static final byte MEASUREMENT_MNODE_TYPE = 2;
public static final byte ENTITY_MNODE_TYPE = 3;
public static final byte STORAGE_GROUP_ENTITY_MNODE_TYPE = 4;
@@ -120,7 +120,7 @@ public class SchemaConstant {
switch (type) {
case INTERNAL_MNODE_TYPE:
return INTERNAL_MNODE_TYPE_NAME;
- case STORAGE_GROUP_MNODE_TYPE:
+ case DATABASE_MNODE_TYPE:
return STORAGE_GROUP_MNODE_TYPE_NAME;
case MEASUREMENT_MNODE_TYPE:
return MEASUREMENT_MNODE_TYPE_NAME;
@@ -138,6 +138,6 @@ public class SchemaConstant {
}
public static boolean isStorageGroupType(byte type) {
- return type == STORAGE_GROUP_MNODE_TYPE || type ==
STORAGE_GROUP_ENTITY_MNODE_TYPE;
+ return type == DATABASE_MNODE_TYPE || type ==
STORAGE_GROUP_ENTITY_MNODE_TYPE;
}
}
