usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [13/25] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' into USERGRID-509
Date Wed, 01 Apr 2015 20:44:48 GMT
Merge branch 'two-dot-o-dev' into USERGRID-509


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5eb4d0b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5eb4d0b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5eb4d0b8

Branch: refs/heads/two-dot-o-dev
Commit: 5eb4d0b80fd837cbf75f02d127891974ef0a01bf
Parents: 7c356d8 07cb9df
Author: Todd Nine <tnine@apigee.com>
Authored: Mon Mar 30 13:54:41 2015 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Mon Mar 30 13:54:41 2015 -0600

----------------------------------------------------------------------
 .../AllApplicationsObservable.java              |   8 +-
 .../usergrid/corepersistence/CoreModule.java    |   9 +-
 .../corepersistence/CpEntityManager.java        |  92 ++++----
 .../corepersistence/CpEntityManagerFactory.java |  14 +-
 .../rx/impl/AbstractGraphVisitorImpl.java       |   2 +-
 .../rx/impl/AllApplicationsObservableImpl.java  |   2 +-
 .../rx/ApplicationObservableTestIT.java         |   2 +-
 .../core/metrics/MetricsFactory.java            |   2 +-
 .../data/DataMigrationManagerImpl.java          |   9 +-
 .../impl/migration/EdgeDataMigrationImpl.java   |   2 +-
 .../index/ApplicationEntityIndex.java           |  20 +-
 .../usergrid/persistence/index/EntityIndex.java |  12 +-
 .../usergrid/persistence/index/IndexAlias.java  |  38 ++++
 .../persistence/index/IndexBufferConsumer.java  |   2 +-
 .../persistence/index/IndexBufferProducer.java  |   2 +-
 .../usergrid/persistence/index/IndexCache.java  |  39 ++++
 .../persistence/index/IndexIdentifier.java      |  57 +----
 .../usergrid/persistence/index/SearchType.java  |  12 +-
 .../usergrid/persistence/index/SearchTypes.java |   3 +-
 .../persistence/index/guice/IndexModule.java    |  45 +++-
 .../persistence/index/impl/DeIndexRequest.java  |  42 ++--
 .../index/impl/EntityToMapConverter.java        | 173 ++++++++++++++
 .../impl/EsApplicationEntityIndexImpl.java      | 228 +++++++------------
 .../index/impl/EsEntityIndexBatchImpl.java      | 219 +-----------------
 .../index/impl/EsEntityIndexFactoryImpl.java    |   4 +-
 .../index/impl/EsEntityIndexImpl.java           |  41 ++--
 .../persistence/index/impl/EsIndexCache.java    | 142 ------------
 .../index/impl/EsIndexCacheImpl.java            | 141 ++++++++++++
 .../index/impl/IndexIdentifierImpl.java         |  68 ++++++
 .../persistence/index/impl/IndexRequest.java    |  24 +-
 .../persistence/index/impl/IndexingUtils.java   |  10 +-
 .../impl/SearchRequestBuilderStrategy.java      | 195 ++++++++++++++++
 .../migration/EsIndexDataMigrationImpl.java     | 105 +++++++++
 .../index/migration/EsIndexMigrationPlugin.java |  46 ++++
 .../index/migration/IndexDataVersions.java      |  39 ++++
 .../index/migration/IndexMigration.java         |  35 +++
 .../index/migration/LegacyIndexIdentifier.java  |  78 +++++++
 .../index/query/CandidateResults.java           |  24 +-
 .../usergrid/persistence/index/query/Query.java |  36 +--
 .../index/guice/TestIndexModule.java            |  51 ++++-
 .../index/impl/BufferQueueSQSImplTest.java      |  20 +-
 .../persistence/index/impl/EntityIndexTest.java |  60 +++--
 .../index/impl/IndexLoadTestsIT.java            |   4 -
 .../index/impl/IndexMigrationTest.java          | 106 +++++++++
 .../persistence/query/tree/GrammarTreeTest.java |  10 +-
 .../org/apache/usergrid/rest/RootResource.java  |   2 +-
 46 files changed, 1498 insertions(+), 777 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5eb4d0b8/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5eb4d0b8/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5eb4d0b8/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservableImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5eb4d0b8/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
----------------------------------------------------------------------


Mime
View raw message