Skip to content

fix: add transactional boundaries to metadata batch operations (#6708) #7048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juicewcode wants to merge 11 commits into
base: master
Choose a base branch
from
Open

fix: add transactional boundaries to metadata batch operations (#6708) #7048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8a78792
fix: add transactional boundaries to metadata batch operations (#6708)
juicewcode Sep 8, 2026
e2ca93f
Merge branch 'master' into fix/6708-metadata-transactional
juicewcode Sep 16, 2026
47294c7
Merge branch 'master' into fix/6708-metadata-transactional
juicewcode Sep 20, 2026
1f76fed
Merge branch 'master' into fix/6708-metadata-transactional
juicewcode Sep 23, 2026
ac396fd
Merge branch 'master' into fix/6708-metadata-transactional
Aias00 Sep 24, 2026
db6a4ff
Merge branch 'master' into fix/6708-metadata-transactional
Aias00 Sep 26, 2026
03c5c33
Merge branch 'master' into fix/6708-metadata-transactional
Aias00 Sep 26, 2026
c63906f
Merge branch 'master' into fix/6708-metadata-transactional
Aias00 Sep 26, 2026
331a76f
Merge branch 'master' into fix/6708-metadata-transactional
Aias00 Sep 26, 2026
ee0be87
Merge branch 'master' into fix/6708-metadata-transactional
Aias00 Sep 26, 2026
df8162c
Merge branch 'master' into fix/6708-metadata-transactional
Aias00 Sep 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/MetaDataServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public String createOrUpdate(final MetaDataDTO metaDataDTO) {
}

@Override
@Transactional(rollbackFor = Exception.class)
public int deleteByIdsAndNamespaceId(final List<String> ids, final String namespaceId) {
List<MetaDataDO> deletedMetaData = metaDataMapper.selectByIdListAndNamespaceId(ids, namespaceId);
if (CollectionUtils.isEmpty(deletedMetaData)) {
Expand All @@ -121,6 +122,7 @@ public int deleteByIdsAndNamespaceId(final List<String> ids, final String namesp
}

@Override
@Transactional(rollbackFor = Exception.class)
public String enabledByIdsAndNamespaceId(final List<String> ids, final Boolean enabled, final String namespaceId) {
List<MetaDataDO> metaDataDoList = metaDataMapper.selectByIdListAndNamespaceId(ids, namespaceId);
if (CollectionUtils.isEmpty(metaDataDoList)) {
Expand Down
8 changes: 8 additions & 0 deletions shenyu-admin/src/test/java/org/apache/shenyu/admin/service/MetaDataServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -151,6 +152,13 @@ public void testEnabled() {
.thenReturn(Arrays.asList(MetaDataDO.builder().build(), MetaDataDO.builder().build(), MetaDataDO.builder().build()));
msg = metaDataService.enabledByIdsAndNamespaceId(ids, false, SYS_DEFAULT_NAMESPACE_ID);
assertEquals(StringUtils.EMPTY, msg);
verify(publisher, never()).onEnabled(any());
when(metaDataMapper.updateEnableBatch(ids, true)).thenReturn(ids.size());
when(metaDataMapper.selectByIdListAndNamespaceId(ids, SYS_DEFAULT_NAMESPACE_ID))
.thenReturn(Arrays.asList(MetaDataDO.builder().build(), MetaDataDO.builder().build(), MetaDataDO.builder().build()));
msg = metaDataService.enabledByIdsAndNamespaceId(ids, true, SYS_DEFAULT_NAMESPACE_ID);
assertEquals(StringUtils.EMPTY, msg);
verify(publisher).onEnabled(any());
}

/**
Expand Down
Loading