This is an automated email from the ASF dual-hosted git repository.
justinchen pushed a commit to branch err-cli-opti
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/err-cli-opti by this push:
new 5b9f18908fb userE
5b9f18908fb is described below
commit 5b9f18908fbc72c26c4046f5fa8d9e49e25eef5c
Author: Caideyipi <[email protected]>
AuthorDate: Mon Jan 5 12:01:46 2026 +0800
userE
---
.../schemaregion/SchemaExecutionVisitor.java | 78 ++++++++++++++--------
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 2 +-
2 files changed, 50 insertions(+), 30 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java
index 29e91459420..62b62e94395 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java
@@ -85,6 +85,8 @@ import org.apache.tsfile.utils.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Nonnull;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -101,7 +103,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
try {
schemaRegion.createTimeSeries(node, -1);
} catch (final MetadataException e) {
- logger.error("{}: MetaData error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
+ logMetaDataException(String.format("%s: MetaData error: ",
IoTDBConstant.GLOBAL_DB_NAME), e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS, "Execute
successfully");
@@ -128,7 +130,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.createAlignedTimeSeries(node);
}
} catch (final MetadataException e) {
- logger.error("{}: MetaData error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
+ logMetaDataException(String.format("%s: MetaData error: ",
IoTDBConstant.GLOBAL_DB_NAME), e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS, "Execute
successfully");
@@ -154,7 +156,8 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
((CreateTimeSeriesPlanImpl)
createTimeSeriesPlan).setWithMerge(node.isGeneratedByPipe());
schemaRegion.createTimeSeries(createTimeSeriesPlan, -1);
} catch (final MetadataException e) {
- logger.error("{}: MetaData error: ", IoTDBConstant.GLOBAL_DB_NAME,
e);
+ logMetaDataException(
+ String.format("%s: MetaData error: ",
IoTDBConstant.GLOBAL_DB_NAME), e);
failingStatus.add(RpcUtils.getStatus(e.getErrorCode(),
e.getMessage()));
}
}
@@ -296,7 +299,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
RpcUtils.getStatus(
e.getErrorCode(),
PartialPath.transformDataToString(e.getMeasurementPath())));
} catch (final MetadataException e) {
- logger.warn("{}: MetaData error: ", e.getMessage(), e);
+ logMetaDataException(String.format("%s: MetaData error: ",
e.getMessage()), e);
failingStatus.add(RpcUtils.getStatus(e.getErrorCode(),
e.getMessage()));
}
}
@@ -431,7 +434,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
break;
}
} catch (MetadataException e) {
- logger.error("{}: MetaData error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
+ logMetaDataException(String.format("%s: MetaData error: ",
IoTDBConstant.GLOBAL_DB_NAME), e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
} catch (IOException e) {
logger.error("{}: IO error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
@@ -454,7 +457,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.activateSchemaTemplate(node, template);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -482,7 +485,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
if (e.getErrorCode() ==
TSStatusCode.TEMPLATE_IS_IN_USE.getStatusCode()) {
alreadyActivatedDeviceList.add(entry.getKey());
} else {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
statusList.add(RpcUtils.getStatus(e.getErrorCode(), e.getMessage()));
}
}
@@ -490,7 +493,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
if (!alreadyActivatedDeviceList.isEmpty()) {
final TemplateIsInUseException e =
new TemplateIsInUseException(alreadyActivatedDeviceList.toString());
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
statusList.add(RpcUtils.getStatus(e.getErrorCode(), e.getMessage()));
}
return statusList.isEmpty() ? RpcUtils.SUCCESS_STATUS :
RpcUtils.getStatus(statusList);
@@ -519,7 +522,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
"Device Template has already been activated on path %s,
there's no need to activate again.",
entry.getKey()));
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -538,7 +541,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
: TSStatusCode.SUCCESS_STATUS,
String.valueOf(preDeletedNumAndIsAllLogicalView.getLeft()));
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -550,7 +553,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.rollbackSchemaBlackList(node.getPatternTree());
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -562,7 +565,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.deleteTimeseriesInBlackList(node.getPatternTree());
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -575,7 +578,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
if (e.getErrorCode() != TSStatusCode.PATH_NOT_EXIST.getStatusCode()) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
}
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
@@ -589,7 +592,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
TSStatusCode.SUCCESS_STATUS,
String.valueOf(schemaRegion.constructSchemaBlackListWithTemplate(node)));
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -601,7 +604,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.rollbackSchemaBlackListWithTemplate(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -613,7 +616,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.deactivateTemplateInBlackList(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -668,7 +671,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
TSStatusCode.SUCCESS_STATUS,
String.valueOf(schemaRegion.constructLogicalViewBlackList(node.getPatternTree())));
} catch (MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -680,7 +683,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.rollbackLogicalViewBlackList(node.getPatternTree());
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -691,7 +694,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.deleteLogicalView(node.getPatternTree());
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -704,7 +707,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.createOrUpdateTableDevice(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -716,7 +719,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.updateTableDeviceAttribute(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -728,7 +731,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.commitUpdateAttribute(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -740,7 +743,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.addNodeLocation(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -752,7 +755,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.deleteTableDevice(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -764,7 +767,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.dropTableAttribute(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -776,7 +779,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
final long preDeletedNum =
schemaRegion.constructTableDevicesBlackList(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS,
String.valueOf(preDeletedNum));
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -788,7 +791,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.rollbackTableDevicesBlackList(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -800,7 +803,7 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
schemaRegion.deleteTableDevicesInBlackList(node);
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
} catch (final MetadataException e) {
- logger.error(e.getMessage(), e);
+ logMetaDataException(e);
return RpcUtils.getStatus(e.getErrorCode(), e.getMessage());
}
}
@@ -837,7 +840,24 @@ public class SchemaExecutionVisitor extends
PlanVisitor<TSStatus, ISchemaRegion>
}
@Override
- public TSStatus visitPlan(PlanNode node, ISchemaRegion context) {
+ public TSStatus visitPlan(final PlanNode node, final ISchemaRegion context) {
return null;
}
+
+ private static void logMetaDataException(
+ final @Nonnull String message, final @Nonnull MetadataException e) {
+ if (e.isUserException()) {
+ logger.info(message);
+ } else {
+ logger.error(message, e);
+ }
+ }
+
+ private static void logMetaDataException(final @Nonnull MetadataException e)
{
+ if (e.isUserException()) {
+ logger.info(e.getMessage());
+ } else {
+ logger.error(e.getMessage(), e);
+ }
+ }
}
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 6c57e0e2248..27207cfa8e9 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
@@ -978,7 +978,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
mTree.alterEncodingCompressor(pathPattern, node.getEncoding(),
node.getCompressionType());
}
if (!exist) {
- throw new
PathNotExistException(node.getPatternTree().getAllPathPatterns().toString(),
false);
+ throw new
PathNotExistException(node.getPatternTree().getAllPathPatterns().toString(),
true);
}
writeToMLog(node);
}
