You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/02/26 18:11:30 UTC
[29/50] [abbrv] incubator-usergrid git commit: Removes wait from
progress observer, since this is no longer used.
Removes wait from progress observer, since this is no longer used.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d0e3782d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d0e3782d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d0e3782d
Branch: refs/heads/two-dot-o-import
Commit: d0e3782d75b2127934ab2e3f5f7145c48530e406
Parents: ba7a11a
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Feb 25 09:11:42 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Feb 25 09:11:42 2015 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 7 ++---
.../persistence/EntityManagerFactory.java | 5 ----
.../PerformanceEntityRebuildIndexTest.java | 13 +++-------
.../cassandra/EntityManagerFactoryImplIT.java | 5 ----
.../org/apache/usergrid/rest/IndexResource.java | 27 +++-----------------
5 files changed, 9 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0e3782d/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index ebb3136..3c63bd6 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -358,12 +358,9 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
this.rebuildApplicationIndexes(applicationId, new ProgressObserver() {
@Override
public void onProgress(EntityRef entity) {
- logger.debug("Restored entity {}:{}", entity.getType(), entity.getUuid());
- }
- @Override
- public long getWriteDelayTime() {
- return 0;
+ logger.info("Restored entity {}:{}", entity.getType(), entity.getUuid());
}
+
});
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0e3782d/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
index 2881111..b668e24 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
@@ -176,10 +176,5 @@ public interface EntityManagerFactory {
public void onProgress( EntityRef entity);
- /**
- * Get the write delay time from the progress observer. Used to throttle writes
- * @return
- */
- public long getWriteDelayTime();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0e3782d/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
index 4bbce9c..def9ed5 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PerformanceEntityRebuildIndexTest.java
@@ -202,7 +202,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
meter.mark();
logger.debug("Indexing {}:{}", entity.getType(), entity.getUuid());
- if ( !logger.isDebugEnabled() && counter % 100 == 0 ) {
+ if ( counter % 100 == 0 ) {
logger.info("Reindexed {} entities", counter );
}
counter++;
@@ -210,10 +210,6 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
- @Override
- public long getWriteDelayTime() {
- return 0;
- }
};
try {
@@ -347,16 +343,13 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
meter.mark();
logger.debug("Indexing {}:{}", entity.getType(), entity.getUuid());
- if ( !logger.isDebugEnabled() && counter % 100 == 0 ) {
+ if ( counter % 100 == 0 ) {
logger.info("Reindexed {} entities", counter );
}
counter++;
}
- @Override
- public long getWriteDelayTime() {
- return 0;
- }
+
};
try {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0e3782d/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
index 850ac6b..d224440 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
@@ -160,11 +160,6 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT {
public void onProgress(EntityRef entity) {
logger.debug("Reindexing {}:{}", entity.getType(), entity.getUuid() );
}
-
- @Override
- public long getWriteDelayTime() {
- return 0;
- }
});
// test to see that app now works and is happy
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d0e3782d/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
index 85f27ed..f5338c5 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
@@ -72,11 +72,6 @@ public class IndexResource extends AbstractContextResource {
logger.info( "Indexing entity {}:{} ", entity.getType(), entity.getUuid() );
}
-
- @Override
- public long getWriteDelayTime() {
- return 0;
- }
};
@@ -127,10 +122,6 @@ public class IndexResource extends AbstractContextResource {
}
- @Override
- public long getWriteDelayTime() {
- return delay;
- }
};
@@ -165,8 +156,7 @@ public class IndexResource extends AbstractContextResource {
@PathParam( "applicationId" ) final String applicationIdStr,
@PathParam( "collectionName" ) final String collectionName,
@QueryParam( "reverse" ) @DefaultValue( "false" ) final Boolean reverse,
- @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback,
- @QueryParam( "delay" ) @DefaultValue( "10" ) final long delay ) throws Exception {
+ @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback) throws Exception {
final UUID appId = UUIDUtils.tryExtractUUID( applicationIdStr );
ApiResponse response = createApiResponse();
@@ -177,7 +167,7 @@ public class IndexResource extends AbstractContextResource {
public void run() {
try {
- rebuildCollection( appId, collectionName, reverse, delay );
+ rebuildCollection( appId, collectionName, reverse );
} catch (Exception e) {
// TODO: handle this in rebuildCollection() instead
@@ -216,11 +206,6 @@ public class IndexResource extends AbstractContextResource {
logger.info( "Indexing entity {}:{}", entity.getType(), entity.getUuid() );
}
-
- @Override
- public long getWriteDelayTime() {
- return delay;
- }
};
final Thread rebuild = new Thread() {
@@ -276,8 +261,7 @@ public class IndexResource extends AbstractContextResource {
private void rebuildCollection(
final UUID applicationId,
final String collectionName,
- final boolean reverse,
- final long delay ) throws Exception {
+ final boolean reverse) throws Exception {
EntityManagerFactory.ProgressObserver po = new EntityManagerFactory.ProgressObserver() {
@@ -285,10 +269,7 @@ public class IndexResource extends AbstractContextResource {
public void onProgress( final EntityRef entity ) {
logger.info( "Indexing entity {}:{}", entity.getType(), entity.getUuid() );
}
- @Override
- public long getWriteDelayTime() {
- return delay;
- }
+
};
logger.info( "Reindexing for app id: {} and collection {}", applicationId, collectionName );