usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [4/4] usergrid git commit: Merge commit 'refs/pull/567/head' of github.com:apache/usergrid
Date Thu, 23 Mar 2017 20:28:16 GMT
Merge commit 'refs/pull/567/head' of github.com:apache/usergrid


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

Branch: refs/heads/master
Commit: d92110853e17ab4a67b19ab8b0c28a48584883ce
Parents: 3b1b0ca f556e42
Author: Michael Russo <russomichael@google.com>
Authored: Thu Mar 23 13:27:42 2017 -0700
Committer: Michael Russo <russomichael@google.com>
Committed: Thu Mar 23 13:27:42 2017 -0700

----------------------------------------------------------------------
 .../corepersistence/CpRelationManager.java      |   9 +
 .../pipeline/builder/IdBuilder.java             |  10 +-
 .../pipeline/read/FilterFactory.java            |   7 +-
 .../search/AbstractElasticSearchFilter.java     |  21 ++-
 .../read/search/SearchCollectionFilter.java     |   5 +-
 .../read/search/SearchConnectionFilter.java     |   5 +-
 .../service/AggregationServiceImpl.java         |   6 +-
 .../service/CollectionSearch.java               |  10 ++
 .../service/CollectionServiceImpl.java          |   2 +-
 .../service/ConnectionSearch.java               |  12 ++
 .../service/ConnectionServiceImpl.java          |   4 +-
 .../org/apache/usergrid/persistence/Query.java  |   9 +
 .../org/apache/usergrid/utils/JsonUtils.java    |   2 +-
 .../corepersistence/StaleIndexCleanupTest.java  |   2 +-
 .../index/AsyncIndexServiceTest.java            |   2 +-
 .../corepersistence/index/IndexServiceTest.java |   8 +-
 .../usergrid/persistence/index/EntityIndex.java |  11 +-
 .../usergrid/persistence/index/IndexFig.java    |  39 +++++
 .../persistence/index/QueryAnalyzer.java        | 143 ++++++++++++++++
 .../QueryAnalyzerEnforcementException.java      |  45 +++++
 .../exceptions/QueryAnalyzerException.java      |  57 +++++++
 .../index/impl/EsEntityIndexImpl.java           |  61 ++++++-
 .../persistence/index/impl/EntityIndexTest.java |  86 +++++-----
 .../persistence/index/impl/GeoPagingTest.java   |   2 +-
 .../index/impl/IndexLoadTestsIT.java            |   2 +-
 .../index/impl/QueryAnalyzerTest.java           | 169 +++++++++++++++++++
 .../rest/applications/CollectionResource.java   |  17 --
 .../rest/applications/ServiceResource.java      |   9 +-
 .../exceptions/AbstractExceptionMapper.java     |  17 +-
 ...QueryAnalyzerEnforcementExceptionMapper.java |  51 ++++++
 .../QueryAnalyzerExceptionMapper.java           |  69 ++++++++
 .../usergrid/services/AbstractService.java      |   2 +
 .../usergrid/services/ServiceManager.java       |  15 +-
 .../usergrid/services/ServiceRequest.java       |  26 ++-
 34 files changed, 809 insertions(+), 126 deletions(-)
----------------------------------------------------------------------



Mime
View raw message