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 2015/07/30 20:44:54 UTC
[31/35] incubator-usergrid git commit: Merge branch 'master' into
ug2-doc-update
Merge branch 'master' into ug2-doc-update
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/00852815
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/00852815
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/00852815
Branch: refs/heads/ug2-doc-update
Commit: 0085281524e6c825d00d63b849079226c76b4459
Parents: 169c2e2 2547ee8
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Jul 30 13:20:02 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Jul 30 13:20:02 2015 -0400
----------------------------------------------------------------------
stack/awscluster/.gitignore | 1 +
.../main/resources/usergrid-default.properties | 5 +-
.../src/test/resources/usergrid-test.properties | 3 +
.../persistence/IndexBucketLocator.java | 32 +-
.../apache/usergrid/persistence/Results.java | 10 +-
.../persistence/cassandra/CassandraService.java | 42 +-
.../cassandra/ConnectionRefImpl.java | 10 +
.../cassandra/EntityManagerFactoryImpl.java | 2 +-
.../cassandra/EntityManagerImpl.java | 15 +-
.../persistence/cassandra/GeoIndexManager.java | 99 ++--
.../cassandra/QueryExecutorService.java | 31 ++
.../cassandra/QueryExecutorServiceImpl.java | 118 +++++
.../persistence/cassandra/QueryProcessor.java | 43 +-
.../cassandra/RelationManagerImpl.java | 472 ++++---------------
.../cassandra/SimpleIndexBucketLocatorImpl.java | 4 +-
.../cassandra/index/CassandraColumnUtils.java | 72 +++
.../cassandra/index/ConnectedIndexScanner.java | 66 ++-
.../index/DynamicCompositeComparator.java | 43 ++
.../DynamicCompositeForwardComparator.java | 40 ++
.../DynamicCompositeReverseComparator.java | 39 ++
.../index/DynamicCompositeStartToBytes.java | 48 ++
.../cassandra/index/IndexBucketScanner.java | 102 ++--
.../index/IndexMultiBucketSetLoader.java | 55 ---
.../cassandra/index/IndexScanner.java | 19 +-
.../cassandra/index/NoOpIndexScanner.java | 13 +-
.../cassandra/index/StartToBytes.java | 34 ++
.../cassandra/index/UUIDStartToBytes.java | 41 ++
.../persistence/geo/EntityLocationRef.java | 21 +-
.../persistence/geo/GeoIndexSearcher.java | 18 +-
.../persistence/query/ir/QuerySlice.java | 19 +
.../persistence/query/ir/SearchVisitor.java | 51 +-
.../query/ir/result/AbstractScanColumn.java | 31 +-
.../result/CollectionSearchVisitorFactory.java | 76 +++
.../query/ir/result/CollectionShardFilter.java | 53 +++
.../ir/result/ConnectionIndexSliceParser.java | 37 +-
.../result/ConnectionSearchVisitorFactory.java | 81 ++++
.../query/ir/result/ConnectionShardFilter.java | 50 ++
.../query/ir/result/CursorGenerator.java | 36 ++
.../query/ir/result/EmptyIterator.java | 5 -
.../query/ir/result/GatherIterator.java | 241 ++++++++++
.../query/ir/result/GeoIterator.java | 156 +++---
.../query/ir/result/IntersectionIterator.java | 35 +-
.../query/ir/result/OrderByIterator.java | 144 +++---
.../query/ir/result/ResultIterator.java | 4 +-
.../persistence/query/ir/result/ScanColumn.java | 17 +-
.../ir/result/SearchCollectionVisitor.java | 193 ++++++++
.../ir/result/SearchConnectionVisitor.java | 254 ++++++++++
.../query/ir/result/SearchVisitorFactory.java | 37 ++
.../ir/result/SecondaryIndexSliceParser.java | 252 +++++++++-
.../query/ir/result/ShardFilter.java | 29 ++
.../query/ir/result/ShardFilterIterator.java | 124 +++++
.../query/ir/result/SliceCursorGenerator.java | 55 +++
.../query/ir/result/SliceIterator.java | 85 +---
.../query/ir/result/SliceParser.java | 4 +-
.../query/ir/result/StaticIdIterator.java | 8 +-
.../query/ir/result/SubtractionIterator.java | 20 +-
.../persistence/query/ir/result/UUIDColumn.java | 49 ++
.../query/ir/result/UUIDCursorGenerator.java | 49 ++
.../query/ir/result/UUIDIndexSliceParser.java | 22 +-
.../query/ir/result/UnionIterator.java | 116 +++--
.../main/resources/usergrid-core-context.xml | 5 +
.../usergrid/persistence/CollectionIT.java | 2 +-
.../cassandra/QueryProcessorTest.java | 44 +-
.../SimpleIndexBucketLocatorImplTest.java | 22 +-
.../query/AbstractIteratingQueryIT.java | 3 +
.../query/ir/result/AbstractScanColumnTest.java | 10 +-
.../query/ir/result/InOrderIterator.java | 9 +-
.../query/ir/result/IteratorHelper.java | 4 +-
.../ir/result/ShardFilterIteratorTest.java | 168 +++++++
.../usergrid/rest/AbstractContextResource.java | 67 +--
.../organizations/OrganizationResource.java | 5 +-
.../collection/activities/OrderByTest.java | 24 +-
.../organizations/OrganizationResourceIT.java | 43 +-
.../apache/usergrid/tools/EntityCleanup.java | 80 ++--
.../usergrid/tools/EntityInsertBenchMark.java | 3 +-
.../usergrid/tools/EntityReadBenchMark.java | 11 +-
.../usergrid/tools/UniqueIndexCleanup.java | 186 ++++----
77 files changed, 3312 insertions(+), 1205 deletions(-)
----------------------------------------------------------------------