Merge branch 'selectiveIndexingCherryPicked' into release-2.1.1 * selectiveIndexingCherryPicked: (33 commits) Removed all instance of java.util.Optional from selective indexing. Add some more comments and clarity to selective indexing. Added tests and code to cover the following cases: Somebody doesn't have a field array in the payload submitted to the index schema. Somebody submits something other than a JSON array to the "fields" field. Cleaned up the old code that used to do the filtering. Created a easier to understand algorithm that checks for top level indexing values. Passes existing tests. Forced the indexing schema to store the map instead of the JSON string that way we only do the parsing once if we're doing a lot of get's on the schema. Added a way to use the existing reindex code to reindex the collection rather than copying and pasting the reindex code. Added a delete test and a delete endpoint so that we can delete schema's Added a put that will automatically invalidate the cache. Removed the index schema cache from the manager cache as it can and should stand alone. Added the index schema cache to the index service. Added first instances of using a cache for access index schema values Removed all unused imports in cpRelationManager and IndexServiceImpl and EsEntityIndexBatchImpl. Re-added final keyword to indexing interface Changed the seemingly not working delay to 50 millisecond , moved the collection reindexing timer updating code to be easier to follow. Cleaning up the left over code from the endeavor. Simplified the CollectionResource and remove recursive call based on serviceResource wonkiness Working lower level selective indexing. Working field updates when we do reindexing and stuff. Added test proving that it works. Comments with changes to make to selective indexing. Changes to reindexing to add a delay given the reindexing call. Commented out the delay because it broke tests. Cleaned up some commented out code and spaces. Cleaned up the updating test to verify that a collection of 10 will be indexed. ...
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/74de4bca Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/74de4bca Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/74de4bca Branch: refs/heads/asf-site Commit: 74de4bca3a6c74b1a8491b9bc093cda9e9b26add Parents: 29d7660 d751ac1 Author: George Reyes <g...@apache.org> Authored: Fri Apr 8 13:20:27 2016 -0700 Committer: George Reyes <g...@apache.org> Committed: Fri Apr 8 13:20:27 2016 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 3 - .../usergrid/corepersistence/CoreModule.java | 6 + .../corepersistence/CpEntityManager.java | 111 +++- .../corepersistence/CpEntityManagerFactory.java | 8 +- .../corepersistence/CpManagerCache.java | 2 +- .../corepersistence/CpRelationManager.java | 5 - .../usergrid/corepersistence/ManagerCache.java | 2 +- .../asyncevents/EventBuilderImpl.java | 1 - .../corepersistence/index/IndexSchemaCache.java | 50 ++ .../index/IndexSchemaCacheFactory.java | 44 ++ .../index/IndexSchemaCacheFig.java | 39 ++ .../index/IndexSchemaCacheImpl.java | 119 ++++ .../corepersistence/index/IndexServiceImpl.java | 94 ++- .../index/ReIndexRequestBuilder.java | 7 + .../index/ReIndexRequestBuilderImpl.java | 32 + .../index/ReIndexServiceImpl.java | 39 +- .../usergrid/persistence/EntityManager.java | 7 + .../persistence/cassandra/ApplicationCF.java | 2 +- .../impl/EntityCollectionManagerImpl.java | 2 +- .../core/consistency/TimeServiceImpl.java | 5 +- .../persistence/map/impl/MapManagerImpl.java | 6 + .../persistence/index/EntityIndexBatch.java | 13 +- .../index/impl/EntityToMapConverter.java | 93 ++- .../index/impl/EsEntityIndexBatchImpl.java | 21 +- .../persistence/index/impl/IndexOperation.java | 9 +- .../persistence/index/impl/EntityIndexTest.java | 2 +- .../org/apache/usergrid/rest/ApiResponse.java | 7 +- .../rest/applications/ApplicationResource.java | 2 +- .../rest/applications/CollectionResource.java | 233 +++++++ .../rest/applications/ServiceResource.java | 111 +++- .../usergrid/rest/system/IndexResource.java | 6 + .../collection/CollectionsResourceIT.java | 622 ++++++++++++++++++- .../test/resource/endpoints/NamedResource.java | 22 + .../services/AbstractCollectionService.java | 39 ++ .../services/AbstractConnectionsService.java | 13 + .../usergrid/services/AbstractService.java | 11 +- .../org/apache/usergrid/services/Service.java | 3 + .../usergrid/services/ServiceManager.java | 1 - .../usergrid/services/ServiceRequest.java | 5 + .../applications/ApplicationsService.java | 14 + 40 files changed, 1738 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/74de4bca/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ----------------------------------------------------------------------
