You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/29 04:21:06 UTC
[2/2] git commit: Merge acc95d131b33cc56dd0df3979bd75a40fc867678 into
391e7f4dc61ba9eea8ca4af897f06afe525eaeb6
Merge acc95d131b33cc56dd0df3979bd75a40fc867678 into 391e7f4dc61ba9eea8ca4af897f06afe525eaeb6
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/31dbeed9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/31dbeed9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/31dbeed9
Branch: refs/pull/41/merge
Commit: 31dbeed908d9ce78857b17304e91277b01888f62
Parents: 391e7f4 acc95d1
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Jan 28 18:35:47 2014 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Jan 28 18:35:47 2014 -0800
----------------------------------------------------------------------
.../persistence/cassandra/CassandraService.java | 7 +-
.../persistence/cassandra/QueryProcessor.java | 2 +-
.../cassandra/RelationManagerImpl.java | 22 ++---
.../cassandra/index/ConnectedIndexScanner.java | 77 +++++++++++++----
.../cassandra/index/IndexBucketScanner.java | 33 ++++++--
.../persistence/query/ir/SearchVisitor.java | 7 +-
.../query/ir/result/IntersectionIterator.java | 4 +-
.../query/ir/result/MergeIterator.java | 28 +++++--
.../query/ir/result/SliceIterator.java | 12 +--
.../query/ir/result/UnionIterator.java | 17 +++-
.../query/AllInConnectionNoTypeIT.java | 1 +
.../query/IntersectionUnionPagingIT.java | 20 +++--
.../ir/result/IntersectionIteratorTest.java | 12 +--
.../query/ir/result/UnionIteratorTest.java | 88 ++++++++++++++++++++
stack/tools/pom.xml | 4 +
.../java/org/usergrid/tools/EntityCleanup.java | 4 +-
.../org/usergrid/tools/UniqueIndexCleanup.java | 4 +-
.../java/org/usergrid/tools/bean/ExportOrg.java | 11 +++
18 files changed, 272 insertions(+), 81 deletions(-)
----------------------------------------------------------------------