This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch unomi-1.5.x in repository https://gitbox.apache.org/repos/asf/unomi.git
commit e2389a3cfb3318e6e34ddc07ad1f89da9c8d27fc Author: Liran Yogev <[email protected]> AuthorDate: Tue Sep 22 11:55:40 2020 +0300 feat(DATA_3381-merging-monthly-indices): remove itemsMonthlyIndexed f… (#39) (#199) * feat(DATA_3381-merging-monthly-indices): remove itemsMonthlyIndexed from blueprint, put it in config instead * feat(DATA_3381-merging-monthly-indices): sending none if monthlyIndex should contain nothing Co-authored-by: amitco1 <[email protected]> (cherry picked from commit 0192804c6c8b249e10d0431f36766514a47a7ce4) --- package/src/main/resources/etc/custom.system.properties | 1 + .../elasticsearch/ElasticSearchPersistenceServiceImpl.java | 8 +++++--- .../core/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 7 +------ .../main/resources/org.apache.unomi.persistence.elasticsearch.cfg | 1 + 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package/src/main/resources/etc/custom.system.properties b/package/src/main/resources/etc/custom.system.properties index e5b44b2..dd58502 100644 --- a/package/src/main/resources/etc/custom.system.properties +++ b/package/src/main/resources/etc/custom.system.properties @@ -77,6 +77,7 @@ org.apache.unomi.elasticsearch.monthlyIndex.nbShards=${env:UNOMI_ELASTICSEARCH_M org.apache.unomi.elasticsearch.monthlyIndex.nbReplicas=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_REPLICAS:-0} org.apache.unomi.elasticsearch.monthlyIndex.indexMappingTotalFieldsLimit=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_MAPPINGTOTALFIELDSLIMIT:-1000} org.apache.unomi.elasticsearch.monthlyIndex.indexMaxDocValueFieldsSearch=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_MAXDOCVALUEFIELDSSEARCH:-1000} +org.apache.unomi.elasticsearch.monthlyIndex.itemsMonthlyIndexedOverride=${env:UNOMI_ELASTICSEARCH_MONTHLYINDEX_ITEMSMONTHLYINDEXED:-event,session} org.apache.unomi.elasticsearch.defaultIndex.nbShards=${env:UNOMI_ELASTICSEARCH_DEFAULTINDEX_SHARDS:-5} org.apache.unomi.elasticsearch.defaultIndex.nbReplicas=${env:UNOMI_ELASTICSEARCH_DEFAULTINDEX_REPLICAS:-0} org.apache.unomi.elasticsearch.defaultIndex.indexMappingTotalFieldsLimit=${env:UNOMI_ELASTICSEARCH_DEFAULTINDEX_MAPPINGTOTALFIELDSLIMIT:-1000} 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 711a859..b86b368 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 @@ -129,6 +129,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, public static final String BULK_PROCESSOR_CONCURRENT_REQUESTS = "bulkProcessor.concurrentRequests"; public static final String BULK_PROCESSOR_BULK_ACTIONS = "bulkProcessor.bulkActions"; public static final String BULK_PROCESSOR_BULK_SIZE = "bulkProcessor.bulkSize"; + public static final String MONTHLY_INDEX_ITEMS_MONTHLY_INDEXED = "monthlyIndex.itemsMonthlyIndexedOverride"; public static final String BULK_PROCESSOR_FLUSH_INTERVAL = "bulkProcessor.flushInterval"; public static final String BULK_PROCESSOR_BACKOFF_POLICY = "bulkProcessor.backoffPolicy"; public static final String INDEX_DATE_PREFIX = "date-"; @@ -157,6 +158,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, private Integer defaultQueryLimit = 10; + private String itemsMonthlyIndexedOverride = "event,session"; private String bulkProcessorConcurrentRequests = "1"; private String bulkProcessorBulkActions = "1000"; private String bulkProcessorBulkSize = "5MB"; @@ -239,8 +241,8 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, this.defaultQueryLimit = defaultQueryLimit; } - public void setItemsMonthlyIndexed(List<String> itemsMonthlyIndexed) { - this.itemsMonthlyIndexed = itemsMonthlyIndexed; + public void setItemsMonthlyIndexedOverride(String itemsMonthlyIndexedOverride) { + this.itemsMonthlyIndexedOverride = itemsMonthlyIndexedOverride; } public void setRoutingByType(Map<String, String> routingByType) { @@ -339,7 +341,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, bulkProcessorBulkSize = System.getProperty(BULK_PROCESSOR_BULK_SIZE, bulkProcessorBulkSize); bulkProcessorFlushInterval = System.getProperty(BULK_PROCESSOR_FLUSH_INTERVAL, bulkProcessorFlushInterval); bulkProcessorBackoffPolicy = System.getProperty(BULK_PROCESSOR_BACKOFF_POLICY, bulkProcessorBackoffPolicy); - + itemsMonthlyIndexed = itemsMonthlyIndexedOverride.equals("none") ? Collections.emptyList() : Arrays.asList(System.getProperty(MONTHLY_INDEX_ITEMS_MONTHLY_INDEXED, itemsMonthlyIndexedOverride).split(",").clone()); // this property is used for integration tests, to make sure we don't conflict with an already running ElasticSearch instance. if (System.getProperty("org.apache.unomi.itests.elasticsearch.http.port") != null) { elasticSearchAddressList.clear(); 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 db88c36..04bd53b 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 @@ -105,12 +105,7 @@ <property name="indexMaxDocValueFieldsSearch" value="${es.indexMaxDocValueFieldsSearch}"/> <property name="elasticSearchAddresses" value="${es.elasticSearchAddresses}"/> <property name="defaultQueryLimit" value="${es.defaultQueryLimit}"/> - <property name="itemsMonthlyIndexed"> - <list> - <value>event</value> - <value>session</value> - </list> - </property> + <property name="itemsMonthlyIndexedOverride" value="${es.monthlyIndex.itemsMonthlyIndexedOverride}" /> <property name="routingByType"> <map> </map> 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 54522c8..ffecb4a 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 @@ -25,6 +25,7 @@ monthlyIndex.numberOfShards=${org.apache.unomi.elasticsearch.monthlyIndex.nbShar monthlyIndex.numberOfReplicas=${org.apache.unomi.elasticsearch.monthlyIndex.nbReplicas:-0} monthlyIndex.indexMappingTotalFieldsLimit=${org.apache.unomi.elasticsearch.monthlyIndex.indexMappingTotalFieldsLimit:-1000} monthlyIndex.indexMaxDocValueFieldsSearch=${org.apache.unomi.elasticsearch.monthlyIndex.indexMaxDocValueFieldsSearch:-1000} +monthlyIndex.itemsMonthlyIndexedOverride=${org.apache.unomi.elasticsearch.monthlyIndex.itemsMonthlyIndexedOverride:-event,session} numberOfShards=${org.apache.unomi.elasticsearch.defaultIndex.nbShards:-5} numberOfReplicas=${org.apache.unomi.elasticsearch.defaultIndex.nbReplicas:-0} indexMappingTotalFieldsLimit=${org.apache.unomi.elasticsearch.defaultIndex.indexMappingTotalFieldsLimit:-1000}
