Merge pull request #41 from usergrid/USERGRID-2862-limitfix
Usergrid 2862 limitfix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c36f5ae6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c36f5ae6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c36f5ae6
Branch: refs/pull/39/merge
Commit: c36f5ae6811f579ce22941b409b15ef41efb83fa
Parents: 391e7f4 acc95d1
Author: tonuquq <tonuquq@gmail.com>
Authored: Wed Jan 29 08:09:44 2014 -0800
Committer: tonuquq <tonuquq@gmail.com>
Committed: Wed Jan 29 08:09:44 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(-)
----------------------------------------------------------------------
|