Skip to content

[Improvement-18249][DAO] Route ClusterMapper and K8sNamespaceMapper access through repository Dao #18257

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

Merged
SbloodyS merged 3 commits into from
May 15, 2026
Merged

[Improvement-18249][DAO] Route ClusterMapper and K8sNamespaceMapper access through repository Dao #18257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff2ffc9
[Improvement-18249][DAO] Route ClusterMapper and K8sNamespaceMapper a…
ruanwenjun May 13, 2026
cc72198
Merge branch 'dev' into dao/cluster-and-k8s-namespace
SbloodyS May 15, 2026
989a484
Merge branch 'dev' into dao/cluster-and-k8s-namespace
SbloodyS May 15, 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
6 changes: 3 additions & 3 deletions ...in/java/org/apache/dolphinscheduler/api/audit/operator/impl/ClusterAuditOperatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import org.apache.dolphinscheduler.api.audit.operator.BaseAuditOperator;
import org.apache.dolphinscheduler.dao.entity.Cluster;
import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.dao.repository.ClusterDao;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
Expand All @@ -28,7 +28,7 @@
public class ClusterAuditOperatorImpl extends BaseAuditOperator {

@Autowired
private ClusterMapper clusterMapper;
private ClusterDao clusterDao;

@Override
public String getObjectNameFromIdentity(Object identity) {
Expand All @@ -37,7 +37,7 @@ public String getObjectNameFromIdentity(Object identity) {
return "";
}

Cluster obj = clusterMapper.queryByClusterCode(objId);
Cluster obj = clusterDao.queryByClusterCode(objId);
return obj == null ? "" : obj.getName();
}
}
6 changes: 3 additions & 3 deletions ...va/org/apache/dolphinscheduler/api/audit/operator/impl/K8SNamespaceAuditOperatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import org.apache.dolphinscheduler.api.audit.operator.BaseAuditOperator;
import org.apache.dolphinscheduler.dao.entity.K8sNamespace;
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.dao.repository.K8sNamespaceDao;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
Expand All @@ -28,7 +28,7 @@
public class K8SNamespaceAuditOperatorImpl extends BaseAuditOperator {

@Autowired
private K8sNamespaceMapper k8sNamespaceMapper;
private K8sNamespaceDao k8sNamespaceDao;

@Override
public String getObjectNameFromIdentity(Object identity) {
Expand All @@ -37,7 +37,7 @@ public String getObjectNameFromIdentity(Object identity) {
return "";
}

K8sNamespace obj = k8sNamespaceMapper.selectById(objId);
K8sNamespace obj = k8sNamespaceDao.queryById(objId);
return obj == null ? "" : obj.getNamespace();
}
}
8 changes: 4 additions & 4 deletions dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.dolphinscheduler.api.k8s;

import org.apache.dolphinscheduler.dao.entity.Cluster;
import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.dao.repository.ClusterDao;
import org.apache.dolphinscheduler.service.utils.ClusterConfUtils;

import java.util.Hashtable;
Expand Down Expand Up @@ -46,7 +46,7 @@ public class K8sManager {
private static Map<Long, KubernetesClient> clientMap = new Hashtable<>();

@Autowired
private ClusterMapper clusterMapper;
private ClusterDao clusterDao;

/**
* get k8s client for api use
Expand Down Expand Up @@ -88,7 +88,7 @@ private void deleteK8sClientInner(Long clusterCode) {
if (clusterCode == null) {
return;
}
Cluster cluster = clusterMapper.queryByClusterCode(clusterCode);
Cluster cluster = clusterDao.queryByClusterCode(clusterCode);
if (cluster == null) {
return;
}
Expand All @@ -99,7 +99,7 @@ private void deleteK8sClientInner(Long clusterCode) {
}

private void createK8sClientInner(Long clusterCode) {
Cluster cluster = clusterMapper.queryByClusterCode(clusterCode);
Cluster cluster = clusterDao.queryByClusterCode(clusterCode);
if (cluster == null) {
return;
}
Expand Down
10 changes: 5 additions & 5 deletions ...n/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.dao.mapper.QueueMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.repository.K8sNamespaceDao;
import org.apache.dolphinscheduler.dao.repository.ProjectDao;
import org.apache.dolphinscheduler.dao.repository.UserDao;
import org.apache.dolphinscheduler.dao.repository.WorkerGroupDao;
Expand Down Expand Up @@ -207,10 +207,10 @@ public boolean permissionCheck(int userId, String permissionKey, Logger logger)
@Component
public static class K8sNamespaceResourcePermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {

private final K8sNamespaceMapper k8sNamespaceMapper;
private final K8sNamespaceDao k8sNamespaceDao;

public K8sNamespaceResourcePermissionCheck(K8sNamespaceMapper k8sNamespaceMapper) {
this.k8sNamespaceMapper = k8sNamespaceMapper;
public K8sNamespaceResourcePermissionCheck(K8sNamespaceDao k8sNamespaceDao) {
this.k8sNamespaceDao = k8sNamespaceDao;
}

@Override
Expand All @@ -225,7 +225,7 @@ public boolean permissionCheck(int userId, String url, Logger logger) {

@Override
public Set<Integer> listAuthorizedResourceIds(int userId, Logger logger) {
List<K8sNamespace> k8sNamespaces = k8sNamespaceMapper.queryAuthedNamespaceListByUserId(userId);
List<K8sNamespace> k8sNamespaces = k8sNamespaceDao.queryAuthedNamespaceListByUserId(userId);
return k8sNamespaces.stream().map(K8sNamespace::getId).collect(Collectors.toSet());
}
}
Expand Down
36 changes: 16 additions & 20 deletions ...er-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.Cluster;
import org.apache.dolphinscheduler.dao.entity.K8sNamespace;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.dao.repository.ClusterDao;
import org.apache.dolphinscheduler.dao.repository.K8sNamespaceDao;
import org.apache.dolphinscheduler.service.utils.ClusterConfUtils;

import org.apache.commons.collections4.CollectionUtils;
Expand All @@ -48,7 +47,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

Expand All @@ -60,13 +58,13 @@
public class ClusterServiceImpl extends BaseServiceImpl implements ClusterService {

@Autowired
private ClusterMapper clusterMapper;
private ClusterDao clusterDao;

@Autowired
private K8sManager k8sManager;

@Autowired
private K8sNamespaceMapper k8sNamespaceMapper;
private K8sNamespaceDao k8sNamespaceDao;

/**
* create cluster
Expand All @@ -85,7 +83,7 @@ public Long createCluster(User loginUser, String name, String config, String des

checkParams(name, config);

Cluster clusterExistByName = clusterMapper.queryByClusterName(name);
Cluster clusterExistByName = clusterDao.queryByClusterName(name);
if (clusterExistByName != null) {
throw new ServiceException(Status.CLUSTER_NAME_EXISTS, name);
}
Expand All @@ -99,7 +97,7 @@ public Long createCluster(User loginUser, String name, String config, String des
cluster.setUpdateTime(new Date());
cluster.setCode(CodeGenerateUtils.genCode());

if (clusterMapper.insert(cluster) > 0) {
if (clusterDao.insert(cluster) > 0) {
return cluster.getCode();
}
throw new ServiceException(Status.CREATE_CLUSTER_ERROR);
Expand All @@ -118,7 +116,7 @@ public PageInfo<ClusterDto> queryClusterListPaging(Integer pageNo, Integer pageS

Page<Cluster> page = new Page<>(pageNo, pageSize);

IPage<Cluster> clusterIPage = clusterMapper.queryClusterListPaging(page, searchVal);
IPage<Cluster> clusterIPage = clusterDao.queryClusterListPaging(page, searchVal);

PageInfo<ClusterDto> pageInfo = new PageInfo<>(pageNo, pageSize);
pageInfo.setTotal((int) clusterIPage.getTotal());
Expand All @@ -142,7 +140,7 @@ public PageInfo<ClusterDto> queryClusterListPaging(Integer pageNo, Integer pageS
*/
@Override
public List<ClusterDto> queryAllClusterList() {
List<Cluster> clusterList = clusterMapper.queryAllClusterList();
List<Cluster> clusterList = clusterDao.queryAllClusterList();
if (CollectionUtils.isEmpty(clusterList)) {
return Collections.emptyList();
}
Expand All @@ -164,7 +162,7 @@ public List<ClusterDto> queryAllClusterList() {
@Override
public ClusterDto queryClusterByCode(Long code) {

Cluster cluster = clusterMapper.queryByClusterCode(code);
Cluster cluster = clusterDao.queryByClusterCode(code);

if (cluster == null) {
throw new ServiceException(Status.QUERY_CLUSTER_BY_CODE_ERROR, code);
Expand All @@ -182,7 +180,7 @@ public ClusterDto queryClusterByCode(Long code) {
@Override
public ClusterDto queryClusterByName(String name) {

Cluster cluster = clusterMapper.queryByClusterName(name);
Cluster cluster = clusterDao.queryByClusterName(name);
if (cluster == null) {
throw new ServiceException(Status.QUERY_CLUSTER_BY_NAME_ERROR, name);
}
Expand All @@ -203,15 +201,13 @@ public void deleteClusterByCode(User loginUser, Long code) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}

Long relatedNamespaceNumber = k8sNamespaceMapper
.selectCount(new QueryWrapper<K8sNamespace>().lambda().eq(K8sNamespace::getClusterCode, code));
long relatedNamespaceNumber = k8sNamespaceDao.countByClusterCode(code);

if (relatedNamespaceNumber > 0) {
throw new ServiceException(Status.DELETE_CLUSTER_RELATED_NAMESPACE_EXISTS);
}

int delete = clusterMapper.deleteByCode(code);
if (delete > 0) {
if (clusterDao.deleteByCode(code)) {
return;
}
throw new ServiceException(Status.DELETE_CLUSTER_ERROR);
Expand Down Expand Up @@ -242,12 +238,12 @@ public Cluster updateClusterByCode(User loginUser,

checkParams(name, config);

Cluster clusterExistByName = clusterMapper.queryByClusterName(name);
Cluster clusterExistByName = clusterDao.queryByClusterName(name);
if (clusterExistByName != null && !clusterExistByName.getCode().equals(code)) {
throw new ServiceException(Status.CLUSTER_NAME_EXISTS, name);
}

Cluster clusterExist = clusterMapper.queryByClusterCode(code);
Cluster clusterExist = clusterDao.queryByClusterCode(code);
if (clusterExist == null) {
throw new ServiceException(Status.CLUSTER_NOT_EXISTS, name);
}
Expand All @@ -267,7 +263,7 @@ public Cluster updateClusterByCode(User loginUser,
clusterExist.setName(name);
clusterExist.setDescription(desc);
clusterExist.setUpdateTime(DateUtils.getCurrentDate());
clusterMapper.updateById(clusterExist);
clusterDao.updateById(clusterExist);
return clusterExist;
}

Expand All @@ -284,7 +280,7 @@ public void verifyCluster(String clusterName) {
throw new ServiceException(Status.CLUSTER_NAME_IS_NULL);
}

Cluster cluster = clusterMapper.queryByClusterName(clusterName);
Cluster cluster = clusterDao.queryByClusterName(clusterName);
if (cluster != null) {
throw new ServiceException(Status.CLUSTER_NAME_EXISTS);
}
Expand Down
32 changes: 16 additions & 16 deletions ...i/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import org.apache.dolphinscheduler.dao.entity.Cluster;
import org.apache.dolphinscheduler.dao.entity.K8sNamespace;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.dao.repository.ClusterDao;
import org.apache.dolphinscheduler.dao.repository.K8sNamespaceDao;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -59,13 +59,13 @@
public class K8SNamespaceServiceImpl extends BaseServiceImpl implements K8sNamespaceService {

@Autowired
private K8sNamespaceMapper k8sNamespaceMapper;
private K8sNamespaceDao k8sNamespaceDao;

@Autowired
private K8sClientService k8sClientService;

@Autowired
private ClusterMapper clusterMapper;
private ClusterDao clusterDao;

/**
* query namespace list paging
Expand All @@ -87,7 +87,7 @@ public Result queryListPaging(User loginUser, String searchVal, Integer pageNo,

Page<K8sNamespace> page = new Page<>(pageNo, pageSize);

IPage<K8sNamespace> k8sNamespaceList = k8sNamespaceMapper.queryK8sNamespacePaging(page, searchVal);
IPage<K8sNamespace> k8sNamespaceList = k8sNamespaceDao.queryK8sNamespacePaging(page, searchVal);

Integer count = (int) k8sNamespaceList.getTotal();
PageInfo<K8sNamespace> pageInfo = new PageInfo<>(pageNo, pageSize);
Expand Down Expand Up @@ -127,7 +127,7 @@ public K8sNamespace registerK8sNamespace(User loginUser, String namespace, Long
throw new ServiceException(Status.K8S_NAMESPACE_EXIST, namespace, clusterCode);
}

Cluster cluster = clusterMapper.queryByClusterCode(clusterCode);
Cluster cluster = clusterDao.queryByClusterCode(clusterCode);
if (cluster == null) {
log.error("Cluster does not exist, clusterCode:{}", clusterCode);
throw new ServiceException(Status.CLUSTER_NOT_EXISTS, namespace, clusterCode);
Expand Down Expand Up @@ -155,7 +155,7 @@ public K8sNamespace registerK8sNamespace(User loginUser, String namespace, Long
}
}

k8sNamespaceMapper.insert(k8sNamespaceObj);
k8sNamespaceDao.insert(k8sNamespaceObj);
log.info("K8s namespace create complete, namespace:{}.", k8sNamespaceObj.getNamespace());
return k8sNamespaceObj;
}
Expand Down Expand Up @@ -204,13 +204,13 @@ public void deleteNamespaceById(User loginUser, int id) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}

K8sNamespace k8sNamespaceObj = k8sNamespaceMapper.selectById(id);
K8sNamespace k8sNamespaceObj = k8sNamespaceDao.queryById(id);
if (k8sNamespaceObj == null) {
log.error("K8s namespace does not exist, namespaceId:{}.", id);
throw new ServiceException(Status.K8S_NAMESPACE_NOT_EXIST, id);
}

k8sNamespaceMapper.deleteById(id);
k8sNamespaceDao.deleteById(id);
log.info("K8s namespace delete complete, namespace:{}.", k8sNamespaceObj.getNamespace());
}

Expand All @@ -221,7 +221,7 @@ public void deleteNamespaceById(User loginUser, int id) {
* @return true if the k8s and namespace not exists, otherwise return false
*/
private boolean checkNamespaceExistInDb(String namespace, Long clusterCode) {
return k8sNamespaceMapper.existNamespace(namespace, clusterCode) == Boolean.TRUE;
return k8sNamespaceDao.existNamespace(namespace, clusterCode);
}

/**
Expand All @@ -237,12 +237,12 @@ public List<K8sNamespace> queryUnauthorizedNamespace(User loginUser, Integer use
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
// query all namespace list, this auth does not like project
List<K8sNamespace> namespaceList = k8sNamespaceMapper.selectList(null);
List<K8sNamespace> namespaceList = k8sNamespaceDao.queryAll();
if (namespaceList == null || namespaceList.isEmpty()) {
return Collections.emptyList();
}
Set<K8sNamespace> namespaceSet = new HashSet<>(namespaceList);
List<K8sNamespace> authedProjectList = k8sNamespaceMapper.queryAuthedNamespaceListByUserId(userId);
List<K8sNamespace> authedProjectList = k8sNamespaceDao.queryAuthedNamespaceListByUserId(userId);
return getUnauthorizedNamespaces(namespaceSet, authedProjectList);
}

Expand All @@ -258,7 +258,7 @@ public List<K8sNamespace> queryAuthorizedNamespace(User loginUser, Integer userI
if (loginUser.getId() != userId && isNotAdmin(loginUser)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
return k8sNamespaceMapper.queryAuthedNamespaceListByUserId(userId);
return k8sNamespaceDao.queryAuthedNamespaceListByUserId(userId);
}

/**
Expand All @@ -271,9 +271,9 @@ public List<K8sNamespace> queryAuthorizedNamespace(User loginUser, Integer userI
public List<K8sNamespace> queryNamespaceAvailable(User loginUser) {
List<K8sNamespace> k8sNamespaces;
if (isAdmin(loginUser)) {
k8sNamespaces = k8sNamespaceMapper.selectList(null);
k8sNamespaces = k8sNamespaceDao.queryAll();
} else {
k8sNamespaces = k8sNamespaceMapper.queryAuthedNamespaceListByUserId(loginUser.getId());
k8sNamespaces = k8sNamespaceDao.queryAuthedNamespaceListByUserId(loginUser.getId());
}
setClusterName(k8sNamespaces);
return k8sNamespaces;
Expand All @@ -285,7 +285,7 @@ public List<K8sNamespace> queryNamespaceAvailable(User loginUser) {
*/
private void setClusterName(List<K8sNamespace> k8sNamespaces) {
if (CollectionUtils.isNotEmpty(k8sNamespaces)) {
List<Cluster> clusters = clusterMapper.queryAllClusterList();
List<Cluster> clusters = clusterDao.queryAllClusterList();
if (CollectionUtils.isNotEmpty(clusters)) {
Map<Long, String> codeNameMap = clusters.stream()
.collect(Collectors.toMap(Cluster::getCode, Cluster::getName, (a, b) -> a));
Expand Down
Loading
Loading