gCubeSystem
/
accounting-aggregator-se-plugin
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@144179 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Alessandro Pieve 2017-02-23 10:41:08 +00:00
parent 651a5b853c
commit 63c4e12b57
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/gcube/accounting/aggregator/madeaggregation/Aggregation.java
View File

@ -113,8 +113,9 @@ public class Aggregation {
//logger.debug("else -- add getAggregatedRecord"); //logger.debug("else -- add getAggregatedRecord");
records.add(getAggregatedRecord(record)); records.add(getAggregatedRecord(record));
} catch (Exception e) { } catch (Exception e) {
//logger.debug("else -- add Exception");
records.add(record); records.add(record);
logger.debug("Exception but records Add e:{}",e);
} }
totalBufferedRecords++; totalBufferedRecords++;
this.bufferedRecords.put(recordType, records); this.bufferedRecords.put(recordType, records);

20
src/main/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPlugin.java
View File

@ -24,6 +24,7 @@ import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.documentstore.persistence.PersistenceCouchBase; import org.gcube.documentstore.persistence.PersistenceCouchBase;
import org.gcube.documentstore.records.AggregatedRecord; import org.gcube.documentstore.records.AggregatedRecord;
import org.gcube.documentstore.records.Record;
import org.gcube.documentstore.records.RecordUtility; import org.gcube.documentstore.records.RecordUtility;
import org.gcube.vremanagement.executor.plugin.Plugin; import org.gcube.vremanagement.executor.plugin.Plugin;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -351,7 +352,8 @@ public class AccountingAggregatorPlugin extends Plugin<AccountingAggregatorPlugi
* @throws Exception * @throws Exception
*/ */
protected Boolean elaborateRow(ViewRow row ,List<JsonDocument> documentElaborate) throws Exception{ protected Boolean elaborateRow(ViewRow row ,List<JsonDocument> documentElaborate) throws Exception{
int i=0; int i=0;
JsonDocument documentJson = null;
try { try {
//patch for field of long type //patch for field of long type
String document=row.value().toString().replace("\":", "=").replace("\"", ""); String document=row.value().toString().replace("\":", "=").replace("\"", "");
@ -361,7 +363,7 @@ public class AccountingAggregatorPlugin extends Plugin<AccountingAggregatorPlugi
//prepare a document for elaborate //prepare a document for elaborate
String identifier=(String) row.document().content().get("id"); String identifier=(String) row.document().content().get("id");
i=3;//3 i=3;//3
JsonDocument documentJson = JsonDocument.create(identifier, row.document().content()); documentJson = JsonDocument.create(identifier, row.document().content());
i=4;//4 i=4;//4
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ -376,16 +378,26 @@ public class AccountingAggregatorPlugin extends Plugin<AccountingAggregatorPlugi
} }
catch(InvalidValueException ex){ catch(InvalidValueException ex){
logger.warn("InvalidValueException - Record is not valid. Anyway, it will be persisted i:{}",i); logger.warn("InvalidValueException - Record is not valid. Anyway, it will be persisted i:{}",i);
if ((i==5)&&(documentJson!=null)){
documentElaborate.add(documentJson);
}
return false; return false;
} }
catch(RuntimeException exr){ catch(RuntimeException exr){
logger.warn("Runtime Exception -Record is not valid. Anyway, it will be persisted i:{}",i); logger.warn("Runtime Exception exr",exr);
logger.warn("Runtime Exception -Record is not valid. Anyway, it will be persisted i:{}",i);
if ((i==5)&&(documentJson!=null)){
documentElaborate.add(documentJson);
}
return false; return false;
} }
catch (Exception e) { catch (Exception e) {
logger.error("record is not elaborated:"+row.toString()+" but it will be persisted"); logger.error("record is not elaborated:"+row.toString()+" but it will be persisted");
logger.error("error elaborateRow", e); logger.error("error elaborateRow", e);
logger.error("i:{}",i); logger.error("i:{}",i);
if ((i==5)&&(documentJson!=null)){
documentElaborate.add(documentJson);
}
return false; return false;
} }
} }