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/03/10 22:12:06 UTC
[07/11] incubator-usergrid git commit: Merge branch 'USERGRID-461'
into two-dot-o
Merge branch 'USERGRID-461' 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/67309051
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/67309051
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/67309051
Branch: refs/heads/USERGRID-405
Commit: 673090511db43429408d7c6b7863cbe065677d9a
Parents: d901d38 5d95ebb
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Mar 9 16:37:14 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Mar 9 16:37:14 2015 -0600
----------------------------------------------------------------------
.../usergrid/persistence/map/MapManager.java | 8 ++
.../persistence/map/MapManagerFactory.java | 2 +
.../persistence/map/guice/MapModule.java | 6 +-
.../map/impl/MapManagerFactoryImpl.java | 67 ++++++++++
.../persistence/map/impl/MapManagerImpl.java | 6 +
.../persistence/map/impl/MapSerialization.java | 20 ++-
.../map/impl/MapSerializationImpl.java | 85 ++++++++++---
.../persistence/map/MapManagerTest.java | 49 +++++++-
stack/corepersistence/queryindex/pom.xml | 16 ++-
.../persistence/index/guice/IndexModule.java | 4 +
.../index/impl/EsEntityIndexFactoryImpl.java | 12 +-
.../index/impl/EsEntityIndexImpl.java | 57 +++++++--
.../index/impl/EsIndexBufferConsumerImpl.java | 15 ++-
.../persistence/index/impl/IndexingUtils.java | 2 +-
.../persistence/index/utils/StringUtils.java | 126 ++-----------------
.../persistence/index/utils/UUIDUtils.java | 4 -
.../persistence/index/impl/EntityIndexTest.java | 99 ++++++++++++++-
17 files changed, 401 insertions(+), 177 deletions(-)
----------------------------------------------------------------------