Merge remote-tracking branch 'origin/two-dot-o' into USERGRID-250-buffer-size-fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b240c6f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b240c6f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b240c6f7 Branch: refs/heads/USERGRID-250-buffer-size-fix Commit: b240c6f708796144dd9d85027d7a1db8a9a7f5f5 Parents: 56ce7ce 74866a5 Author: Todd Nine <[email protected]> Authored: Fri Nov 21 13:34:56 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Fri Nov 21 13:34:56 2014 -0700 ---------------------------------------------------------------------- .../org/apache/usergrid/persistence/GeoIT.java | 404 +++++++++++++------ .../index/impl/EsEntityIndexBatchImpl.java | 66 +-- .../index/impl/EsEntityIndexImpl.java | 105 +++-- .../persistence/index/impl/EsProvider.java | 55 +-- .../persistence/index/impl/EsQueryVistor.java | 3 +- .../index/impl/FailureMonitorImpl.java | 4 +- .../persistence/index/impl/IndexingUtils.java | 51 +-- .../index/query/CandidateResults.java | 3 - .../persistence/index/query/EntityResults.java | 4 +- .../persistence/index/query/Identifier.java | 3 +- .../usergrid/persistence/index/query/Query.java | 26 +- .../apache/usergrid/rest/AbstractRestIT.java | 5 +- .../collection/BrowserCompatibilityTest.java | 2 +- .../collection/DuplicateNameIT.java | 2 +- .../collection/activities/PutTest.java | 2 +- .../collection/groups/GroupResourceIT.java | 240 +++++++++-- .../collection/paging/PagingEntitiesTest.java | 4 +- .../collection/paging/PagingResourceIT.java | 14 +- .../users/ConnectionResourceTest.java | 16 +- .../collection/users/OwnershipResourceIT.java | 18 +- .../collection/users/RetrieveUsersTest.java | 4 +- .../applications/queries/AndOrQueryTest.java | 13 +- .../queries/BadGrammarQueryTest.java | 2 +- .../applications/queries/GeoPagingTest.java | 222 +++++++++- .../applications/queries/MatrixQueryTests.java | 2 +- .../rest/applications/queries/OrderByTest.java | 6 +- .../usergrid/rest/test/resource/Connection.java | 9 + .../rest/test/resource/TestContext.java | 66 ++- .../rest/test/resource/ValueResource.java | 2 + .../rest/test/resource/app/Application.java | 16 +- .../rest/test/resource/app/Collection.java | 81 ++++ .../usergrid/rest/test/resource/app/Group.java | 56 +++ .../test/resource/app/GroupsCollection.java | 66 +++ .../usergrid/rest/test/resource/app/Role.java | 56 +++ .../rest/test/resource/app/RolesCollection.java | 64 +++ .../rest/test/resource/app/UsersCollection.java | 26 +- 36 files changed, 1336 insertions(+), 382 deletions(-) ----------------------------------------------------------------------
