This is an automated email from the ASF dual-hosted git repository.
zyk pushed a commit to branch ty/packageRefactor
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ty/packageRefactor by this
push:
new 5b8508a1bc5 fix unnecessary modification in schemaEngine package
5b8508a1bc5 is described below
commit 5b8508a1bc504938f38726317b5cbecfee9c0676
Author: MarcosZyk <[email protected]>
AuthorDate: Tue Jun 27 10:05:52 2023 +0800
fix unnecessary modification in schemaEngine package
---
.../apache/iotdb/db/schemaengine/SchemaEngine.java | 20 +++++++-------
.../rescon/MemSchemaEngineStatistics.java | 2 +-
.../schemaengine/schemaregion/ISchemaRegion.java | 16 +++++------
.../schemaregion/SchemaRegionPlanType.java | 2 +-
.../schemaregion/SchemaRegionUtils.java | 15 +++++-----
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 32 +++++++++++-----------
.../schemaregion/impl/SchemaRegionPBTreeImpl.java | 30 ++++++++++----------
.../schemaregion/logfile/SchemaLogWriter.java | 4 +--
.../mtree/impl/mem/MTreeBelowSGMemoryImpl.java | 8 +++---
.../mtree/impl/mem/mnode/info/LogicalViewInfo.java | 2 +-
.../mtree/impl/mem/mnode/info/MeasurementInfo.java | 2 +-
.../impl/mem/snapshot/MemMTreeSnapshotUtil.java | 6 ++--
.../mtree/impl/pbtree/MTreeBelowSGCachedImpl.java | 8 +++---
.../mtree/impl/pbtree/schemafile/RecordUtils.java | 4 +--
.../mtree/impl/pbtree/schemafile/SchemaFile.java | 2 +-
.../impl/pbtree/schemafile/SchemaFileConfig.java | 2 +-
.../schemaregion/mtree/traverser/Traverser.java | 4 +--
.../mtree/traverser/basic/MNodeTraverser.java | 2 +-
.../traverser/collector/MeasurementCollector.java | 2 +-
.../mtree/traverser/updater/Updater.java | 3 +-
.../schemaengine/schemaregion/tag/TagLogFile.java | 4 +--
.../schemaengine/schemaregion/tag/TagManager.java | 2 +-
.../schemaregion/utils/MetaFormatUtils.java | 2 +-
.../schemaengine/schemaregion/utils/MetaUtils.java | 2 +-
.../schemaregion/utils/ResourceByPathUtils.java | 8 +++---
.../schemaengine/schemaregion/view/ViewPaths.java | 2 +-
.../write/req/view/ICreateLogicalViewPlan.java | 2 +-
.../template/ClusterTemplateManager.java | 4 +--
.../db/schemaengine/template/ITemplateManager.java | 2 +-
29 files changed, 96 insertions(+), 98 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
index 475de933f1f..8dd8b859451 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
@@ -99,7 +99,7 @@ public class SchemaEngine {
public void init() {
logger.info(
- "used schemaengine storageengine mode: {}.",
+ "used schema engine mode: {}.",
CommonDescriptor.getInstance().getConfig().getSchemaEngineMode());
schemaRegionLoader.init(CommonDescriptor.getInstance().getConfig().getSchemaEngineMode());
@@ -132,8 +132,8 @@ public class SchemaEngine {
}
/**
- * Scan the database and schemaengine region directories to recover
schemaengine regions and
- * return the collected local schemaengine partition info for
localSchemaPartitionTable recovery.
+ * Scan the database and schema region directories to recover schema regions
and return the
+ * collected local schema partition info for localSchemaPartitionTable
recovery.
*/
private void initSchemaRegion() {
File schemaDir = new File(config.getSchemaDir());
@@ -219,7 +219,7 @@ public class SchemaEngine {
schemaRegionLoader.clear();
// clearSchemaResource will shut down release and flush task in PBTree
mode, which must be
- // down before clear schemaengine region
+ // down before clear schema region
SchemaResourceManager.clearSchemaResource();
if (timedForceMLogThread != null) {
timedForceMLogThread.shutdown();
@@ -227,7 +227,7 @@ public class SchemaEngine {
}
if (schemaRegionMap != null) {
- // SchemaEngineStatistics will be clear after clear all schemaengine
region
+ // SchemaEngineStatistics will be clear after clear all schema region
for (ISchemaRegion schemaRegion : schemaRegionMap.values()) {
schemaRegion.clear();
}
@@ -268,7 +268,7 @@ public class SchemaEngine {
private Callable<ISchemaRegion> recoverSchemaRegionTask(
PartialPath storageGroup, SchemaRegionId schemaRegionId) {
- // this method is called for concurrent recovery of schemaengine regions
+ // this method is called for concurrent recovery of schema regions
return () -> {
long timeRecord = System.currentTimeMillis();
try {
@@ -367,11 +367,11 @@ public class SchemaEngine {
}
/**
- * Update total count in schemaengine quota manager and generate local count
map response. If
- * limit is not -1 and deviceNumMap/timeSeriesNumMap is null, fill
deviceNumMap/timeSeriesNumMap
- * of the SchemaRegion whose current node is the leader
+ * Update total count in schema quota manager and generate local count map
response. If limit is
+ * not -1 and deviceNumMap/timeSeriesNumMap is null, fill
deviceNumMap/timeSeriesNumMap of the
+ * SchemaRegion whose current node is the leader
*
- * @param totalCount cluster schemaengine usage
+ * @param totalCount cluster schema usage
* @param resp heartbeat response
*/
public void updateAndFillSchemaCountMap(long totalCount, THeartbeatResp
resp) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java
index 408fa16e441..66d67861cbb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java
@@ -35,7 +35,7 @@ public class MemSchemaEngineStatistics implements
ISchemaEngineStatistics {
private static final Logger logger =
LoggerFactory.getLogger(MemSchemaEngineStatistics.class);
- // Total size of schemaengine region
+ // Total size of schema region
private final long memoryCapacity =
IoTDBDescriptor.getInstance().getConfig().getAllocateMemoryForSchemaRegion();
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/ISchemaRegion.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/ISchemaRegion.java
index 0a4bcd7ffff..815685c851e 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/ISchemaRegion.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/ISchemaRegion.java
@@ -59,12 +59,12 @@ import java.util.Set;
*
* <ol>
* <li>Interfaces for initialization、recover and clear
- * <li>Interfaces for schemaengine region Info read and operation
+ * <li>Interfaces for schema region Info query and operation
* <li>Interfaces for Timeseries operation
* <li>Interfaces for metadata info Query
* <ol>
* <li>Interfaces for Entity/Device info Query
- * <li>Interfaces for timeseries, measurement and schemaengine info
Query
+ * <li>Interfaces for timeseries, measurement and schema info Query
* </ol>
* <li>Interfaces for alias and tag/attribute operations
* <li>Interfaces for Template operations
@@ -86,7 +86,7 @@ public interface ISchemaRegion {
ISchemaRegionMetric createSchemaRegionMetric();
// endregion
- // region Interfaces for schemaengine region Info read and operation
+ // region Interfaces for schema region Info query and operation
SchemaRegionId getSchemaRegionId();
String getDatabaseFullPath();
@@ -141,7 +141,7 @@ public interface ISchemaRegion {
throws SchemaQuotaExceededException;
/**
- * Construct schemaengine black list via setting matched timeseries to pre
deleted.
+ * Construct schema black list via setting matched timeseries to pre deleted.
*
* @param patternTree
* @throws MetadataException
@@ -151,7 +151,7 @@ public interface ISchemaRegion {
long constructSchemaBlackList(PathPatternTree patternTree) throws
MetadataException;
/**
- * Rollback schemaengine black list via setting matched timeseries to not
pre deleted.
+ * Rollback schema black list via setting matched timeseries to not pre
deleted.
*
* @param patternTree
* @throws MetadataException
@@ -159,7 +159,7 @@ public interface ISchemaRegion {
void rollbackSchemaBlackList(PathPatternTree patternTree) throws
MetadataException;
/**
- * Fetch schemaengine black list (timeseries that has been pre deleted).
+ * Fetch schema black list (timeseries that has been pre deleted).
*
* @param patternTree
* @throws MetadataException
@@ -167,7 +167,7 @@ public interface ISchemaRegion {
Set<PartialPath> fetchSchemaBlackList(PathPatternTree patternTree) throws
MetadataException;
/**
- * Delete timeseries in schemaengine black list.
+ * Delete timeseries in schema black list.
*
* @param patternTree
* @throws MetadataException
@@ -190,7 +190,7 @@ public interface ISchemaRegion {
// region Interfaces for metadata info Query
- // region Interfaces for timeseries, measurement and schemaengine info Query
+ // region Interfaces for timeseries, measurement and schema info Query
List<MeasurementPath> fetchSchema(
PartialPath pathPattern, Map<Integer, Template> templateMap, boolean
withTags)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/SchemaRegionPlanType.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/SchemaRegionPlanType.java
index d8922c7ea2f..09a69f2b4f6 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/SchemaRegionPlanType.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/SchemaRegionPlanType.java
@@ -51,7 +51,7 @@ public enum SchemaRegionPlanType {
DELETE_LOGICAL_VIEW((byte) 69),
ALTER_LOGICAL_VIEW((byte) 70),
- // read plan doesn't need any ser/deSer, thus use one type to represent all
+ // query plan doesn't need any ser/deSer, thus use one type to represent all
READ_SCHEMA(Byte.MAX_VALUE);
public static final int MAX_NUM = Byte.MAX_VALUE + 1;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/SchemaRegionUtils.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/SchemaRegionUtils.java
index f3cf2b70d32..0cda5fdada0 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/SchemaRegionUtils.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/SchemaRegionUtils.java
@@ -35,26 +35,25 @@ public class SchemaRegionUtils {
File[] sgFiles = schemaRegionDir.listFiles();
if (sgFiles == null) {
throw new MetadataException(
- String.format("Can't get files in schemaengine region dir %s",
schemaRegionDirPath));
+ String.format("Can't get files in schema region dir %s",
schemaRegionDirPath));
}
for (File file : sgFiles) {
if (file.delete()) {
- logger.info("delete schemaengine region file {}",
file.getAbsolutePath());
+ logger.info("delete schema region file {}", file.getAbsolutePath());
} else {
- logger.info("delete schemaengine region file {} failed.",
file.getAbsolutePath());
+ logger.info("delete schema region file {} failed.",
file.getAbsolutePath());
throw new MetadataException(
- String.format("Failed to delete schemaengine region file %s",
file.getAbsolutePath()));
+ String.format("Failed to delete schema region file %s",
file.getAbsolutePath()));
}
}
if (schemaRegionDir.delete()) {
- logger.info("delete schemaengine region folder {}",
schemaRegionDir.getAbsolutePath());
+ logger.info("delete schema region folder {}",
schemaRegionDir.getAbsolutePath());
} else {
- logger.info(
- "delete schemaengine region folder {} failed.",
schemaRegionDir.getAbsolutePath());
+ logger.info("delete schema region folder {} failed.",
schemaRegionDir.getAbsolutePath());
throw new MetadataException(
String.format(
- "Failed to delete schemaengine region folder %s",
schemaRegionDir.getAbsolutePath()));
+ "Failed to delete schema region folder %s",
schemaRegionDir.getAbsolutePath()));
}
final File storageGroupDir = schemaRegionDir.getParentFile();
if (Objects.requireNonNull(storageGroupDir.listFiles()).length == 0) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
index 3f6a4cd1d72..e2f0926f741 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
@@ -105,9 +105,9 @@ import static
org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARA
/**
* This class takes the responsibility of serialization of all the metadata
info of one certain
- * schemaengine region and persistent it into files. This class contains the
interfaces to modify
- * the metadata in schemaengine region for delta system. All the operations
will be inserted into
- * the logs temporary in case the downtime of the delta system.
+ * schema region and persistent it into files. This class contains the
interfaces to modify the
+ * metadata in schema region for delta system. All the operations will be
inserted into the logs
+ * temporary in case the downtime of the delta system.
*
* <p>Since there are too many interfaces and methods in this class, we use
code region to help
* manage code. The code region starts with //region and ends with
//endregion. When using Intellij
@@ -118,13 +118,13 @@ import static
org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARA
*
* <ol>
* <li>Interfaces and Implementation for initialization、recover and clear
- * <li>Interfaces and Implementation for schemaengine region Info read and
operation
+ * <li>Interfaces and Implementation for schema region Info query and
operation
* <li>Interfaces and Implementation for Timeseries operation
* <li>Interfaces for auto create device
* <li>Interfaces for metadata info Query
* <ol>
* <li>Interfaces for Entity/Device info Query
- * <li>Interfaces for timeseries, measurement and schemaengine info
Query
+ * <li>Interfaces for timeseries, measurement and schema info Query
* </ol>
* <li>Interfaces for alias and tag/attribute operations
* <li>Interfaces and Implementation for Template operations
@@ -214,7 +214,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
isRecovering = false;
} catch (IOException e) {
logger.error(
- "Cannot recover all schemaengine info from {}, we try to recover as
possible as we can",
+ "Cannot recover all schema info from {}, we try to recover as
possible as we can",
schemaRegionDirPath,
e);
}
@@ -225,10 +225,10 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
File sgSchemaFolder =
SystemFileFactory.INSTANCE.getFile(storageGroupDirPath);
if (!sgSchemaFolder.exists()) {
if (sgSchemaFolder.mkdirs()) {
- logger.info("create database schemaengine folder {}",
storageGroupDirPath);
+ logger.info("create database schema folder {}", storageGroupDirPath);
} else {
if (!sgSchemaFolder.exists()) {
- logger.error("create database schemaengine folder {} failed.",
storageGroupDirPath);
+ logger.error("create database schema folder {} failed.",
storageGroupDirPath);
throw new SchemaDirCreationFailureException(storageGroupDirPath);
}
}
@@ -237,10 +237,10 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
File schemaRegionFolder =
SystemFileFactory.INSTANCE.getFile(schemaRegionDirPath);
if (!schemaRegionFolder.exists()) {
if (schemaRegionFolder.mkdirs()) {
- logger.info("create schemaengine region folder {}",
schemaRegionDirPath);
+ logger.info("create schema region folder {}", schemaRegionDirPath);
} else {
if (!schemaRegionFolder.exists()) {
- logger.error("create schemaengine region folder {} failed.",
schemaRegionDirPath);
+ logger.error("create schema region folder {} failed.",
schemaRegionDirPath);
throw new SchemaDirCreationFailureException(schemaRegionDirPath);
}
}
@@ -276,7 +276,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
logWriter.force();
}
} catch (IOException e) {
- logger.error("Cannot force {} mlog to the schemaengine region",
schemaRegionId, e);
+ logger.error("Cannot force {} mlog to the schema region",
schemaRegionId, e);
}
}
}
@@ -359,7 +359,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
return idx;
}
- /** function for clearing metadata components of one schemaengine region */
+ /** function for clearing metadata components of one schema region */
@Override
public synchronized void clear() {
try {
@@ -382,7 +382,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
// endregion
- // region Interfaces for schemaengine region Info read and operation
+ // region Interfaces for schema region Info query and operation
@Override
public String getDatabaseFullPath() {
@@ -399,7 +399,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
// clear all the components and release all the file handlers
clear();
- // delete all the schemaengine region files
+ // delete all the schema region files
SchemaRegionUtils.deleteSchemaRegionFolder(schemaRegionDirPath, logger);
}
@@ -880,7 +880,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
// region Interfaces for get and auto create device
/**
- * get device node, if the schemaengine region is not set, create it when
autoCreateSchema is true
+ * get device node, if the schema region is not set, create it when
autoCreateSchema is true
*
* <p>(we develop this method as we need to get the node's lock after we get
the lock.writeLock())
*
@@ -907,7 +907,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
// region Interfaces for Entity/Device info Query
- // region Interfaces for timeseries, measurement and schemaengine info Query
+ // region Interfaces for timeseries, measurement and schema info Query
@Override
public List<MeasurementPath> fetchSchema(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionPBTreeImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionPBTreeImpl.java
index 81cde92f187..10423e685a0 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionPBTreeImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionPBTreeImpl.java
@@ -105,9 +105,9 @@ import static
org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARA
/**
* This class takes the responsibility of serialization of all the metadata
info of one certain
- * schemaengine region and persistent it into files. This class contains the
interfaces to modify
- * the metadata in schemaengine region for delta system. All the operations
will be inserted into
- * the logs temporary in case the downtime of the delta system.
+ * schema region and persistent it into files. This class contains the
interfaces to modify the
+ * metadata in schema region for delta system. All the operations will be
inserted into the logs
+ * temporary in case the downtime of the delta system.
*
* <p>Since there are too many interfaces and methods in this class, we use
code region to help
* manage code. The code region starts with //region and ends with
//endregion. When using Intellij
@@ -118,12 +118,12 @@ import static
org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARA
*
* <ol>
* <li>Interfaces and Implementation for initialization、recover and clear
- * <li>Interfaces and Implementation for schemaengine region Info read and
operation
+ * <li>Interfaces and Implementation for schema region Info query and
operation
* <li>Interfaces and Implementation for Timeseries operation
* <li>Interfaces for auto create device
* <li>Interfaces for metadata info Query
* <ol>
- * <li>Interfaces for timeseries, measurement and schemaengine info
Query
+ * <li>Interfaces for timeseries, measurement and schema info Query
* </ol>
* <li>Interfaces for alias and tag/attribute operations
* <li>Interfaces and Implementation for Template operations
@@ -262,10 +262,10 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
File sgSchemaFolder =
SystemFileFactory.INSTANCE.getFile(storageGroupDirPath);
if (!sgSchemaFolder.exists()) {
if (sgSchemaFolder.mkdirs()) {
- logger.info("create database schemaengine folder {}",
storageGroupDirPath);
+ logger.info("create database schema folder {}", storageGroupDirPath);
} else {
if (!sgSchemaFolder.exists()) {
- logger.error("create database schemaengine folder {} failed.",
storageGroupDirPath);
+ logger.error("create database schema folder {} failed.",
storageGroupDirPath);
throw new SchemaDirCreationFailureException(storageGroupDirPath);
}
}
@@ -274,10 +274,10 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
File schemaRegionFolder =
SystemFileFactory.INSTANCE.getFile(schemaRegionDirPath);
if (!schemaRegionFolder.exists()) {
if (schemaRegionFolder.mkdirs()) {
- logger.info("create schemaengine region folder {}",
schemaRegionDirPath);
+ logger.info("create schema region folder {}", schemaRegionDirPath);
} else {
if (!schemaRegionFolder.exists()) {
- logger.error("create schemaengine region folder {} failed.",
schemaRegionDirPath);
+ logger.error("create schema region folder {} failed.",
schemaRegionDirPath);
throw new SchemaDirCreationFailureException(schemaRegionDirPath);
}
}
@@ -316,7 +316,7 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
logWriter.force();
}
} catch (IOException e) {
- logger.error("Cannot force {} mlog to the schemaengine region",
schemaRegionId, e);
+ logger.error("Cannot force {} mlog to the schema region",
schemaRegionId, e);
}
}
}
@@ -403,7 +403,7 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
}
}
- /** function for clearing metadata components of one schemaengine region */
+ /** function for clearing metadata components of one schema region */
@Override
public synchronized void clear() {
isClearing = true;
@@ -432,7 +432,7 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
// endregion
- // region Interfaces for schemaengine region Info read and operation
+ // region Interfaces for schema region Info query and operation
@Override
public String getDatabaseFullPath() {
@@ -449,7 +449,7 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
// clear all the components and release all the file handlers
clear();
- // delete all the schemaengine region files
+ // delete all the schema region files
SchemaRegionUtils.deleteSchemaRegionFolder(schemaRegionDirPath, logger);
}
@@ -885,7 +885,7 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
// region Interfaces for get and auto create device
/**
- * get device node, if the schemaengine region is not set, create it when
autoCreateSchema is true
+ * get device node, if the schema region is not set, create it when
autoCreateSchema is true
*
* <p>(we develop this method as we need to get the node's lock after we get
the lock.writeLock())
*
@@ -911,7 +911,7 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
// region Interfaces for metadata info Query
- // region Interfaces for timeseries, measurement and schemaengine info Query
+ // region Interfaces for timeseries, measurement and schema info Query
@Override
public List<MeasurementPath> fetchSchema(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/SchemaLogWriter.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/SchemaLogWriter.java
index 21559c739b9..7177232fe9e 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/SchemaLogWriter.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/SchemaLogWriter.java
@@ -54,9 +54,9 @@ public class SchemaLogWriter<T> implements AutoCloseable {
File dir = SystemFileFactory.INSTANCE.getFile(schemaDir);
if (!dir.exists()) {
if (dir.mkdirs()) {
- LOGGER.info("create schemaengine folder {}.", dir);
+ LOGGER.info("create schema folder {}.", dir);
} else {
- LOGGER.warn("create schemaengine folder {} failed.", dir);
+ LOGGER.warn("create schema folder {} failed.", dir);
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
index 8df03d83272..aaf40002d23 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/MTreeBelowSGMemoryImpl.java
@@ -625,7 +625,7 @@ public class MTreeBelowSGMemoryImpl {
// region Entity/Device operation
// including device auto creation and transform from InternalMNode to
EntityMNode
/**
- * Add an interval path to MTree. This is only used for automatically
creating schemaengine
+ * Add an interval path to MTree. This is only used for automatically
creating schema
*
* <p>e.g., get root.sg.d1, get or create all internal nodes and return the
node of d1
*/
@@ -675,7 +675,7 @@ public class MTreeBelowSGMemoryImpl {
protected Void collectMeasurement(IMeasurementMNode<IMemMNode> node)
{
MeasurementPath path = getCurrentMeasurementPathInTraverse(node);
if (nodes[nodes.length - 1].equals(node.getAlias())) {
- // only when user read with alias, the alias in path will be set
+ // only when user query with alias, the alias in path will be set
path.setMeasurementAlias(node.getAlias());
}
if (withTags) {
@@ -733,7 +733,7 @@ public class MTreeBelowSGMemoryImpl {
// endregion
- // region Interfaces and Implementation for Template check and read
+ // region Interfaces and Implementation for Template check and query
public void activateTemplate(PartialPath activatePath, Template template)
throws MetadataException {
@@ -876,7 +876,7 @@ public class MTreeBelowSGMemoryImpl {
// endregion
- // region Interfaces for schemaengine reader
+ // region Interfaces for schema reader
public ISchemaReader<IDeviceSchemaInfo> getDeviceReader(IShowDevicesPlan
showDevicesPlan)
throws MetadataException {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/info/LogicalViewInfo.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/info/LogicalViewInfo.java
index 1d6cac3d6ea..ad71eabed19 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/info/LogicalViewInfo.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/info/LogicalViewInfo.java
@@ -140,7 +140,7 @@ public class LogicalViewInfo implements IMeasurementInfo {
* <li>object header, 8B
* <li>offset, 8B
* <li>boolean preDeleted, 1B
- * <li>estimated schemaengine size, 32B
+ * <li>estimated schema size, 32B
* <li>viewExpression
* </ol>
*/
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/info/MeasurementInfo.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/info/MeasurementInfo.java
index 13afe908799..0175c2b3cd5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/info/MeasurementInfo.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/info/MeasurementInfo.java
@@ -103,7 +103,7 @@ public class MeasurementInfo implements IMeasurementInfo {
* <li>alias reference, 8B
* <li>long tagOffset, 8B
* <li>boolean preDeleted, 1B
- * <li>estimated schemaengine size, 32B
+ * <li>estimated schema size, 32B
* </ol>
*/
@Override
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 d0d8ac9eb03..35c9eb3dcd7 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
@@ -118,7 +118,7 @@ public class MemMTreeSnapshotUtil {
return deserializeFrom(inputStream, measurementProcess, deviceProcess,
regionStatistics);
} catch (Throwable e) {
// This method is only invoked during recovery. If failed, the memory
usage should be cleared
- // since the loaded schemaengine will not be used.
+ // since the loaded schema will not be used.
regionStatistics.clear();
throw e;
}
@@ -294,7 +294,7 @@ public class MemMTreeSnapshotUtil {
serializeBasicMNode(node.getBasicMNode(), outputStream);
ReadWriteIOUtils.write(0, outputStream); // for compatibly
ReadWriteIOUtils.write(false, outputStream); // for compatibly
- // database node in schemaRegion doesn't store any database
schemaengine
+ // database node in schemaRegion doesn't store any database schema
return true;
} catch (IOException e) {
logger.error(SERIALIZE_ERROR_INFO, e);
@@ -311,7 +311,7 @@ public class MemMTreeSnapshotUtil {
ReadWriteIOUtils.write(node.getSchemaTemplateIdWithState(),
outputStream);
ReadWriteIOUtils.write(node.isUseTemplate(), outputStream);
ReadWriteIOUtils.write(node.isAlignedNullable(), outputStream);
- // database node in schemaRegion doesn't store any database
schemaengine
+ // database node in schemaRegion doesn't store any database schema
return true;
} catch (IOException e) {
logger.error(SERIALIZE_ERROR_INFO, e);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java
index 41c519e0574..8f92723a946 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/MTreeBelowSGCachedImpl.java
@@ -695,7 +695,7 @@ public class MTreeBelowSGCachedImpl {
// region Entity/Device operation
// including device auto creation and transform from InternalMNode to
EntityMNode
/**
- * Add an interval path to MTree. This is only used for automatically
creating schemaengine
+ * Add an interval path to MTree. This is only used for automatically
creating schema
*
* <p>e.g., get root.sg.d1, get or create all internal nodes and return the
node of d1
*/
@@ -757,7 +757,7 @@ public class MTreeBelowSGCachedImpl {
}
MeasurementPath path = getCurrentMeasurementPathInTraverse(node);
if (nodes[nodes.length - 1].equals(node.getAlias())) {
- // only when user read with alias, the alias in path will be set
+ // only when user query with alias, the alias in path will be set
path.setMeasurementAlias(node.getAlias());
}
if (withTags) {
@@ -819,7 +819,7 @@ public class MTreeBelowSGCachedImpl {
}
// endregion
- // region Interfaces and Implementation for Template check and read
+ // region Interfaces and Implementation for Template check and query
public void activateTemplate(PartialPath activatePath, Template template)
throws MetadataException {
@@ -1016,7 +1016,7 @@ public class MTreeBelowSGCachedImpl {
// endregion
- // region Interfaces for schemaengine reader
+ // region Interfaces for schema reader
public ISchemaReader<IDeviceSchemaInfo> getDeviceReader(IShowDevicesPlan
showDevicesPlan)
throws MetadataException {
EntityCollector<IDeviceSchemaInfo, ICachedMNode> collector =
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/RecordUtils.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/RecordUtils.java
index 380035afd7a..6ec531224af 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/RecordUtils.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/RecordUtils.java
@@ -124,7 +124,7 @@ public class RecordUtils {
/**
* It is convenient to expand the semantic of the statusBytes for further
status of a measurement,
- * e.g., preDelete, since 8 bytes are far more sufficient to represent the
schemaengine of it.
+ * e.g., preDelete, since 8 bytes are far more sufficient to represent the
schema of it.
*
* <p>Measurement MNode Record Structure: <br>
* (var length record, with length member)
@@ -338,7 +338,7 @@ public class RecordUtils {
return node.getOffset();
}
- /** Including schemaengine and pre-delete flag of a measurement, could be
expanded further. */
+ /** Including schema and pre-delete flag of a measurement, could be expanded
further. */
private static long convertMeasStat2Long(IMeasurementMNode<ICachedMNode>
node) {
byte dataType = node.getSchema().getTypeInByte();
byte encoding = node.getSchema().getEncodingType().serialize();
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/SchemaFile.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/SchemaFile.java
index 0e94a31103f..e1aef2c4800 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/SchemaFile.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/SchemaFile.java
@@ -79,7 +79,7 @@ public class SchemaFile implements ISchemaFile {
private final IMNodeFactory<ICachedMNode> nodeFactory =
CacheMNodeFactory.getInstance();
- // todo refactor constructor for schemaengine file in Jan.
+ // todo refactor constructor for schema file in Jan.
private SchemaFile(
String sgName, int schemaRegionId, boolean override, long ttl, boolean
isEntity)
throws IOException, MetadataException {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/SchemaFileConfig.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/SchemaFileConfig.java
index 779d74478d5..b6c0f76074b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/SchemaFileConfig.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/SchemaFileConfig.java
@@ -52,7 +52,7 @@ public class SchemaFileConfig {
public static final long PAGE_INDEX_MASK = 0xffff_ffffL; // highest bit is
not included
public static final short PAGE_HEADER_SIZE = 32;
- // value of type flag of a schemaengine page
+ // value of type flag of a schema page
public static final int PAGE_HEADER_INDEX_OFFSET = 1; // offset of page
index among page header
public static final byte SEGMENTED_PAGE = 0x00;
public static final byte INTERNAL_PAGE = 0x01;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/Traverser.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/Traverser.java
index 5a76c473d3a..f13633eb5f2 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/Traverser.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/Traverser.java
@@ -128,8 +128,8 @@ public abstract class Traverser<R, N extends IMNode<N>>
extends AbstractTreeVisi
.isPreDeactivateTemplate())) { // the template should not
skip
int templateId = parent.getAsDeviceMNode().getSchemaTemplateId();
Template template = templateMap.get(templateId);
- // if null, it means the template on this device is not covered in
this read, refer to the
- // queryengine analyzing stage
+ // if null, it means the template on this device is not covered in
this query, refer to the
+ // mpp analyzing stage
if (template != null && nodeFactory != null) {
child = MNodeUtils.getChild(templateMap.get(templateId), childName,
nodeFactory);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/basic/MNodeTraverser.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/basic/MNodeTraverser.java
index a31d887a547..e327171cf45 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/basic/MNodeTraverser.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/basic/MNodeTraverser.java
@@ -32,7 +32,7 @@ import
org.apache.iotdb.db.schemaengine.schemaregion.mtree.traverser.Traverser;
*/
public abstract class MNodeTraverser<R, N extends IMNode<N>> extends
Traverser<R, N> {
- // Level read option started from 0. For example, level of root.sg.d1.s1 is
3.
+ // Level query option started from 0. For example, level of root.sg.d1.s1 is
3.
protected int targetLevel = -1;
protected N lastVisitNode = null;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/collector/MeasurementCollector.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/collector/MeasurementCollector.java
index 03fd4a1f112..b22e7cd0494 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/collector/MeasurementCollector.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/collector/MeasurementCollector.java
@@ -45,7 +45,7 @@ public abstract class MeasurementCollector<R, N extends
IMNode<N>>
/**
* collect the information of one measurement
*
- * @param node MeasurementMNode holding the measurement schemaengine
+ * @param node MeasurementMNode holding the measurement schema
*/
protected abstract R collectMeasurement(IMeasurementMNode<N> node);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/updater/Updater.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/updater/Updater.java
index 1b3aa06d796..d5bac218d95 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/updater/Updater.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/traverser/updater/Updater.java
@@ -21,8 +21,7 @@ package
org.apache.iotdb.db.schemaengine.schemaregion.mtree.traverser.updater;
import org.apache.iotdb.commons.exception.MetadataException;
-// TODO: In schemaengine file mode, since the updated node won't be cache
evicted until it been
-// flushed to
+// TODO: In schema file mode, since the updated node won't be cache evicted
until it been flushed to
// disk and currently the flush won't happen during traversing which takes the
read lock, we need to
// consider the concurrency of flush and traverse for better memory control in
future work.
public interface Updater {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagLogFile.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagLogFile.java
index 6afe8ba80e6..a34a0242790 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagLogFile.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagLogFile.java
@@ -61,9 +61,9 @@ public class TagLogFile implements AutoCloseable {
File metadataDir = SystemFileFactory.INSTANCE.getFile(schemaDir);
if (!metadataDir.exists()) {
if (metadataDir.mkdirs()) {
- logger.info("create schemaengine folder {}.", metadataDir);
+ logger.info("create schema folder {}.", metadataDir);
} else {
- logger.info("create schemaengine folder {} failed.", metadataDir);
+ logger.info("create schema folder {} failed.", metadataDir);
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagManager.java
index 54a30f715c2..ae7272b639a 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagManager.java
@@ -701,7 +701,7 @@ public class TagManager {
/**
* Read the tags of this node.
*
- * @param node the node to read.
+ * @param node the node to query.
* @return the tag key-value map.
* @throws RuntimeException If any IOException happens.
*/
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaFormatUtils.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaFormatUtils.java
index 60fb254189b..1b7017e6940 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaFormatUtils.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaFormatUtils.java
@@ -93,7 +93,7 @@ public class MetaFormatUtils {
checkNameFormat(name);
}
- /** check whether the measurement ids in schemaengine is well formatted */
+ /** check whether the measurement ids in schema is well formatted */
public static void checkSchemaMeasurementNames(List<String> measurements)
throws MetadataException {
for (String measurement : measurements) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java
index 730345097ab..b51cf9d316c 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java
@@ -50,7 +50,7 @@ public class MetaUtils {
private MetaUtils() {}
/**
- * Get database path when creating schemaengine automatically is enable
+ * Get database path when creating schema automatically is enable
*
* <p>e.g., path = root.a.b.c and level = 1, return root.a
*
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java
index ca25c9cfbef..ff0eed48431 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java
@@ -112,7 +112,7 @@ class AlignedResourceByPathUtils extends
ResourceByPathUtils {
/**
* Because the unclosed tsfile don't have TimeSeriesMetadata and memtables
in the memory don't
- * have chunkMetadata, but read will use these, so we need to generate it
for them.
+ * have chunkMetadata, but query will use these, so we need to generate it
for them.
*/
@Override
public AlignedTimeSeriesMetadata generateTimeSeriesMetadata(
@@ -206,7 +206,7 @@ class AlignedResourceByPathUtils extends
ResourceByPathUtils {
if (!containsMeasurement) {
return null;
}
- // get sorted tv list is synchronized so different read can get right
sorted list reference
+ // get sorted tv list is synchronized so different query can get right
sorted list reference
TVList alignedTvListCopy =
alignedMemChunk.getSortedTvListForQuery(partialPath.getSchemaList());
List<List<TimeRange>> deletionList = null;
if (modsToMemtable != null) {
@@ -308,7 +308,7 @@ class MeasurementResourceByPathUtils extends
ResourceByPathUtils {
/**
* Because the unclosed tsfile don't have TimeSeriesMetadata and memtables
in the memory don't
- * have chunkMetadata, but read will use these, so we need to generate it
for them.
+ * have chunkMetadata, but query will use these, so we need to generate it
for them.
*/
@Override
public ITimeSeriesMetadata generateTimeSeriesMetadata(
@@ -349,7 +349,7 @@ class MeasurementResourceByPathUtils extends
ResourceByPathUtils {
}
IWritableMemChunk memChunk =
memTableMap.get(deviceID).getMemChunkMap().get(partialPath.getMeasurement());
- // get sorted tv list is synchronized so different read can get right
sorted list reference
+ // get sorted tv list is synchronized so different query can get right
sorted list reference
TVList chunkCopy = memChunk.getSortedTvListForQuery();
List<TimeRange> deletionList = null;
if (modsToMemtable != null) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java
index df88ff5ec9d..9bee906eaa5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * A class to save all paths' info in targetPaths and sourcePaths except read
statement.
+ * A class to save all paths' info in targetPaths and sourcePaths except query
statement.
*
* <p>fullPathList: CREATE VIEW root.db.device.temp AS root.ln.d.s01
PathGroup: CREATE VIEW
* root.db(device.temp, status) AS root.ln(d.s01, wf.abc.s02)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/write/req/view/ICreateLogicalViewPlan.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/write/req/view/ICreateLogicalViewPlan.java
index 413b8ee9878..7f58564ce4b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/write/req/view/ICreateLogicalViewPlan.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/write/req/view/ICreateLogicalViewPlan.java
@@ -60,7 +60,7 @@ public interface ICreateLogicalViewPlan extends
ISchemaRegionPlan {
// /**
// * @param partialPaths a list of partialPaths. Will be transformed into
expressions then set
- // as source. (source timeseries or expressions in read statement)
+ // as source. (source timeseries or expressions in query statement)
// */
// void setSourceByPartialPath(List<PartialPath> partialPaths);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/template/ClusterTemplateManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/template/ClusterTemplateManager.java
index 5e89bf11bb9..72487914cb1 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/template/ClusterTemplateManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/template/ClusterTemplateManager.java
@@ -114,7 +114,7 @@ public class ClusterTemplateManager implements
ITemplateManager {
// Get response or throw exception
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.error(
- "Failed to execute create schemaengine template {} in config node,
status is {}.",
+ "Failed to execute create schema template {} in config node,
status is {}.",
statement.getName(),
tsStatus);
}
@@ -222,7 +222,7 @@ public class ClusterTemplateManager implements
ITemplateManager {
if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
LOGGER.warn(
- "Failed to execute set schemaengine template {} on path {} in
config node, status is {}.",
+ "Failed to execute set schema template {} on path {} in config
node, status is {}.",
name,
path,
tsStatus);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/template/ITemplateManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/template/ITemplateManager.java
index ab051cf6617..1b86ba50b62 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/template/ITemplateManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/template/ITemplateManager.java
@@ -42,7 +42,7 @@ public interface ITemplateManager {
List<Template> getAllTemplates();
/**
- * show nodes in schemaengine template xx
+ * show nodes in schema template xx
*
* @param name template name
* @return Template
