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 2018/02/17 14:22:46 UTC
[1/2] incubator-unomi git commit: UNOMI-160 Optimize ItemType
retrieval from classes
Repository: incubator-unomi
Updated Branches:
refs/heads/master 4218ccafb -> 189687478
UNOMI-160 Optimize ItemType retrieval from classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9ad679ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9ad679ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9ad679ed
Branch: refs/heads/master
Commit: 9ad679ed4ab8ae33f5aa550d25e489e459218be4
Parents: 4218cca
Author: Serge Huber <sh...@jahia.com>
Authored: Sat Feb 17 15:06:01 2018 +0100
Committer: Serge Huber <sh...@jahia.com>
Committed: Sat Feb 17 15:06:01 2018 +0100
----------------------------------------------------------------------
.../ElasticSearchPersistenceServiceImpl.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9ad679ed/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 2f55843..8b1990f 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
@@ -1149,15 +1149,13 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
} catch (UnsupportedOperationException e) {
logger.error("Eval not supported, continue with query", e);
}
- try {
- final Class<? extends Item> clazz = item.getClass();
- String itemType = Item.getItemType(clazz);
+ final Class<? extends Item> clazz = item.getClass();
+ String itemType = Item.getItemType(clazz);
- QueryBuilder builder = QueryBuilders.boolQuery()
- .must(QueryBuilders.idsQuery(itemType).addIds(item.getItemId()))
- .must(conditionESQueryBuilderDispatcher.buildFilter(query));
- return queryCount(builder, itemType) > 0;
- }
+ QueryBuilder builder = QueryBuilders.boolQuery()
+ .must(QueryBuilders.idsQuery(itemType).addIds(item.getItemId()))
+ .must(conditionESQueryBuilderDispatcher.buildFilter(query));
+ return queryCount(builder, itemType) > 0;
}
@Override
[2/2] incubator-unomi git commit: UNOMI-160 Fix compilation issues
Posted by sh...@apache.org.
UNOMI-160 Fix compilation issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/18968747
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/18968747
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/18968747
Branch: refs/heads/master
Commit: 18968747848883bc6af79fd5e2a297b76cd7638f
Parents: 9ad679e
Author: Serge Huber <sh...@jahia.com>
Authored: Sat Feb 17 15:22:34 2018 +0100
Committer: Serge Huber <sh...@jahia.com>
Committed: Sat Feb 17 15:22:34 2018 +0100
----------------------------------------------------------------------
.../elasticsearch/ElasticSearchPersistenceServiceImpl.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/18968747/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 8b1990f..d5f85cf 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
@@ -567,10 +567,6 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
protected T execute(Object... args) throws Exception {
try {
String itemType = Item.getItemType(clazz);
- T itemFromCache = getFromCache(itemId, clazz);
- if (itemFromCache != null) {
- return itemFromCache;
- }
if (itemsMonthlyIndexed.contains(itemType) && dateHint == null) {
PartialList<T> r = query(QueryBuilders.idsQuery(itemType).addIds(itemId), null, clazz, 0, 1, null, null);