You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 04:40:08 UTC
[42/45] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3e1f33dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3e1f33dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3e1f33dc
Branch: refs/heads/key-row-sharding
Commit: 3e1f33dc86a7c693fc1e4ab3ab406e3e57229c57
Parents: 7cd722e 97ee70f
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 29 13:48:00 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 29 13:48:00 2014 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityDeleteListener.java | 45 +++++++------
.../usergrid/corepersistence/CpSetup.java | 1 -
.../usergrid/corepersistence/CpWalker.java | 44 +++++++-----
.../results/FilteringLoader.java | 63 +++++++++--------
.../results/ResultsLoaderFactory.java | 5 +-
.../results/ResultsLoaderFactoryImpl.java | 4 --
.../results/ResultsVerifier.java | 6 +-
.../results/VersionVerifier.java | 8 ++-
.../corepersistence/util/CpEntityMapUtils.java | 5 +-
.../usergrid/persistence/index/EntityIndex.java | 4 +-
.../persistence/index/EntityIndexBatch.java | 6 --
.../persistence/index/EntityIndexFactory.java | 2 -
.../usergrid/persistence/index/IndexScope.java | 9 +--
.../persistence/index/guice/IndexModule.java | 1 -
.../index/impl/EsEntityIndexBatchImpl.java | 3 +-
.../index/impl/EsEntityIndexImpl.java | 71 ++++++++++----------
.../persistence/index/impl/EsProvider.java | 11 ++-
.../index/query/CandidateResults.java | 7 +-
.../persistence/index/query/Identifier.java | 3 +-
.../usergrid/persistence/index/query/Query.java | 27 +++++---
.../persistence/index/query/Results.java | 4 +-
21 files changed, 169 insertions(+), 160 deletions(-)
----------------------------------------------------------------------