usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [49/50] [abbrv] incubator-usergrid git commit: Merge branch 'two-dot-o' into two-dot-o-events
Date Mon, 08 Dec 2014 21:24:31 GMT
Merge branch 'two-dot-o' into two-dot-o-events

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
	stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bf47eb37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bf47eb37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bf47eb37

Branch: refs/heads/two-dot-o-events
Commit: bf47eb371a753c9261d82c75390482141c551627
Parents: bd3b422
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Mon Dec 8 15:53:47 2014 -0500
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Mon Dec 8 15:53:47 2014 -0500

----------------------------------------------------------------------
 .../usergrid/persistence/index/impl/EsEntityIndexImpl.java  | 9 ---------
 1 file changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf47eb37/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 0614220..51ee915 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -254,7 +254,6 @@ public class EsEntityIndexImpl implements EntityIndex {
                 logger.info( "Successfully deleted all documents in index {} and type {}",

                         alias, VERIFY_TYPE );
 
-
                 return true;
             }
         };
@@ -360,10 +359,8 @@ public class EsEntityIndexImpl implements EntityIndex {
                 logger.debug( "Searching index {}\n  scope{} \n type {}\n   query {} ", 
                         new Object[] { this.alias, context, entityTypes, srb
                 } );
-
             }
 
-
             try {
                 searchResponse = srb.execute().actionGet();
             }
@@ -488,17 +485,11 @@ public class EsEntityIndexImpl implements EntityIndex {
         final QueryBuilder queryBuilder = 
                 QueryBuilders.termQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context
);
 
-
         final SearchRequestBuilder srb = esProvider.getClient().prepareSearch( alias.getReadAlias()
)
                 .setTypes(searchTypes.getTypeNames())
                 .setScroll(cursorTimeout + "m")
                 .setQuery(queryBuilder);
 
-
-        final SearchRequestBuilder srb = esProvider.getClient().prepareSearch( alias.getReadAlias()
)
-                .setTypes(searchTypes.getTypeNames())
-                .setScroll(cursorTimeout + "m").setQuery(queryBuilder);
-
         final SearchResponse searchResponse;
         try {
             searchResponse = srb.execute().actionGet();


Mime
View raw message