database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[improvement](resource-group) add test for resource group (#18575)

Browse Source 
Co-authored-by: wangbo <youseebiggirl_t_t@qq.com>
This commit is contained in:
luozenglin
2023-04-18 20:20:50 +08:00
committed by GitHub
parent c323bc44ff
commit 5c076b738b
7 changed files with 297 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/resource/resourcegroup/ResourceGroup.java
View File

@ -65,7 +65,7 @@ public class ResourceGroup implements Writable {
this.version = 0;
}
public static ResourceGroup createResourceGroup(String name, Map<String, String> properties) throws DdlException {
public static ResourceGroup create(String name, Map<String, String> properties) throws DdlException {
checkProperties(properties);
return new ResourceGroup(Env.getCurrentEnv().getNextId(), name, properties);
}

21
fe/fe-core/src/main/java/org/apache/doris/resource/resourcegroup/ResourceGroupMgr.java
View File

@ -84,7 +84,7 @@ public class ResourceGroupMgr implements Writable, GsonPostProcessable {
}
public void init() {
if (Config.enable_resource_group) {
if (Config.enable_resource_group || Config.use_fuzzy_session_variable /* for github workflow */) {
checkAndCreateDefaultGroup();
}
}
@ -114,7 +114,7 @@ public class ResourceGroupMgr implements Writable, GsonPostProcessable {
}
Map<String, String> properties = Maps.newHashMap();
properties.put(ResourceGroup.CPU_SHARE, "10");
defaultResourceGroup = ResourceGroup.createResourceGroup(DEFAULT_GROUP_NAME, properties);
defaultResourceGroup = ResourceGroup.create(DEFAULT_GROUP_NAME, properties);
nameToResourceGroup.put(DEFAULT_GROUP_NAME, defaultResourceGroup);
idToResourceGroup.put(defaultResourceGroup.getId(), defaultResourceGroup);
Env.getCurrentEnv().getEditLog().logCreateResourceGroup(defaultResourceGroup);
@ -127,8 +127,11 @@ public class ResourceGroupMgr implements Writable, GsonPostProcessable {
}
public void createResourceGroup(CreateResourceGroupStmt stmt) throws DdlException {
ResourceGroup resourceGroup = ResourceGroup.createResourceGroup(stmt.getResourceGroupName(),
stmt.getProperties());
if (!Config.enable_resource_group) {
throw new DdlException("unsupported feature now, coming soon.");
}
ResourceGroup resourceGroup = ResourceGroup.create(stmt.getResourceGroupName(), stmt.getProperties());
String resourceGroupNameName = resourceGroup.getName();
writeLock();
try {
@ -160,6 +163,16 @@ public class ResourceGroupMgr implements Writable, GsonPostProcessable {
return procNode.fetchResult().getRows();
}
// for ut
public Map<String, ResourceGroup> getNameToResourceGroup() {
return nameToResourceGroup;
}
// for ut
public Map<Long, ResourceGroup> getIdToResourceGroup() {
return idToResourceGroup;
}
@Override
public void write(DataOutput out) throws IOException {
String json = GsonUtils.GSON.toJson(this);