korlov42 commented on code in PR #4587: URL: https://github.com/apache/ignite-3/pull/4587#discussion_r1808516955
########## modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/SqlKillParserTest.java: ########## @@ -0,0 +1,96 @@ +/* + * 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.ignite.internal.sql.engine.sql; + +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.assertThrowsSqlException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + +import org.apache.calcite.sql.SqlNode; +import org.apache.ignite.lang.ErrorGroups.Sql; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; + +/** Tests for KILL SQL statement. */ +public class SqlKillParserTest extends AbstractParserTest { + + /** KILL statement. */ + @ParameterizedTest + @CsvSource({ + "KILL QUERY 'abc', QUERY", + "KILL TRANSACTION 'abc', TRANSACTION", + "KILL COMPUTE 'abc', COMPUTE", + }) + public void killStatement(String stmt, IgniteSqlKillObjectType objectType) { + SqlNode sqlNode = parse(stmt); + + IgniteSqlKill kill = assertInstanceOf(IgniteSqlKill.class, sqlNode); + + assertEquals("abc", kill.objectId()); + assertEquals(objectType, kill.objectType()); + assertEquals(IgniteSqlKillWaitMode.IMPLICIT_MODE, kill.waitMode()); + + expectUnparsed(kill, stmt); + } + + /** KILL .. NO WAIT statement. */ + @ParameterizedTest + @CsvSource({ + "KILL QUERY 'abc' NO WAIT, QUERY", + "KILL TRANSACTION 'abc' NO WAIT, TRANSACTION", + "KILL COMPUTE 'abc' NO WAIT, COMPUTE", + }) + public void killStatementNoWait(String stmt, IgniteSqlKillObjectType objectType) { + SqlNode sqlNode = parse(stmt); + + IgniteSqlKill kill = assertInstanceOf(IgniteSqlKill.class, sqlNode); + + assertEquals("abc", kill.objectId()); + assertEquals(objectType, kill.objectType()); + assertEquals(IgniteSqlKillWaitMode.NO_WAIT, kill.waitMode()); + + expectUnparsed(kill, stmt); + } + + /** KILL statement with incorrect object ids. */ + @ParameterizedTest + @ValueSource(strings = { + "KILL QUERY 1", + "KILL QUERY 1.1", + "KILL QUERY 1 NO WAIT", + "KILL QUERY 'id' NO WAIT NO WAIT", + + "KILL TRANSACTION 1", + "KILL TRANSACTION 1", + "KILL TRANSACTION 1.1 NO WAIT", + "KILL COMPUTE 'id' NO WAIT NO WAIT", Review Comment: looks like the last statement in the group should be `KILL TRANSACTION ` ########## modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/sql/IgniteSqlKillWaitMode.java: ########## @@ -0,0 +1,26 @@ +/* + * 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.ignite.internal.sql.engine.sql; + +/** Wait mode used by a KILL statement. */ +public enum IgniteSqlKillWaitMode { Review Comment: nitpicking: perhaps, it would be better to replace this enum with simple boolean flag. First, options other of the enumeration is kinda strange: we have only `implicit` and `no_wait`. But what if implicit became `no_wait` as well? It's better to rename to `wait` to make it obvious. No, we have enum that's clearly maps to a boolean flag -- 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]
