From 8b513d5c8ad1a8a7ba5dcee517ad195172e39086 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 12 Oct 2017 13:56:51 +0000 Subject: [PATCH] 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 --- .../couchbase/AccountingPersistenceQueryCouchBase.java | 9 ++++++--- .../AccountingPersistenceQueryCouchBaseTest.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java index 7b79487..f110307 100644 --- a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java +++ b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java @@ -1181,9 +1181,10 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc } @Override + @Deprecated public SortedSet getFilterValues(Class> clz, TemporalConstraint temporalConstraint, List 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 getFilterValues(Class> clz, - TemporalConstraint temporalConstraint, List filters, String key, int limit) throws Exception { + TemporalConstraint temporalConstraint, List 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); diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java index 1fdfa89..e3899dc 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java @@ -639,7 +639,7 @@ public class AccountingPersistenceQueryCouchBaseTest extends ScopedTest { String key="dataServiceId"; SortedSet listFilterValue = - accountingPersistenceQueryCouchBase.getFilterValues(AggregatedStorageStatusRecord.class, null, null, key); + accountingPersistenceQueryCouchBase.getFilterValues(AggregatedStorageStatusRecord.class, null, null, key, null); logger.debug("Result final{}", listFilterValue); }