git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-analytics-persistence-couchbase@134480 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
3fcc59c6ae
commit
3ecf8938e5
|
@ -191,13 +191,11 @@ AccountingPersistenceBackendQuery {
|
||||||
Expression expression = x(BasicUsageRecord.SCOPE).eq(s(currentScope));
|
Expression expression = x(BasicUsageRecord.SCOPE).eq(s(currentScope));
|
||||||
expression = expression.and(x(BasicUsageRecord.RECORD_TYPE).eq(
|
expression = expression.and(x(BasicUsageRecord.RECORD_TYPE).eq(
|
||||||
s(recordType)));
|
s(recordType)));
|
||||||
|
|
||||||
long startTime = temporalConstraint.getAlignedStartTime()
|
long startTime = temporalConstraint.getAlignedStartTime()
|
||||||
.getTimeInMillis();
|
.getTimeInMillis();
|
||||||
expression = expression.and(x(AggregatedRecord.START_TIME)
|
expression = expression.and(x(AggregatedRecord.START_TIME)
|
||||||
.gt(startTime).or(
|
.gt(startTime).or(
|
||||||
x(AggregatedRecord.CREATION_TIME).gt(startTime)));
|
x(AggregatedRecord.CREATION_TIME).gt(startTime)));
|
||||||
|
|
||||||
long endTime = temporalConstraint.getAlignedEndTime().getTimeInMillis();
|
long endTime = temporalConstraint.getAlignedEndTime().getTimeInMillis();
|
||||||
expression = expression.and(x(AggregatedRecord.END_TIME).lt(endTime))
|
expression = expression.and(x(AggregatedRecord.END_TIME).lt(endTime))
|
||||||
.or(x(AggregatedRecord.CREATION_TIME).lt(endTime));
|
.or(x(AggregatedRecord.CREATION_TIME).lt(endTime));
|
||||||
|
@ -211,7 +209,6 @@ AccountingPersistenceBackendQuery {
|
||||||
s(filter.getValue())));
|
s(filter.getValue())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GroupByPath groupByPath = select("*").from(connectionMap.get(clz.getSimpleName()).name())
|
GroupByPath groupByPath = select("*").from(connectionMap.get(clz.getSimpleName()).name())
|
||||||
.where(expression);
|
.where(expression);
|
||||||
Map<Calendar, Info> map = new HashMap<Calendar, Info>();
|
Map<Calendar, Info> map = new HashMap<Calendar, Info>();
|
||||||
|
@ -343,7 +340,7 @@ AccountingPersistenceBackendQuery {
|
||||||
specific = keys.iterator().next();
|
specific = keys.iterator().next();
|
||||||
}
|
}
|
||||||
String getDesigndocIdSpecific=specific;
|
String getDesigndocIdSpecific=specific;
|
||||||
logger.trace("Use a designDocIDSpecific:{}",getDesigndocIdSpecific);
|
//logger.trace("Use a designDocIDSpecific:{}",getDesigndocIdSpecific);
|
||||||
return getDesigndocIdSpecific;
|
return getDesigndocIdSpecific;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -444,7 +441,7 @@ AccountingPersistenceBackendQuery {
|
||||||
|
|
||||||
//String designDocId = getDesignDocId(clz);
|
//String designDocId = getDesignDocId(clz);
|
||||||
String designDocId = getDesignDocIdSpecific(clz,keys);
|
String designDocId = getDesignDocIdSpecific(clz,keys);
|
||||||
logger.trace("designDocIdNew :{}",designDocId);
|
//logger.trace("designDocIdNew :{}",designDocId);
|
||||||
for (Object temporal: temporalStartKey.toList()){
|
for (Object temporal: temporalStartKey.toList()){
|
||||||
if (!temporal.toString().isEmpty())
|
if (!temporal.toString().isEmpty())
|
||||||
startKey.add(temporal);
|
startKey.add(temporal);
|
||||||
|
@ -735,7 +732,7 @@ AccountingPersistenceBackendQuery {
|
||||||
Number n = jsonObject.getDouble(orderingProperty);
|
Number n = jsonObject.getDouble(orderingProperty);
|
||||||
if (n==null)
|
if (n==null)
|
||||||
n=0;
|
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 =
|
NumberedFilter numberedFilter =
|
||||||
new NumberedFilter(key, value, n, orderingProperty);
|
new NumberedFilter(key, value, n, orderingProperty);
|
||||||
|
|
||||||
|
|
Reference in New Issue