* [Improvement][parameter] New data types and type filtering * [Improvement][parameter] Improvement startup parameters/global parameters data type * fix api interfaces compatible * add project parameter data type default value * [Improvement][parameter] New data types and type filtering * [Improvement][parameter] Improvement startup parameters/global parameters data type * fix api interfaces compatible * add project parameter data type default value * improvement project code * remove useless imports * remove method onClearSearchTaskType * add parameter doc * optimisation logic * code conflict resolution * code conflict resolution * [Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list (#15978) * update * test * add monitor enhance ui * update * update * update doc * fix spotless * update * update * Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml Co-authored-by: Wenjun Ruan <wenjun@apache.org> * update * fix spotless * update --------- Co-authored-by: Wenjun Ruan <wenjun@apache.org> * [Improvement][Monitor] Add UT for montor (#15998) * formatting Codeupstream-dev
小可耐
6 months ago
committed by
GitHub
|
Before Width: | Height: | Size: 137 KiB After Width: | Height: | Size: 327 KiB |
|
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 338 KiB |
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 326 KiB |
|
Before Width: | Height: | Size: 3.1 MiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 346 KiB After Width: | Height: | Size: 196 KiB |
|
Before Width: | Height: | Size: 347 KiB After Width: | Height: | Size: 195 KiB |
@ -0,0 +1,64 @@ |
|||||||
|
/* |
||||||
|
* 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.dolphinscheduler.plugin.task.api.utils; |
||||||
|
|
||||||
|
import org.apache.dolphinscheduler.common.utils.JSONUtils; |
||||||
|
import org.apache.dolphinscheduler.plugin.task.api.enums.DataType; |
||||||
|
import org.apache.dolphinscheduler.plugin.task.api.enums.Direct; |
||||||
|
import org.apache.dolphinscheduler.plugin.task.api.model.Property; |
||||||
|
|
||||||
|
import java.util.List; |
||||||
|
import java.util.Map; |
||||||
|
import java.util.stream.Collectors; |
||||||
|
|
||||||
|
import com.google.gson.JsonElement; |
||||||
|
import com.google.gson.JsonParser; |
||||||
|
|
||||||
|
/** |
||||||
|
* property utils |
||||||
|
*/ |
||||||
|
public class PropertyUtils { |
||||||
|
|
||||||
|
private PropertyUtils() { |
||||||
|
throw new IllegalStateException("PropertyUtils class"); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* startParams transform propertyList |
||||||
|
* |
||||||
|
* @param startParams startParams |
||||||
|
* @return startParamList |
||||||
|
*/ |
||||||
|
public static List<Property> startParamsTransformPropertyList(String startParams) { |
||||||
|
List<Property> startParamList = null; |
||||||
|
if (startParams != null) { |
||||||
|
JsonElement jsonElement = JsonParser.parseString(startParams); |
||||||
|
boolean isJson = jsonElement.isJsonObject(); |
||||||
|
if (isJson) { |
||||||
|
Map<String, String> startParamMap = JSONUtils.toMap(startParams); |
||||||
|
startParamList = startParamMap.entrySet().stream() |
||||||
|
.map(entry -> new Property(entry.getKey(), Direct.IN, DataType.VARCHAR, entry.getValue())) |
||||||
|
.collect(Collectors.toList()); |
||||||
|
} else { |
||||||
|
startParamList = JSONUtils.toList(startParams, Property.class); |
||||||
|
} |
||||||
|
} |
||||||
|
return startParamList; |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
@ -0,0 +1,54 @@ |
|||||||
|
/* |
||||||
|
* 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. |
||||||
|
*/ |
||||||
|
|
||||||
|
export const DATA_TYPES_MAP = { |
||||||
|
VARCHAR: { |
||||||
|
alias: 'VARCHAR' |
||||||
|
}, |
||||||
|
INTEGER: { |
||||||
|
alias: 'INTEGER' |
||||||
|
}, |
||||||
|
LONG: { |
||||||
|
alias: 'LONG' |
||||||
|
}, |
||||||
|
FLOAT: { |
||||||
|
alias: 'FLOAT' |
||||||
|
}, |
||||||
|
DOUBLE: { |
||||||
|
alias: 'DOUBLE' |
||||||
|
}, |
||||||
|
DATE: { |
||||||
|
alias: 'DATE' |
||||||
|
}, |
||||||
|
TIME: { |
||||||
|
alias: 'TIME' |
||||||
|
}, |
||||||
|
TIMESTAMP: { |
||||||
|
alias: 'TIMESTAMP' |
||||||
|
}, |
||||||
|
BOOLEAN: { |
||||||
|
alias: 'BOOLEAN' |
||||||
|
}, |
||||||
|
LIST: { |
||||||
|
alias: 'LIST' |
||||||
|
}, |
||||||
|
FILE: { |
||||||
|
alias: 'FILE' |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
export const DEFAULT_DATA_TYPE = 'VARCHAR' |
||||||