This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 1887d51b2 fix: duplicate key Exception when export data from excel
into Hive (#4801) (#4802)
1887d51b2 is described below
commit 1887d51b2365988afe29d917d87485f8b8a590da
Author: CharlieYan <[email protected]>
AuthorDate: Sat Jul 22 23:59:40 2023 +0800
fix: duplicate key Exception when export data from excel into Hive (#4801)
(#4802)
---
.../java/org/apache/linkis/storage/source/AbstractFileSource.java | 4 +++-
.../org/apache/linkis/manager/label/score/DefaultNodeLabelScorer.java | 4 +++-
.../datasourcemanager/core/validate/DataSourceParameterValidator.java | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git
a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/source/AbstractFileSource.java
b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/source/AbstractFileSource.java
index b3421f840..f2eb65ed1 100644
---
a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/source/AbstractFileSource.java
+++
b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/source/AbstractFileSource.java
@@ -72,7 +72,9 @@ public abstract class AbstractFileSource implements
FileSource {
return Arrays.stream(fileSplits)
.map(FileSplit::getParams)
.flatMap(map -> map.entrySet().stream())
- .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+ .collect(
+ Collectors.toMap(
+ Map.Entry::getKey, Map.Entry::getValue, (existingValue,
newValue) -> newValue));
}
@Override
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/label/score/DefaultNodeLabelScorer.java
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/label/score/DefaultNodeLabelScorer.java
index 4a5657b80..6d38bebd3 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/label/score/DefaultNodeLabelScorer.java
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/label/score/DefaultNodeLabelScorer.java
@@ -82,7 +82,9 @@ public class DefaultNodeLabelScorer implements
NodeLabelScorer {
ftCounts.compute(label.getFeature(), countFunction);
return Pair.of(String.valueOf(label.getId()), label);
})
- .collect(Collectors.toMap(Pair::getKey, Pair::getRight));
+ .collect(
+ Collectors.toMap(
+ Pair::getKey, Pair::getRight, (existingValue, newValue) ->
newValue));
for (Map.Entry<ServiceInstance, List<PersistenceLabel>> entry :
outNodeDegree.entrySet()) {
ServiceInstance node = entry.getKey();
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java
index b433e3d72..b41d08f39 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java
@@ -65,7 +65,8 @@ public class DataSourceParameterValidator implements
ParameterValidator {
Object keyValue = parameters.get(def.getKey());
parameters.put(def.getKey(), keyValue);
return keyValue;
- }));
+ },
+ (existingValue, newValue) -> newValue));
for (DataSourceParamKeyDefinition def : paramKeyDefinitions) {
// Deal with cascade relation
boolean needValidate = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
