usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [7/8] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Date Fri, 17 Oct 2014 19:12:48 GMT
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
	stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java


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

Branch: refs/heads/two-dot-o
Commit: 6f040c746c96b401743a15ea95a0805eac38ac6e
Parents: bdcf805 2cdcf62
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Fri Oct 17 15:11:41 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Fri Oct 17 15:11:41 2014 -0400

----------------------------------------------------------------------
 stack/awscluster/pom.xml                        |    2 +-
 stack/awscluster/src/main/cql/create_locks.cql  |   24 +-
 .../awscluster/src/main/cql/create_usergrid.cql |   80 +-
 .../main/cql/create_usergrid_applications.cql   |  411 +----
 .../main/dist/init_instance/create_keyspaces.sh |   28 +-
 .../src/main/dist/init_instance/init_cass.sh    |   70 -
 .../main/dist/init_instance/init_db_server.sh   |   11 +-
 .../main/dist/init_instance/init_es_server.sh   |   67 +
 .../dist/init_instance/init_graphite_server.sh  |    6 +
 .../main/dist/init_instance/init_rest_server.sh |   10 +
 .../dist/init_instance/install_cassandra.sh     |    2 +-
 .../dist/init_instance/install_elasticsearch.sh |   19 +-
 .../init_instance/install_opscenter_agent.sh    |    1 +
 .../main/dist/init_instance/install_yourkit.sh  |    6 +-
 .../main/groovy/configure_elasticsearch.groovy  |   23 +-
 .../src/main/groovy/configure_usergrid.groovy   |    9 +-
 .../src/main/groovy/tag_instance.groovy         |   10 +-
 stack/awscluster/ugcluster-cf.json              |  317 +++-
 .../corepersistence/CpEntityManager.java        |  107 +-
 .../corepersistence/CpEntityManagerFactory.java |   40 +-
 .../corepersistence/CpRelationManager.java      | 1427 ++++++++----------
 .../usergrid/corepersistence/CpVisitor.java     |   11 +-
 .../usergrid/corepersistence/CpWalker.java      |  145 +-
 .../usergrid/persistence/EntityManager.java     |    2 +-
 .../persistence/EntityManagerFactory.java       |    8 +-
 .../org/apache/usergrid/CoreApplication.java    |    1 -
 .../PerformanceEntityRebuildIndexTest.java      |   26 +-
 stack/corepersistence/common/pom.xml            |   13 +-
 stack/corepersistence/pom.xml                   |    1 +
 .../index/impl/EsEntityIndexImpl.java           |  146 +-
 .../persistence/index/impl/EsProvider.java      |   21 +-
 stack/corepersistence/queue/pom.xml             |    8 +-
 stack/pom.xml                                   |   25 +-
 .../apache/usergrid/rest/SystemResource.java    |   50 +-
 .../services/devices/DevicesService.java        |   28 +-
 .../services/users/devices/DevicesService.java  |    8 +-
 .../AbstractServiceNotificationIT.java          |    4 -
 .../apns/NotificationsServiceIT.java            |    5 +-
 38 files changed, 1525 insertions(+), 1647 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6f040c74/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
----------------------------------------------------------------------
diff --cc stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
index a759f48,ed3fd61..619fb89
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
@@@ -66,9 -66,10 +66,9 @@@ public class PerformanceEntityRebuildIn
      private static final MetricRegistry registry = new MetricRegistry();
      private Slf4jReporter reporter;
  
-     private static final long RuntimeMs = 10000;  
+     private static final long RUNTIME = TimeUnit.SECONDS.toMillis( 5 );
  
 -    private static final long writeDelayMs = 100;
 -    //private static final long readDelayMs = 7;
 +    private static final long writeDelayMs = 10;
  
      @Rule
      public Application app = new CoreApplication( setup );
@@@ -189,15 -190,12 +189,13 @@@
          
          EntityManagerFactory.ProgressObserver po = new EntityManagerFactory.ProgressObserver()
{
              int counter = 0;
 +
              @Override
-             public void onProgress( EntityRef s, EntityRef t, String etype ) {
-                 meter.mark();
- 
- //                logger.debug("Indexing from {}:{} to {}:{} edgeType {}", new Object[]
{
- //                    s.getType(), s.getUuid(), t.getType(), t.getUuid(), etype });
+                public void onProgress( final EntityRef entity ) {
  
-                 if ( !logger.isDebugEnabled() && counter % 10 == 0 ) {
+                 meter.mark();
+                 logger.debug("Indexing {}:{}", entity.getType(), entity.getUuid());
+                 if ( !logger.isDebugEnabled() && counter % 100 == 0 ) {
                      logger.info("Reindexed {} entities", counter );
                  }
                  counter++;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6f040c74/stack/pom.xml
----------------------------------------------------------------------


Mime
View raw message