ruanwenjun commented on code in PR #17696: URL: https://github.com/apache/dolphinscheduler/pull/17696#discussion_r2690515307
########## dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/test/java/org/apache/dolphinscheduler/plugin/task/procedure/ProcedureTaskTest.java: ########## @@ -0,0 +1,314 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.dolphinscheduler.plugin.task.procedure; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doCallRealMethod; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor; +import org.apache.dolphinscheduler.plugin.datasource.api.plugin.DataSourceClientProvider; +import org.apache.dolphinscheduler.plugin.datasource.api.plugin.DataSourceProcessorProvider; +import org.apache.dolphinscheduler.plugin.task.api.TaskConstants; +import org.apache.dolphinscheduler.plugin.task.api.TaskException; +import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; +import org.apache.dolphinscheduler.plugin.task.api.model.Property; +import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper; +import org.apache.dolphinscheduler.spi.datasource.ConnectionParam; +import org.apache.dolphinscheduler.spi.enums.DbType; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) Review Comment: Although the use of mock objects in unit testing is not explicitly forbidden, we discourage adding new unit tests that heavily rely on mocks, since these tests typically offer limited practical value, and it is hard to maintain. ########## dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/main/java/org/apache/dolphinscheduler/plugin/task/procedure/ProcedureTask.java: ########## @@ -128,7 +136,21 @@ public void handle(TaskCallBack taskCallBack) throws TaskException { @Override public void cancel() throws TaskException { - + Statement stmt = this.sessionStatement; + if (stmt != null) { + try { + log.debug("Try to cancel this procedure task"); + setExitStatusCode(TaskConstants.EXIT_CODE_KILL); + stmt.cancel(); + log.debug("this procedure task was canceled"); + } catch (SQLException ex) { + log.warn("Failed to cancel procedure task (driver/DB may not support it)", ex); + throw new TaskException("Cancel procedure task failed", ex); + } + } else { + log.warn( + "Attempted to cancel procedure task, but no active statement exists. Possible reasons: task not started, already completed, or canceled."); + } Review Comment: ```suggestion Statement stmt = this.sessionStatement; if (stmt != null) { try { log.info("Try to cancel this procedure task"); stmt.cancel(); setExitStatusCode(TaskConstants.EXIT_CODE_KILL); log.info("this procedure task was canceled"); } catch (SQLException ex) { log.warn("Failed to cancel procedure task", ex); throw new TaskException("Cancel procedure task failed", ex); } } else { log.info( "Attempted to cancel procedure task, but no active statement exists. Possible reasons: task not started, already completed, or canceled."); } ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
