Fix merge issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c69f0ec3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c69f0ec3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c69f0ec3 Branch: refs/heads/two-dot-o-events Commit: c69f0ec33ab4683ded8738f95ff50ffd6c521451 Parents: ee260cc Author: Dave Johnson <[email protected]> Authored: Mon Nov 24 09:32:15 2014 -0500 Committer: Dave Johnson <[email protected]> Committed: Mon Nov 24 09:32:15 2014 -0500 ---------------------------------------------------------------------- .../persistence/index/impl/EsEntityIndexBatchImpl.java | 10 +--------- .../usergrid/persistence/index/impl/IndexingUtils.java | 5 +---- 2 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c69f0ec3/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java index 6e68791..b099678 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java @@ -29,14 +29,7 @@ import java.util.UUID; import org.elasticsearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; -import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest; -import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder; -import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.index.query.FilterBuilders; -import org.elasticsearch.index.query.FilteredQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.TermQueryBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,9 +59,8 @@ import org.apache.usergrid.persistence.model.field.value.EntityObject; import static org.apache.usergrid.persistence.index.impl.IndexingUtils.ANALYZED_STRING_PREFIX; import static org.apache.usergrid.persistence.index.impl.IndexingUtils.BOOLEAN_PREFIX; +import static org.apache.usergrid.persistence.index.impl.IndexingUtils.ENTITYID_ID_FIELDNAME; import static org.apache.usergrid.persistence.index.impl.IndexingUtils.ENTITY_CONTEXT_FIELDNAME; -import static org.apache.usergrid.persistence.index.impl.IndexingUtils.ENTITY_ID_FIELDNAME; -import static org.apache.usergrid.persistence.index.impl.IndexingUtils.ENTITY_VERSION_FIELDNAME; import static org.apache.usergrid.persistence.index.impl.IndexingUtils.GEO_PREFIX; import static org.apache.usergrid.persistence.index.impl.IndexingUtils.NUMBER_PREFIX; import static org.apache.usergrid.persistence.index.impl.IndexingUtils.STRING_PREFIX; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c69f0ec3/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java index 4319ce4..30b05e4 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java @@ -47,10 +47,7 @@ public class IndexingUtils { public static final String ENTITY_CONTEXT_FIELDNAME = "ug_context"; - public static final String ENTITY_ID_FIELDNAME = "ug_entityId"; - - public static final String ENTITY_VERSION_FIELDNAME = "ug_entityVersion"; - + public static final String ENTITYID_ID_FIELDNAME = "ug_entityId"; /**
