This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch moveSomeClassToCommonModule in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3fb76188433eed2fd5106f3ffbe5ff5e0ad192b1 Author: JackieTien97 <[email protected]> AuthorDate: Thu Jun 11 14:47:55 2026 +0800 fix compile error --- .../main/i18n/en/org/apache/iotdb/calc/i18n/CalcMessages.java | 10 ++++++++++ .../main/i18n/zh/org/apache/iotdb/calc/i18n/CalcMessages.java | 9 +++++++++ .../en/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java | 9 --------- .../zh/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java | 9 --------- .../apache/iotdb/db/queryengine/execution/StateMachine.java | 8 ++++---- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/iotdb-core/calc-commons/src/main/i18n/en/org/apache/iotdb/calc/i18n/CalcMessages.java b/iotdb-core/calc-commons/src/main/i18n/en/org/apache/iotdb/calc/i18n/CalcMessages.java index 9267e141fb5..624e9d130a3 100644 --- a/iotdb-core/calc-commons/src/main/i18n/en/org/apache/iotdb/calc/i18n/CalcMessages.java +++ b/iotdb-core/calc-commons/src/main/i18n/en/org/apache/iotdb/calc/i18n/CalcMessages.java @@ -151,4 +151,14 @@ public final class CalcMessages { "pushed element is null"; public static final String FAILED_TO_DELETE_TEMP_DIR = "Failed to delete temp dir {}."; + + // --- Execution --- + + public static final String ERROR_SETTING_FUTURE_STATE_FOR = + "Error setting future state for {}"; + public static final String ERROR_NOTIFYING_STATE_CHANGE_LISTENER_FOR = + "Error notifying state change listener for {}"; + public static final String SERVER_IS_SHUTTING_DOWN = + "Server is shutting down"; + } diff --git a/iotdb-core/calc-commons/src/main/i18n/zh/org/apache/iotdb/calc/i18n/CalcMessages.java b/iotdb-core/calc-commons/src/main/i18n/zh/org/apache/iotdb/calc/i18n/CalcMessages.java index 00a0b60be59..0d882fea6a1 100644 --- a/iotdb-core/calc-commons/src/main/i18n/zh/org/apache/iotdb/calc/i18n/CalcMessages.java +++ b/iotdb-core/calc-commons/src/main/i18n/zh/org/apache/iotdb/calc/i18n/CalcMessages.java @@ -143,4 +143,13 @@ public final class CalcMessages { "推入的元素为 null"; public static final String FAILED_TO_DELETE_TEMP_DIR = "删除临时目录 {} 失败。"; + + // --- Execution --- + + public static final String ERROR_SETTING_FUTURE_STATE_FOR = + "为 {} 设置 future 状态时出错"; + public static final String ERROR_NOTIFYING_STATE_CHANGE_LISTENER_FOR = + "通知 {} 的状态变更监听器时出错"; + public static final String SERVER_IS_SHUTTING_DOWN = + "服务器正在关闭"; } diff --git a/iotdb-core/datanode/src/main/i18n/en/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java b/iotdb-core/datanode/src/main/i18n/en/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java index 964163ce14f..b63739fef9b 100644 --- a/iotdb-core/datanode/src/main/i18n/en/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java +++ b/iotdb-core/datanode/src/main/i18n/en/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java @@ -30,15 +30,6 @@ public final class DataNodeQueryMessages { public static final String THIS_NODE_ISN_T_INSTANCE_OF_SCHEMAMEASUREMENTNODE = "This node isn't instance of SchemaMeasurementNode."; - // --- Execution --- - - public static final String ERROR_SETTING_FUTURE_STATE_FOR = - "Error setting future state for {}"; - public static final String ERROR_NOTIFYING_STATE_CHANGE_LISTENER_FOR = - "Error notifying state change listener for {}"; - public static final String SERVER_IS_SHUTTING_DOWN = - "Server is shutting down"; - // --- Execution / Aggregation --- public static final String INVALID_AGGREGATION_FUNCTION = diff --git a/iotdb-core/datanode/src/main/i18n/zh/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java b/iotdb-core/datanode/src/main/i18n/zh/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java index ae020f8c5a3..e70f00f2db9 100644 --- a/iotdb-core/datanode/src/main/i18n/zh/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java +++ b/iotdb-core/datanode/src/main/i18n/zh/org/apache/iotdb/db/i18n/DataNodeQueryMessages.java @@ -30,15 +30,6 @@ public final class DataNodeQueryMessages { public static final String THIS_NODE_ISN_T_INSTANCE_OF_SCHEMAMEASUREMENTNODE = "该节点不是 SchemaMeasurementNode 实例。"; - // --- Execution --- - - public static final String ERROR_SETTING_FUTURE_STATE_FOR = - "为 {} 设置 future 状态时出错"; - public static final String ERROR_NOTIFYING_STATE_CHANGE_LISTENER_FOR = - "通知 {} 的状态变更监听器时出错"; - public static final String SERVER_IS_SHUTTING_DOWN = - "服务器正在关闭"; - // --- Execution / Aggregation --- public static final String INVALID_AGGREGATION_FUNCTION = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/StateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/StateMachine.java index 25f5ec1d02e..cae88f002f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/StateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/StateMachine.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution; -import org.apache.iotdb.db.i18n.DataNodeQueryMessages; +import org.apache.iotdb.calc.i18n.CalcMessages; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; @@ -242,7 +242,7 @@ public class StateMachine<T> { try { futureStateChange.complete(newState); } catch (Throwable e) { - LOGGER.error(DataNodeQueryMessages.ERROR_SETTING_FUTURE_STATE_FOR, name, e); + LOGGER.error(CalcMessages.ERROR_SETTING_FUTURE_STATE_FOR, name, e); } for (StateChangeListener<T> stateChangeListener : stateChangeListeners) { fireStateChangedListener(newState, stateChangeListener); @@ -255,7 +255,7 @@ public class StateMachine<T> { try { stateChangeListener.stateChanged(newState); } catch (Throwable e) { - LOGGER.error(DataNodeQueryMessages.ERROR_NOTIFYING_STATE_CHANGE_LISTENER_FOR, name, e); + LOGGER.error(CalcMessages.ERROR_NOTIFYING_STATE_CHANGE_LISTENER_FOR, name, e); } } @@ -327,7 +327,7 @@ public class StateMachine<T> { executor.execute(command); } catch (RejectedExecutionException e) { if ((executor instanceof ExecutorService) && ((ExecutorService) executor).isShutdown()) { - throw new RuntimeException(DataNodeQueryMessages.SERVER_IS_SHUTTING_DOWN, e); + throw new RuntimeException(CalcMessages.SERVER_IS_SHUTTING_DOWN, e); } throw e; }
