You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2017/01/09 16:22:18 UTC
[44/50] [abbrv] incubator-unomi git commit: UNOMI-70 : restored
numberOfShards / numberOfReplicas
UNOMI-70 : restored numberOfShards / numberOfReplicas
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f9418501
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f9418501
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f9418501
Branch: refs/heads/master
Commit: f9418501f47b6dbd577927f7fc53f69b377f9eca
Parents: 88f493c
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Jan 3 19:01:41 2017 +0100
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Jan 3 19:01:41 2017 +0100
----------------------------------------------------------------------
.../ElasticSearchPersistenceServiceImpl.java | 14 ++++++++++++++
.../main/resources/OSGI-INF/blueprint/blueprint.xml | 4 ++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f9418501/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 b3b569c..0958bcd 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
@@ -135,6 +135,8 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
private String indexName;
private String monthlyIndexNumberOfShards;
private String monthlyIndexNumberOfReplicas;
+ private String numberOfShards;
+ private String numberOfReplicas;
private String elasticSearchConfig = null;
private BundleContext bundleContext;
private Map<String, String> mappings = new HashMap<String, String>();
@@ -191,6 +193,14 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
this.monthlyIndexNumberOfReplicas = monthlyIndexNumberOfReplicas;
}
+ public void setNumberOfShards(String numberOfShards) {
+ this.numberOfShards = numberOfShards;
+ }
+
+ public void setNumberOfReplicas(String numberOfReplicas) {
+ this.numberOfReplicas = numberOfReplicas;
+ }
+
public void setAddress(String address) {
this.address = address;
}
@@ -966,6 +976,10 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
private void internalCreateIndex(String indexName, Map<String,String> mappings) {
CreateIndexRequestBuilder builder = client.admin().indices().prepareCreate(indexName)
.setSettings("{\n" +
+ " \"index\" : {\n" +
+ " \"number_of_shards\" : " + numberOfShards + ",\n" +
+ " \"number_of_replicas\" : " + numberOfReplicas + "\n" +
+ " },\n" +
" \"analysis\": {\n" +
" \"analyzer\": {\n" +
" \"folding\": {\n" +
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f9418501/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 fea1879..c929009 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
@@ -33,6 +33,8 @@
<cm:property name="cluster.name" value="contextElasticSearch"/>
<cm:property name="index.name" value="context"/>
<cm:property name="elasticSearchConfig" value="file:${karaf.etc}/elasticsearch.yml"/>
+ <cm:property name="numberOfShards" value="5"/>
+ <cm:property name="numberOfReplicas" value="0"/>
<cm:property name="monthlyIndex.numberOfShards" value="3"/>
<cm:property name="monthlyIndex.numberOfReplicas" value="0"/>
<cm:property name="defaultQueryLimit" value="10"/>
@@ -92,6 +94,8 @@
<property name="indexName" value="${es.index.name}"/>
<property name="monthlyIndexNumberOfShards" value="${es.monthlyIndex.numberOfShards}"/>
<property name="monthlyIndexNumberOfReplicas" value="${es.monthlyIndex.numberOfReplicas}"/>
+ <property name="numberOfShards" value="${es.numberOfShards}"/>
+ <property name="numberOfReplicas" value="${es.numberOfReplicas}"/>
<property name="address" value="${web.contextserver.address}"/>
<property name="port" value="${web.contextserver.port}"/>
<property name="secureAddress" value="${web.contextserver.secureAddress}"/>