usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [11/13] git commit: Merge branch 'two-dot-o-rebuildable-index' into two-dot-o
Date Thu, 02 Oct 2014 05:44:21 GMT
Merge branch 'two-dot-o-rebuildable-index' 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/b2b8886e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b2b8886e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b2b8886e

Branch: refs/heads/esbatching
Commit: b2b8886ef3351a24c2ef5d7785c2d3fd09265353
Parents: 1e7da5c 9a670e3
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Wed Oct 1 23:28:19 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Wed Oct 1 23:28:19 2014 -0400

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        | 519 +++++++++++++++----
 .../corepersistence/CpEntityManagerFactory.java | 495 ++++++++----------
 .../corepersistence/CpRelationManager.java      | 356 +++++--------
 .../usergrid/corepersistence/CpSetup.java       |  55 +-
 .../HybridEntityManagerFactory.java             |  18 +-
 .../persistence/EntityManagerFactory.java       |  12 +-
 .../persistence/cassandra/CassandraService.java |   5 -
 .../cassandra/EntityManagerFactoryImpl.java     |  54 +-
 .../PerformanceEntityRebuildIndexTest.java      | 278 ++++++++++
 .../cassandra/EntityManagerFactoryImplIT.java   |  10 +-
 stack/core/src/test/resources/log4j.properties  |  13 +-
 .../usergrid/persistence/index/IndexFig.java    |   7 +
 .../index/impl/EsEntityIndexImpl.java           |  18 +
 .../persistence/index/impl/EsProvider.java      |  15 +
 .../org/apache/usergrid/tools/IndexRebuild.java |  63 ++-
 stack/tools/src/main/resources/log4j.properties |  18 +-
 16 files changed, 1206 insertions(+), 730 deletions(-)
----------------------------------------------------------------------



Mime
View raw message