You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/03/20 19:52:04 UTC
[1/6] incubator-usergrid git commit: Fixed logic issue in GeoIT test.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-480 336c22285 -> 7002051c8
Fixed logic issue in GeoIT test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/384fc2b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/384fc2b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/384fc2b4
Branch: refs/heads/USERGRID-480
Commit: 384fc2b4de62e31f01b67bc91a9b0d79b9d53868
Parents: dcf4693
Author: GERey <gr...@apigee.com>
Authored: Fri Mar 20 09:49:06 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Fri Mar 20 09:49:06 2015 -0700
----------------------------------------------------------------------
.../core/src/test/java/org/apache/usergrid/persistence/GeoIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/384fc2b4/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java
index ff15063..a71cef5 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java
@@ -177,7 +177,7 @@ public class GeoIT extends AbstractCoreIT {
Map<String, Object> restaurantProps = new LinkedHashMap<String, Object>();
restaurantProps.put("name", "Brickhouse");
restaurantProps.put("address", "426 Brannan Street");
- restaurantProps.put("location", getLocation(37.776753, -122.407846));
+ restaurantProps.put("location", getLocation(37.779632, -122.395131));
Entity restaurant = em.create("restaurant", restaurantProps);
assertNotNull(restaurant);
[2/6] incubator-usergrid git commit: Updated surefire to be a single
fork to avoid ClassNotFoundException
Posted by sf...@apache.org.
Updated surefire to be a single fork to avoid ClassNotFoundException
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ceaa796e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ceaa796e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ceaa796e
Branch: refs/heads/USERGRID-480
Commit: ceaa796e0e8fb1293b6d8e099ed664cf6b862493
Parents: dcf4693
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Mar 20 11:31:06 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Mar 20 11:31:06 2015 -0600
----------------------------------------------------------------------
stack/core/pom.xml | 13 +++++++------
stack/pom.xml | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ceaa796e/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index ba73150..6f3c381 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -90,7 +90,8 @@
<reuseForks>true</reuseForks>
<argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} </argLine>
<!-- see this page for documentation on classloading issues http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
- <useSystemClassLoader>false</useSystemClassLoader>
+ <!--<useSystemClassLoader>false</useSystemClassLoader>-->
+ <!--<useManifestOnlyJar>false</useManifestOnlyJar>-->
<includes>
<include>**/*IT.java</include>
<include>**/*Test.java</include>
@@ -103,11 +104,11 @@
<artifactId>${surefire.plugin.artifactName}</artifactId>
<version>${surefire.plugin.version}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.21</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.codehaus.plexus</groupId>-->
+ <!--<artifactId>plexus-utils</artifactId>-->
+ <!--<version>3.0.21</version>-->
+ <!--</dependency>-->
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ceaa796e/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index a107114..19573d3 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -121,7 +121,7 @@
<!-- only use half the cores on the machine for testing -->
<usergrid.it.parallel>methods</usergrid.it.parallel>
<usergrid.it.reuseForks>true</usergrid.it.reuseForks>
- <usergrid.it.forkCount>4</usergrid.it.forkCount>
+ <usergrid.it.forkCount>1</usergrid.it.forkCount>
<usergrid.it.threads>8</usergrid.it.threads>
<metrics.version>3.0.0</metrics.version>
[5/6] incubator-usergrid git commit: Merge branch 'USERGRID-405' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-480
Posted by sf...@apache.org.
Merge branch 'USERGRID-405' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-480
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e64e15f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e64e15f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e64e15f1
Branch: refs/heads/USERGRID-480
Commit: e64e15f1c5221762e2aac8350dc23dc0c79e075a
Parents: 9800b23 c864ab6
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Mar 20 11:32:05 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Mar 20 11:32:05 2015 -0600
----------------------------------------------------------------------
stack/core/pom.xml | 13 +++++++------
.../java/org/apache/usergrid/persistence/GeoIT.java | 2 +-
stack/pom.xml | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e64e15f1/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java
----------------------------------------------------------------------
[4/6] incubator-usergrid git commit: search change
Posted by sf...@apache.org.
search change
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9800b23d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9800b23d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9800b23d
Branch: refs/heads/USERGRID-480
Commit: 9800b23de03a6663167bee41f5c6fb91127acd39
Parents: 336c222
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Mar 20 11:31:54 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Mar 20 11:31:54 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9800b23d/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 2be3e51..8bdd663 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -327,6 +327,7 @@ public class EsEntityIndexImpl implements AliasedEntityIndex {
public void refresh() {
+
refreshIndexMeter.mark();
final Timer.Context timeRefreshIndex = refreshTimer.time();
BetterFuture future = indexBatchBufferProducer.put(new IndexOperationMessage());
[3/6] incubator-usergrid git commit: Merge branch 'USERGRID-405' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-405
Posted by sf...@apache.org.
Merge branch 'USERGRID-405' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-405
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c864ab62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c864ab62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c864ab62
Branch: refs/heads/USERGRID-480
Commit: c864ab62c6665675da45044922405d2613f6c79f
Parents: ceaa796 384fc2b
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Mar 20 11:31:14 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Mar 20 11:31:14 2015 -0600
----------------------------------------------------------------------
.../core/src/test/java/org/apache/usergrid/persistence/GeoIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[6/6] incubator-usergrid git commit: add small sleep
Posted by sf...@apache.org.
add small sleep
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7002051c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7002051c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7002051c
Branch: refs/heads/USERGRID-480
Commit: 7002051c8993d7791ff50c1257e82155e60ab818
Parents: e64e15f
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Mar 20 12:51:31 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Mar 20 12:51:31 2015 -0600
----------------------------------------------------------------------
.../src/test/java/org/apache/usergrid/CoreApplication.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7002051c/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
index ea7a5de..00972ea 100644
--- a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
+++ b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
@@ -216,6 +216,12 @@ public class CoreApplication implements Application, TestRule {
@Override
public void refreshIndex() {
+ try{
+ Thread.sleep(100);
+ }catch (InterruptedException ie){
+
+ }
+
entityIndex.refresh();
}