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

Allow to specify a limit when querying values for suggestion. refs #9943 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-analytics-persistence-couchbase@155177 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2017-10-12 13:56:51 +00:00
parent a94ce71465
commit 8b513d5c8a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1181,9 +1181,10 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
}
@Override
@Deprecated
public SortedSet<NumberedFilter> getFilterValues(Class<? extends AggregatedRecord<?, ?>> clz,
TemporalConstraint temporalConstraint, List<Filter> filters, String key) throws Exception {
return getFilterValues(clz, temporalConstraint, filters, key, 100);
return getFilterValues(clz, temporalConstraint, filters, key, null);
}
/**
@ -1198,7 +1199,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
*/
@Override
public SortedSet<NumberedFilter> getFilterValues(Class<? extends AggregatedRecord<?, ?>> clz,
TemporalConstraint temporalConstraint, List<Filter> filters, String key, int limit) throws Exception {
TemporalConstraint temporalConstraint, List<Filter> filters, String key, Integer limit) throws Exception {
String currentScope = ScopeProvider.instance.get();
@ -1218,7 +1219,9 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
query.groupLevel(groupLevel);
query.startKey(startKey);
query.descending(false);
query.limit(limit);
if(limit !=null){
query.limit(limit);
}
String orderingProperty = AccountingPersistenceQuery.getDefaultOrderingProperties(clz);

2
src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java
View File

@ -639,7 +639,7 @@ public class AccountingPersistenceQueryCouchBaseTest extends ScopedTest {
String key="dataServiceId";
SortedSet<NumberedFilter> listFilterValue =
accountingPersistenceQueryCouchBase.getFilterValues(AggregatedStorageStatusRecord.class, null, null, key);
accountingPersistenceQueryCouchBase.getFilterValues(AggregatedStorageStatusRecord.class, null, null, key, null);
logger.debug("Result final{}", listFilterValue);
}