sabeel
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Pull Requests Activity

Merge pull request '[UsageCount] add check in case the datasource is not matched against those present in the graph' (#414) from UsageStatsRecordDS into beta 

Reviewed-on: D-Net/dnet-hadoop#414
This commit is contained in:
Miriam Baglioni 2024-04-02 16:30:39 +02:00
parent 64cbd8abe9 b42bdd5fb3
commit 2c4440951f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/usagestats/SparkAtomicActionUsageJob.java
View File

@ -111,8 +111,11 @@ public class SparkAtomicActionUsageJob implements Serializable {
resultModel resultModel
.joinWith(datasource, resultModel.col("datasourceId").equalTo(datasource.col("id")), "left") .joinWith(datasource, resultModel.col("datasourceId").equalTo(datasource.col("id")), "left")
.map((MapFunction<Tuple2<UsageStatsResultModel, Datasource>, UsageStatsResultModel>) t2 -> { .map((MapFunction<Tuple2<UsageStatsResultModel, Datasource>, UsageStatsResultModel>) t2 -> {
UsageStatsResultModel usrm = t2._1(); if(Optional.ofNullable(t2._2()).isPresent())
usrm.setDatasourceId(usrm.getDatasourceId() + "||" + t2._2().getOfficialname().getValue()); usrm.setDatasourceId(usrm.getDatasourceId() + "||" + t2._2().getOfficialname().getValue());
else
usrm.setDatasourceId(usrm.getDatasourceId() + "||NO_MATCH_FOUND");
return usrm;
return usrm; return usrm;
}, Encoders.bean(UsageStatsResultModel.class)) }, Encoders.bean(UsageStatsResultModel.class))
.write() .write()