gCubeSystem
/
accounting-analytics-persistence-couchbase
Archived
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-analytics-persistence-couchbase@134480 82a268e6-3cf1-43bd-a215-b396298e98cf

Browse Source
feature/19115
Alessandro Pieve 8 years ago
parent 3fcc59c6ae
commit 3ecf8938e5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File

9
src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
Unescape Escape View File

@ -191,13 +191,11 @@ AccountingPersistenceBackendQuery {
Expression expression = x(BasicUsageRecord.SCOPE).eq(s(currentScope));
expression = expression.and(x(BasicUsageRecord.RECORD_TYPE).eq(
s(recordType)));
long startTime = temporalConstraint.getAlignedStartTime()
.getTimeInMillis();
expression = expression.and(x(AggregatedRecord.START_TIME)
.gt(startTime).or(
x(AggregatedRecord.CREATION_TIME).gt(startTime)));
long endTime = temporalConstraint.getAlignedEndTime().getTimeInMillis();
expression = expression.and(x(AggregatedRecord.END_TIME).lt(endTime))
.or(x(AggregatedRecord.CREATION_TIME).lt(endTime));
@ -211,7 +209,6 @@ AccountingPersistenceBackendQuery {
s(filter.getValue())));
}
}
GroupByPath groupByPath = select("*").from(connectionMap.get(clz.getSimpleName()).name())
.where(expression);
Map<Calendar, Info> map = new HashMap<Calendar, Info>();
@ -343,7 +340,7 @@ AccountingPersistenceBackendQuery {
specific = keys.iterator().next();
}
String getDesigndocIdSpecific=specific;
logger.trace("Use a designDocIDSpecific:{}",getDesigndocIdSpecific);
//logger.trace("Use a designDocIDSpecific:{}",getDesigndocIdSpecific);
return getDesigndocIdSpecific;
}
@ -444,7 +441,7 @@ AccountingPersistenceBackendQuery {
//String designDocId = getDesignDocId(clz);
String designDocId = getDesignDocIdSpecific(clz,keys);
logger.trace("designDocIdNew :{}",designDocId);
//logger.trace("designDocIdNew :{}",designDocId);
for (Object temporal: temporalStartKey.toList()){
if (!temporal.toString().isEmpty())
startKey.add(temporal);
@ -735,7 +732,7 @@ AccountingPersistenceBackendQuery {
Number n = jsonObject.getDouble(orderingProperty);
if (n==null)
n=0;
logger.trace("pre:{}, key:{}, value:{}, n:{},orderingProperty:{}",jsonObject.toString(),key, value, n, orderingProperty);
//logger.trace("pre:{}, key:{}, value:{}, n:{},orderingProperty:{}",jsonObject.toString(),key, value, n, orderingProperty);
NumberedFilter numberedFilter =
new NumberedFilter(key, value, n, orderingProperty);