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 2014/10/20 15:47:00 UTC
[32/50] [abbrv] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
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/68bd94fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/68bd94fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/68bd94fd
Branch: refs/heads/two-dot-o-events
Commit: 68bd94fd0d2672054fc28734837e0b80849259c9
Parents: 6f040c7
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Oct 17 15:12:07 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Oct 17 15:12:07 2014 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpWalker.java | 4 ----
.../persistence/PerformanceEntityRebuildIndexTest.java | 11 ++++-------
2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/68bd94fd/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
index ecf7787..27d4224 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpWalker.java
@@ -15,9 +15,6 @@
*/
package org.apache.usergrid.corepersistence;
-
-import java.util.Stack;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +35,6 @@ import rx.Observable;
import rx.functions.Action1;
import rx.functions.Func1;
-import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/68bd94fd/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 619fb89..837dd9d 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
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -47,9 +46,7 @@ import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndexFactory;
-import org.apache.usergrid.persistence.index.IndexScope;
import org.apache.usergrid.persistence.index.impl.EsEntityIndexImpl;
-import org.apache.usergrid.persistence.index.impl.IndexScopeImpl;
import org.apache.usergrid.persistence.index.query.Query;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
@@ -66,9 +63,9 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
private static final MetricRegistry registry = new MetricRegistry();
private Slf4jReporter reporter;
- private static final long RUNTIME = TimeUnit.SECONDS.toMillis( 5 );
+ private static final long RUNTIME_MS = TimeUnit.SECONDS.toMillis( 5 );
- private static final long writeDelayMs = 10;
+ private static final long WRITE_DELAY_MS = 10;
@Rule
public Application app = new CoreApplication( setup );
@@ -126,7 +123,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
Entity cat2 = em.create("cat", cat2map );
Entity cat3 = em.create("cat", cat3map );
- final long stopTime = System.currentTimeMillis() + RuntimeMs;
+ final long stopTime = System.currentTimeMillis() + RUNTIME_MS;
List<EntityRef> entityRefs = new ArrayList<EntityRef>();
int entityCount = 0;
@@ -154,7 +151,7 @@ public class PerformanceEntityRebuildIndexTest extends AbstractCoreIT {
}
entityCount++;
- try { Thread.sleep( writeDelayMs ); } catch (InterruptedException ignored ) {}
+ try { Thread.sleep( WRITE_DELAY_MS ); } catch (InterruptedException ignored ) {}
}
logger.info("Created {} entities", entityCount);