usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [48/50] [abbrv] incubator-usergrid git commit: Merge branch 'two-dot-o' into two-dot-o-events
Date Mon, 08 Dec 2014 21:24:30 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/bd3b422d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bd3b422d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bd3b422d

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

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        | 216 +++---
 .../corepersistence/util/CpEntityMapUtils.java  |  32 +-
 .../batch/job/SchedulerRuntimeIntervalIT.java   |  49 +-
 .../migration/EntityDataMigrationIT.java        | 139 ++--
 .../migration/EntityTypeMappingMigrationIT.java |  89 ++-
 .../apache/usergrid/persistence/CounterIT.java  |  89 ++-
 .../usergrid/persistence/CountingMutatorIT.java |   4 +-
 .../persistence/EntityDictionaryIT.java         |  11 +-
 .../usergrid/persistence/EntityManagerIT.java   |  47 +-
 .../org/apache/usergrid/persistence/GeoIT.java  | 771 +++++++++----------
 .../persistence/GeoQueryBooleanTest.java        |   7 +-
 .../apache/usergrid/persistence/IndexIT.java    |  14 +-
 .../usergrid/persistence/PathQueryIT.java       |  10 +-
 .../PerformanceEntityRebuildIndexTest.java      |   6 +-
 .../usergrid/persistence/PermissionsIT.java     |   5 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |   9 +-
 .../query/AbstractIteratingQueryIT.java         |   3 +-
 stack/core/src/test/resources/log4j.properties  |   5 +-
 .../data/DataMigrationManagerImpl.java          |  29 +-
 .../persistence/index/IndexIdentifier.java      |   4 +
 .../index/impl/EsEntityIndexImpl.java           |  58 +-
 21 files changed, 836 insertions(+), 761 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bd3b422d/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bd3b422d/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 86826a5,eb050d6..0614220
--- 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
@@@ -351,9 -347,10 +356,9 @@@ public class EsEntityIndexImpl implemen
              }
  
  
 -
              if ( logger.isDebugEnabled() ) {
-                 logger.debug( "Searching index {}\n  scope{} \n type {}\n   query {} ",
new Object[] {
-                         this.alias, context, entityTypes, srb
+                 logger.debug( "Searching index {}\n  scope{} \n type {}\n   query {} ",

+                         new Object[] { this.alias, context, entityTypes, srb
                  } );
  
              }
@@@ -483,9 -480,13 +488,16 @@@
          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 {


Mime
View raw message