You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/27 00:38:23 UTC
[07/24] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-273-indexbuffer
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5c3a3c56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5c3a3c56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5c3a3c56
Branch: refs/heads/two-dot-o
Commit: 5c3a3c564d2920712edfba0a91b64eb0479c50fd
Parents: 6075635 f004f5a
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Feb 23 08:34:16 2015 -0500
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Feb 23 08:34:16 2015 -0500
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 52 +++--
.../corepersistence/CpEntityManagerFactory.java | 130 ++++++++++---
.../usergrid/corepersistence/CpWalker.java | 98 ++++++----
.../corepersistence/util/CpNamingUtils.java | 3 +
.../usergrid/persistence/EntityManager.java | 3 +
.../persistence/EntityManagerFactory.java | 14 +-
.../cassandra/EntityManagerFactoryImpl.java | 28 ++-
.../cassandra/EntityManagerImpl.java | 7 +
.../PerformanceEntityRebuildIndexTest.java | 191 +++++++++++++++++--
.../cassandra/EntityManagerFactoryImplIT.java | 66 ++++++-
.../impl/EntityCollectionManagerImpl.java | 7 +-
stack/pom.xml | 6 +-
stack/rest/pom.xml | 43 ++---
.../org/apache/usergrid/rest/IndexResource.java | 95 +++++++--
.../org/apache/usergrid/rest/RootResource.java | 25 ++-
.../rest/applications/ApplicationResource.java | 72 ++++---
.../applications/ApplicationsResource.java | 28 +--
.../apache/usergrid/rest/IndexResourceIT.java | 2 +-
.../management/importer/ImportCollectionIT.java | 16 +-
19 files changed, 678 insertions(+), 208 deletions(-)
----------------------------------------------------------------------