Repository: metamodel Updated Branches: refs/heads/master a0786cf21 -> 61479411c
METAMODEL-123: Added Dennis Du Krøger's fix. Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/61479411 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/61479411 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/61479411 Branch: refs/heads/master Commit: 61479411c55050b9519ea7aeef7eb61749a71ae7 Parents: a0786cf Author: Kasper Sørensen <[email protected]> Authored: Sat Mar 21 16:45:48 2015 +0100 Committer: Kasper Sørensen <[email protected]> Committed: Sat Mar 21 16:45:48 2015 +0100 ---------------------------------------------------------------------- CHANGES.md | 4 ++++ elasticsearch/pom.xml | 2 +- .../elasticsearch/ElasticSearchDeleteBuilder.java | 15 ++------------- 3 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/61479411/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index c2558f0..da76568 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +### Apache MetaModel work-in-progress + + * [METAMODEL-123] - Added compatibility with ElasticSearch version 1.4.x + ### Apache MetaModel 4.3.2 * [METAMODEL-78] - Fixed a bug that caused SELECT DISTINCT to sometimes return duplicates records on certain DataContext implementations. http://git-wip-us.apache.org/repos/asf/metamodel/blob/61479411/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index 94b36bd..d8eb3a3 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -20,7 +20,7 @@ <name>MetaModel module for Elasticsearch analytics engine</name> <properties> - <elasticsearch.latest.version>1.3.2</elasticsearch.latest.version> + <elasticsearch.latest.version>1.4.4</elasticsearch.latest.version> <elasticsearch.jdk6.version>0.90.13</elasticsearch.jdk6.version> </properties> http://git-wip-us.apache.org/repos/asf/metamodel/blob/61479411/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchDeleteBuilder.java ---------------------------------------------------------------------- diff --git a/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchDeleteBuilder.java b/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchDeleteBuilder.java index 3aae761..b1fdf6e 100644 --- a/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchDeleteBuilder.java +++ b/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchDeleteBuilder.java @@ -19,7 +19,6 @@ package org.apache.metamodel.elasticsearch; import java.util.List; -import java.util.Map; import org.apache.metamodel.MetaModelException; import org.apache.metamodel.delete.AbstractRowDeletionBuilder; @@ -28,8 +27,6 @@ import org.apache.metamodel.query.FilterItem; import org.apache.metamodel.query.LogicalOperator; import org.apache.metamodel.schema.Table; import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder; -import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse; -import org.elasticsearch.action.deletebyquery.IndexDeleteByQueryResponse; import org.elasticsearch.client.Client; import org.elasticsearch.index.query.QueryBuilder; import org.slf4j.Logger; @@ -77,16 +74,8 @@ final class ElasticSearchDeleteBuilder extends AbstractRowDeletionBuilder { + whereItems); } deleteByQueryRequestBuilder.setQuery(queryBuilder); + deleteByQueryRequestBuilder.execute().actionGet(); - final DeleteByQueryResponse response = deleteByQueryRequestBuilder.execute().actionGet(); - - if (logger.isDebugEnabled()) { - final Map<String, Object> headers = response.getHeaders(); - final IndexDeleteByQueryResponse indexResponse = response.getIndex(indexName); - final Map<String, Object> indexHeaders = indexResponse.getHeaders(); - - logger.debug("Deleted documents by query. Response headers: {}, Index headers: {}", headers, indexHeaders); - } + logger.debug("Deleted documents by query."); } - }
