Repository: incubator-unomi Updated Branches: refs/heads/master 79198c4d1 -> a9c88997c
UNOMI-26 : set default query limit to 10 Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/a9c88997 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/a9c88997 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/a9c88997 Branch: refs/heads/master Commit: a9c88997c0c778bb0add3712b4dadcc4f4de4bd7 Parents: 79198c4 Author: Thomas Draier <[email protected]> Authored: Tue Apr 26 10:45:42 2016 +0200 Committer: Thomas Draier <[email protected]> Committed: Tue Apr 26 10:45:42 2016 +0200 ---------------------------------------------------------------------- api/src/main/java/org/apache/unomi/api/query/Query.java | 2 +- .../elasticsearch/ElasticSearchPersistenceServiceImpl.java | 9 ++++++++- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 ++ .../org.apache.unomi.persistence.elasticsearch.cfg | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9c88997/api/src/main/java/org/apache/unomi/api/query/Query.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/query/Query.java b/api/src/main/java/org/apache/unomi/api/query/Query.java index fa5803c..25b7743 100644 --- a/api/src/main/java/org/apache/unomi/api/query/Query.java +++ b/api/src/main/java/org/apache/unomi/api/query/Query.java @@ -27,7 +27,7 @@ import org.apache.unomi.api.conditions.Condition; public class Query { private String text; private int offset; - private int limit; + private int limit = Integer.MIN_VALUE; private String sortby; private Condition condition; private boolean forceRefresh; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9c88997/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java index a743237..7bf2f14 100644 --- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java +++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java @@ -125,6 +125,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, private String port; private String secureAddress; private String securePort; + private Integer defaultQueryLimit = 10; private Timer timer; @@ -180,6 +181,10 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, this.securePort = securePort; } + public void setDefaultQueryLimit(Integer defaultQueryLimit) { + this.defaultQueryLimit = defaultQueryLimit; + } + public void setItemsMonthlyIndexed(List<String> itemsMonthlyIndexed) { this.itemsMonthlyIndexed = itemsMonthlyIndexed; } @@ -911,7 +916,9 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, .setFetchSource(true) .setQuery(query) .setFrom(offset); - if (size != -1) { + if (size == Integer.MIN_VALUE) { + requestBuilder.setSize(defaultQueryLimit); + } else if (size != -1) { requestBuilder.setSize(size); } else { requestBuilder.setSize(Integer.MAX_VALUE); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9c88997/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index afa6cd8..5fbc9dd 100644 --- a/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -39,6 +39,7 @@ <cm:property name="numberOfReplicas" value="0"/> <cm:property name="discovery.zen.ping.multicast.enabled" value="false"/> <cm:property name="node.data" value="true"/> + <cm:property name="defaultQueryLimit" value="10"/> </cm:default-properties> </cm:property-placeholder> @@ -88,6 +89,7 @@ <property name="port" value="${web.contextserver.port}"/> <property name="secureAddress" value="${web.contextserver.secureAddress}"/> <property name="securePort" value="${web.contextserver.securePort}"/> + <property name="defaultQueryLimit" value="${es.defaultQueryLimit}"/> <property name="elasticSearchConfig" value="${es.elasticSearchConfig}"/> <property name="itemsMonthlyIndexed"> <list> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9c88997/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg b/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg index d44f2be..fb058a4 100644 --- a/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg +++ b/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg @@ -24,4 +24,5 @@ numberOfShards=5 numberOfReplicas=0 node.data=true discovery.zen.ping.multicast.enabled=false -#discovery.zen.ping.unicast.hosts=["192.168.0.1:9300", "192.168.0.2:9300"] \ No newline at end of file +#discovery.zen.ping.unicast.hosts=["192.168.0.1:9300", "192.168.0.2:9300"] +defaultQueryLimit=10
