usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [2/2] git commit: Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding
Date Mon, 03 Nov 2014 15:17:48 GMT
Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into key-row-sharding


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

Branch: refs/heads/key-row-sharding
Commit: a5dc3a49627579e190b0851c2e9c4da5e6515c80
Parents: 3bfa440 eec9a62
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Mon Nov 3 08:17:21 2014 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Mon Nov 3 08:17:21 2014 -0700

----------------------------------------------------------------------
 .../main/dist/init_instance/init_db_server.sh   |   7 +-
 .../dist/init_instance/init_opscenter_server.sh | 106 +++++++
 .../dist/init_instance/install_cassandra.sh     |   9 -
 .../dist/init_instance/install_elasticsearch.sh |  10 +
 .../init_instance/install_opscenter_agent.sh    |   7 +
 .../main/groovy/configure_elasticsearch.groovy  |  44 ++-
 .../groovy/configure_opscenter_agent.groovy     |   4 +-
 .../groovy/configure_opscenter_cassandra.groovy | 120 ++++++++
 .../groovy/configure_opscenter_usergrid.groovy  |  55 ++++
 .../src/main/groovy/configure_usergrid.groovy   |   7 +
 stack/awscluster/ugcluster-cf.json              | 275 ++++++++++++++++++-
 .../main/resources/usergrid-default.properties  |   3 +
 .../corepersistence/CpEntityManagerFactory.java |  20 ++
 .../HybridEntityManagerFactory.java             |  10 +
 .../persistence/EntityManagerFactory.java       |   4 +
 .../cassandra/EntityManagerFactoryImpl.java     |  10 +
 .../usergrid/ConcurrentCoreIteratorITSuite.java |   3 +-
 .../org/apache/usergrid/CoreITSetupImpl.java    |   4 +-
 .../java/org/apache/usergrid/CoreITSuite.java   |   5 +-
 .../batch/job/AbstractSchedulerRuntimeIT.java   |   9 +-
 .../collection/EntityCollectionManager.java     |  10 +-
 .../impl/EntityCollectionManagerImpl.java       | 107 +++++---
 .../serialization/SerializationFig.java         |   4 -
 .../collection/EntityCollectionManagerIT.java   |  12 +
 .../persistence/core/test/ITRunner.java         |   3 +
 .../usergrid/persistence/index/EntityIndex.java |  14 +-
 .../usergrid/persistence/index/IndexFig.java    |  12 +
 .../index/impl/EsEntityIndexImpl.java           | 117 +++++---
 .../persistence/index/impl/EsProvider.java      | 127 ++++-----
 .../index/impl/CorePerformanceIT.java           |   2 +-
 .../index/impl/ElasticSearchResource.java       | 171 ++++++++++++
 .../index/impl/ElasticSearchRule.java           |  50 ----
 .../impl/EntityConnectionIndexImplTest.java     |  27 +-
 .../persistence/index/impl/EntityIndexTest.java |   5 +-
 .../persistence/index/impl/EsRunner.java        |  51 ++++
 .../src/test/resources/usergrid-UNIT.properties |   2 +-
 stack/loadtests/pom.xml                         |   6 +-
 .../src/test/resources/logback-test.xml         |  17 +-
 stack/loadtests/src/test/resources/logback.xml  |   3 +-
 .../apache/usergrid/rest/SwaggerServlet.java    |   5 +-
 .../rest/filters/HealthCheckFilter.java         |  67 +++++
 stack/rest/src/main/webapp/WEB-INF/web.xml      |  10 +
 .../java/org/apache/usergrid/rest/ITSetup.java  |   8 +-
 .../org/apache/usergrid/rest/RestITSuite.java   |   4 +-
 .../org/apache/usergrid/ServiceITSetupImpl.java |   1 +
 .../org/apache/usergrid/ServiceITSuite.java     |   3 +-
 stack/test-utils/pom.xml                        |   7 +
 .../org/apache/usergrid/ElasticSearchMain.java  | 107 --------
 .../apache/usergrid/ElasticSearchResource.java  | 178 ------------
 49 files changed, 1264 insertions(+), 578 deletions(-)
----------------------------------------------------------------------



Mime
View raw message