natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused SQLIntegrityConstraintViolationException in JdbcOperator (#16200) 

Co-authored-by: xiangzihao <460888207@qq.com>
This commit is contained in:
Wenjun Ruan 2024-06-25 10:18:42 +08:00 committed by GitHub
parent b34fe46044
commit f69e06408f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/src/main/java/org/apache/dolphinscheduler/plugin/registry/jdbc/JdbcOperator.java
View File

@ -27,7 +27,6 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.SQLIntegrityConstraintViolationException;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -142,7 +141,6 @@ public final class JdbcOperator {
/** /**
* Try to acquire the target Lock, if cannot acquire, return null. * Try to acquire the target Lock, if cannot acquire, return null.
*/ */
@SuppressWarnings("checkstyle:IllegalCatch")
public JdbcRegistryLock tryToAcquireLock(String key) { public JdbcRegistryLock tryToAcquireLock(String key) {
JdbcRegistryLock jdbcRegistryLock = JdbcRegistryLock.builder() JdbcRegistryLock jdbcRegistryLock = JdbcRegistryLock.builder()
.lockKey(key) .lockKey(key)
@ -154,7 +152,7 @@ public final class JdbcOperator {
jdbcRegistryLockMapper.insert(jdbcRegistryLock); jdbcRegistryLockMapper.insert(jdbcRegistryLock);
return jdbcRegistryLock; return jdbcRegistryLock;
} catch (Exception e) { } catch (Exception e) {
if (e instanceof SQLIntegrityConstraintViolationException || e instanceof DuplicateKeyException) { if (e instanceof DuplicateKeyException) {
return null; return null;
} }
throw e; throw e;

20
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/src/test/java/org/apache/dolphinscheduler/plugin/registry/jdbc/JdbcRegistryTestCase.java
View File

@ -17,8 +17,14 @@
package org.apache.dolphinscheduler.plugin.registry.jdbc; package org.apache.dolphinscheduler.plugin.registry.jdbc;
import org.apache.dolphinscheduler.plugin.registry.RegistryTestCase; import static com.google.common.truth.Truth.assertThat;
import org.apache.dolphinscheduler.plugin.registry.RegistryTestCase;
import org.apache.dolphinscheduler.plugin.registry.jdbc.model.JdbcRegistryLock;
import lombok.SneakyThrows;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@ -33,6 +39,18 @@ public abstract class JdbcRegistryTestCase extends RegistryTestCase<JdbcRegistry
@Autowired @Autowired
private JdbcOperator jdbcOperator; private JdbcOperator jdbcOperator;
@Test
@SneakyThrows
public void testTryToAcquireLock_lockIsAlreadyBeenAcquired() {
final String lockKey = "testTryToAcquireLock_lockIsAlreadyBeenAcquired";
// acquire success
JdbcRegistryLock jdbcRegistryLock = jdbcOperator.tryToAcquireLock(lockKey);
// acquire failed
assertThat(jdbcOperator.tryToAcquireLock(lockKey)).isNull();
// release
jdbcOperator.releaseLock(jdbcRegistryLock.getId());
}
@Override @Override
public JdbcRegistry createRegistry() { public JdbcRegistry createRegistry() {
return new JdbcRegistry(jdbcRegistryProperties, jdbcOperator); return new JdbcRegistry(jdbcRegistryProperties, jdbcOperator);