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 2014/12/03 21:27:27 UTC
[1/8] incubator-usergrid git commit: Fix incorrect formatting.
Repository: incubator-usergrid
Updated Branches:
refs/heads/index-alias e7455e9fd -> 7645a7910
Fix incorrect formatting.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ce20abec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ce20abec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ce20abec
Branch: refs/heads/index-alias
Commit: ce20abecdd65ab97c19e2a3c9a8929e3fd9cf1ee
Parents: 39aaca6
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Nov 25 10:55:56 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Nov 25 10:55:56 2014 -0500
----------------------------------------------------------------------
.../org/apache/usergrid/persistence/GeoIT.java | 579 ++++++++++---------
1 file changed, 305 insertions(+), 274 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ce20abec/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 9556852..ad30064 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
@@ -17,8 +17,13 @@
package org.apache.usergrid.persistence;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,339 +49,365 @@ public class GeoIT extends AbstractCoreIT {
}
- @Test
- public void testGeo() throws Exception {
- LOG.info( "GeoIT.testGeo" );
+ @Test
+ public void testGeo() throws Exception {
+ LOG.info("GeoIT.testGeo");
+ EntityManager em = app.getEntityManager();
+ assertNotNull(em);
+
+ // create user at a location
+ Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
+ put("username", "edanuff");
+ put("email", "ed@anuff.com");
+ put("location", new LinkedHashMap<String, Object>() {
+ {
+ put("latitude", 37.776753);
+ put("longitude", -122.407846);
+ }
+ });
+ }
+ };
+ Entity user = em.create("user", properties);
+ assertNotNull(user);
+ em.refreshIndex();
- EntityManager em = app.getEntityManager();
- assertNotNull( em );
+ // define center point about 300m from that location
+ Point center = new Point(37.774277, -122.404744);
- // create user at a location
- Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
- put( "username", "edanuff" );
- put( "email", "ed@anuff.com" );
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", 37.776753 );
- put("longitude", -122.407846 );
- }} );
- }};
+ Query query = Query.fromQL("select * where location within 200 of "
+ + center.getLat() + "," + center.getLon());
+ Results listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- Entity user = em.create( "user", properties );
- assertNotNull( user );
+ assertEquals("No results less than 200m away from center", 0, listResults.size());
- em.refreshIndex();
+ query = Query.fromQL("select * where location within 400 of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- // define center point about 300m from that location
- Point center = new Point( 37.774277, -122.404744 );
+ this.dump(listResults);
- Query query = Query.fromQL( "select * where location within 200 of "
- + center.getLat() + "," + center.getLon());
- Results listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ assertEquals("1 result less than 400m away from center", 1, listResults.size());
- assertEquals("No results less than 200m away from center", 0, listResults.size() );
+ // remove location from user
+ properties.remove("location");
+ em.updateProperties(user, properties);
+ em.refreshIndex();
- query = Query.fromQL( "select * where location within 400 of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ query = Query.fromQL("select * where location within 400 of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- this.dump( listResults );
+ this.dump(listResults);
- assertEquals("1 result less than 400m away from center", 1, listResults.size() );
+ // user no longer found with 400m search
+ assertEquals(0, listResults.size());
- // remove location from user
- properties.remove("location");
- em.updateProperties(user, properties);
- em.refreshIndex();
+ // move user and center to new locations
+ updatePos(em, user, 37.426373, -122.14108);
- query = Query.fromQL( "select * where location within 400 of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ center = new Point(37.774277, -122.404744);
- this.dump( listResults );
+ query = Query.fromQL("select * where location within 200 of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- // user no longer found with 400m search
- assertEquals( 0, listResults.size() );
+ assertEquals(0, listResults.size());
- // move user and center to new locations
- updatePos( em, user, 37.426373, -122.14108 );
+ updatePos(em, user, 37.774277, -122.404744);
- center = new Point( 37.774277, -122.404744 );
+ center = new Point(37.776753, -122.407846);
- query = Query.fromQL( "select * where location within 200 of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ query = Query.fromQL("select * where location within 1000 of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- assertEquals( 0, listResults.size() );
+ assertEquals(1, listResults.size());
- updatePos( em, user, 37.774277, -122.404744 );
+ // check at globally large distance
+ query = Query.fromQL("select * where location within " + Integer.MAX_VALUE + " of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
+
+ assertEquals(1, listResults.size());
+
+ // create a new entity so we have 2
+ LinkedHashMap<String, Object> properties2 = new LinkedHashMap<String, Object>() {{
+ put("username", "sganyo");
+ put("email", "sganyo@anuff.com");
+ put("location", new LinkedHashMap<String, Object>() {
+ {
+ put("latitude", 31.1);
+ put("longitude", 121.2);
+ }
+ });
+ }
+ };
+ Entity user2 = em.create("user", properties2);
+ em.refreshIndex();
+ assertNotNull(user2);
- center = new Point( 37.776753, -122.407846 );
+ query = Query.fromQL("select * where location within 10000 of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- query = Query.fromQL( "select * where location within 1000 of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ assertEquals(1, listResults.size());
- assertEquals( 1, listResults.size() );
+ // check at globally large distance
+ query = Query.fromQL("select * where location within " + Integer.MAX_VALUE + " of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- // check at globally large distance
+ assertEquals(2, listResults.size());
- query = Query.fromQL( "select * where location within " + Integer.MAX_VALUE + " of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ // check at globally large distance (center point close to other entity)
+ center = new Point(31.14, 121.27);
- assertEquals( 1, listResults.size() );
+ query = Query.fromQL("select * where location within " + Integer.MAX_VALUE + " of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- // create a new entity so we have 2
- LinkedHashMap<String, Object> properties2 = new LinkedHashMap<String, Object>() {{
- put( "username", "sganyo" );
- put( "email", "sganyo@anuff.com" );
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", 31.1 );
- put("longitude", 121.2 );
- }} );
- }};
- Entity user2 = em.create( "user", properties2 );
- em.refreshIndex();
- assertNotNull( user2 );
+ assertEquals(2, listResults.size());
- query = Query.fromQL( "select * where location within 10000 of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ Results emSearchResults = em.searchCollection(em.getApplicationRef(), "users",
+ Query.fromQL("location within 1000 of 37.776753, -122.407846"));
+ assertEquals(1, emSearchResults.size());
- assertEquals( 1, listResults.size() );
+ updatePos(em, user, 37.776753, -122.407846);
- // check at globally large distance
- query = Query.fromQL( "select * where location within " + Integer.MAX_VALUE + " of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ center = new Point(37.428526, -122.140916);
- assertEquals( 2, listResults.size() );
+ query = Query.fromQL("select * where location within 1000 of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "users", query);
- // check at globally large distance (center point close to other entity)
- center = new Point( 31.14, 121.27 );
+ assertEquals(0, listResults.size());
- query = Query.fromQL( "select * where location within " + Integer.MAX_VALUE + " of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ emSearchResults = em.searchCollection(em.getApplicationRef(), "users",
+ Query.fromQL("location within 1000 of 37.428526, -122.140916"));
+ assertEquals(0, emSearchResults.size());
- assertEquals( 2, listResults.size() );
+ properties = new LinkedHashMap<String, Object>();
+ properties.put("name", "Brickhouse");
+ properties.put("address", "426 Brannan Street");
+ properties.put("location", getLocation(37.779632, -122.395131));
- Results emSearchResults = em.searchCollection( em.getApplicationRef(), "users",
- Query.fromQL( "location within 1000 of 37.776753, -122.407846" ) );
- assertEquals( 1, emSearchResults.size() );
+ Entity restaurant = em.create("restaurant", properties);
+ assertNotNull(restaurant);
- updatePos( em, user, 37.776753, -122.407846 );
+ em.createConnection(user, "likes", restaurant);
- center = new Point( 37.428526, -122.140916 );
+ em.refreshIndex();
- query = Query.fromQL( "select * where location within 1000 of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "users", query );
+ emSearchResults = em.searchConnectedEntities(user,
+ Query.fromQL("location within 2000 of 37.776753, -122.407846").setConnectionType("likes"));
+ assertEquals(1, emSearchResults.size());
+ emSearchResults = em.searchConnectedEntities(user,
+ Query.fromQL("location within 1000 of 37.776753, -122.407846").setConnectionType("likes"));
+ assertEquals(0, emSearchResults.size());
+ }
- assertEquals( 0, listResults.size() );
- emSearchResults = em.searchCollection( em.getApplicationRef(), "users",
- Query.fromQL( "location within 1000 of 37.428526, -122.140916" ) );
- assertEquals( 0, emSearchResults.size() );
+ @Test
+ public void testGeo2() throws Exception {
+ LOG.info("GeoIT.testGeo2");
+ EntityManager em = app.getEntityManager();
+ assertNotNull(em);
+
+ // create user at a location
+ Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
+ put("type", "store");
+ put("name", "norwest");
+ put("location", new LinkedHashMap<String, Object>() {
+ {
+ put("latitude", -33.746369);
+ put("longitude", 150.952183);
+ }
+ });
+ }
+ };
+ Entity entity = em.create("store", properties);
+ assertNotNull(entity);
+ properties = new LinkedHashMap<String, Object>() {{
+ put("type", "store");
+ put("name", "ashfield");
+ put("location", new LinkedHashMap<String, Object>() {
+ {
+ put("latitude", -33.889058);
+ put("longitude", 151.124024);
+ }
+ });
+ }
+ };
+ entity = em.create("store", properties);
+ assertNotNull(entity);
- properties = new LinkedHashMap<String, Object>();
- properties.put( "name", "Brickhouse" );
- properties.put( "address", "426 Brannan Street" );
- properties.put( "location", getLocation( 37.779632, -122.395131 ) );
+ em.refreshIndex();
- Entity restaurant = em.create( "restaurant", properties );
- assertNotNull( restaurant );
+ Point center = new Point(37.776753, -122.407846);
- em.createConnection( user, "likes", restaurant );
+ Query query = Query.fromQL("select * where location within 10000 of "
+ + center.getLat() + "," + center.getLon());
+ Results listResults = em.searchCollection(em.getApplicationRef(), "stores", query);
- em.refreshIndex();
+ this.dump(listResults);
- emSearchResults = em.searchConnectedEntities( user,
- Query.fromQL( "location within 2000 of 37.776753, -122.407846" ).setConnectionType( "likes" ) );
- assertEquals( 1, emSearchResults.size() );
+ assertEquals("Results less than 10000m away from center", 0, listResults.size());
+
+ Query query2 = Query.fromQL("select * where location within 40000000 of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "stores", query2);
+
+ assertEquals("Results from center point to ridiculously far", 2, listResults.size());
- emSearchResults = em.searchConnectedEntities( user,
- Query.fromQL( "location within 1000 of 37.776753, -122.407846" ).setConnectionType( "likes" ) );
- assertEquals( 0, emSearchResults.size() );
- }
- @Test
- public void testGeo2() throws Exception {
- LOG.info( "GeoIT.testGeo2" );
- EntityManager em = app.getEntityManager();
- assertNotNull( em );
-
- // create user at a location
- Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
- put( "type", "store" );
- put( "name", "norwest" );
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", -33.746369 );
- put("longitude", 150.952183 );
- }} );
- }};
- Entity entity = em.create( "store", properties );
- assertNotNull( entity );
- properties = new LinkedHashMap<String, Object>() {{
- put( "type", "store" );
- put( "name", "ashfield" );
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", -33.889058 );
- put("longitude", 151.124024 );
- }} );
- }};
- entity = em.create( "store", properties );
- assertNotNull( entity );
-
- em.refreshIndex();
-
- Point center = new Point( 37.776753, -122.407846 );
-
- Query query = Query.fromQL( "select * where location within 10000 of "
- + center.getLat() + "," + center.getLon());
- Results listResults = em.searchCollection( em.getApplicationRef(), "stores", query );
-
- this.dump( listResults );
-
- assertEquals("Results less than 10000m away from center", 0, listResults.size() );
-
- Query query2 = Query.fromQL( "select * where location within 40000000 of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "stores", query2 );
-
- assertEquals("Results from center point to ridiculously far", 2, listResults.size() );
-
- }
- @Test
- public void testGeo3() throws Exception {
- LOG.info( "GeoIT.testGeo3" );
- EntityManager em = app.getEntityManager();
- assertNotNull( em );
-
- // create user at a location
- Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
- put( "name", "norwest" );
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", -33.746369 );
- put("longitude", 150.952183 );
- }} );
- }};
- Entity entity = em.create( "store", properties );
- assertNotNull( entity );
- properties = new LinkedHashMap<String, Object>() {{
- put( "name", "ashfield" );
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", -33.889058 );
- put("longitude", 151.124024 );
- }} );
- }};
- entity = em.create( "store", properties );
- assertNotNull( entity );
-
- em.refreshIndex();
-
- Point center = new Point( -33.746369, 150.952183 );
-
- Query query = Query.fromQL( "select * where location within 10000 of "
- + center.getLat() + "," + center.getLon());
- Results listResults = em.searchCollection( em.getApplicationRef(), "stores", query );
-
- this.dump( listResults );
-
- assertEquals("Results less than 10000m away from center", 1, listResults.size() );
-
- Query query2 = Query.fromQL( "select * where location within 40000000 of "
- + center.getLat() + "," + center.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "stores", query2 );
-
- assertEquals("Results from center point to ridiculously far", 2, listResults.size() );
-
- }
- @Test
- public void testGeo4() throws Exception {
- LOG.info( "GeoIT.testGeo4" );
- EntityManager em = app.getEntityManager();
- assertNotNull( em );
-
- // create user at a location
- Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
- put( "name", "norwest" );
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", -33.746369 );
- put("longitude", 150.952183 );
- }} );
- }};
- Entity entity = em.create( "store", properties );
- assertNotNull( entity );
- properties = new LinkedHashMap<String, Object>() {{
- put( "name", "ashfield" );
- put( "location", new LinkedHashMap<String, Object>() {{
- put("latitude", -33.889058 );
- put("longitude", 151.124024 );
- }} );
- }};
- entity = em.create( "store", properties );
- assertNotNull( entity );
-
- em.refreshIndex();
-
- List<Point> points = new ArrayList<Point>();
- points.add(new Point( 33.746369,-89 ));//Woodland, MS
- points.add(new Point( 33.746369,-91 ));//Beulah, MS
- points.add(new Point( -1.000000, 102.000000 ));//Somewhere in Indonesia
- points.add(new Point( -90.000000, 90.000000 ));//Antarctica
- points.add(new Point( 90, 90 ));//Santa's house
- //and the cartesian product...
- for(int i= -90;i<=90;i++){
- for(int j= -180;j<=180;j++){
- points.add(new Point( i, j ));
- }
}
- Iterator<Point> pointIterator = points.iterator();
- for(Point p=pointIterator.next();pointIterator.hasNext();p=pointIterator.next()){
- Query query = Query.fromQL( "select * where location within 10000 of "
- + p.getLat() + "," + p.getLon());
- Results listResults = em.searchCollection( em.getApplicationRef(), "stores", query );
- this.dump( listResults );
- assertEquals("Results less than 10000m away from center", 0, listResults.size() );
- query = Query.fromQL( "select * where location within 40000000 of "
- + p.getLat() + "," + p.getLon());
- listResults = em.searchCollection( em.getApplicationRef(), "stores", query );
+ @Test
+ public void testGeo3() throws Exception {
+ LOG.info("GeoIT.testGeo3");
+ EntityManager em = app.getEntityManager();
+ assertNotNull(em);
+
+ // create user at a location
+ Map<String, Object> properties = new LinkedHashMap<String, Object>() {
+ {
+ put("name", "norwest");
+ put("location", new LinkedHashMap<String, Object>() {
+ {
+ put("latitude", -33.746369);
+ put("longitude", 150.952183);
+ }
+ });
+ }
+ };
+ Entity entity = em.create("store", properties);
+ assertNotNull(entity);
+ properties = new LinkedHashMap<String, Object>() {
+ {
+ put("name", "ashfield");
+ put("location", new LinkedHashMap<String, Object>() {
+ {
+ put("latitude", -33.889058);
+ put("longitude", 151.124024);
+ }
+ });
+ }
+ };
+ entity = em.create("store", properties);
+ assertNotNull(entity);
+
+ em.refreshIndex();
+
+ Point center = new Point(-33.746369, 150.952183);
- assertEquals("Results from center point to ridiculously far", 2, listResults.size() );
+ Query query = Query.fromQL("select * where location within 10000 of "
+ + center.getLat() + "," + center.getLon());
+ Results listResults = em.searchCollection(em.getApplicationRef(), "stores", query);
- }
+ this.dump(listResults);
+ assertEquals("Results less than 10000m away from center", 1, listResults.size());
- }
- @Test
- public void testGeoBadPoints() throws Exception {
- LOG.info( "GeoIT.testGeoBadPoints" );
- double[][] vertices= {
- {-91.000000, 90.000000},
- {91.000000, 90.000000},
- {90.000000, 400},
- {90.000000, -270.000000},
- {-91.000000, -91.000000}
- };
- for (int i=0;i<vertices.length;i++){
- //bad coordinate. bad! you're supposed to have lat between -90 and 90
- try {
- Point p = new Point(vertices[i][0], vertices[i][1]);
- assertTrue("Bad points should throw an exception ["+vertices[i][0]+","+vertices[i][1]+"]", false);
- }catch(java.lang.IllegalArgumentException e){
- assertTrue("Bad points should throw an exception ["+vertices[i][0]+","+vertices[i][1]+"]" , true);
- }
+ Query query2 = Query.fromQL("select * where location within 40000000 of "
+ + center.getLat() + "," + center.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "stores", query2);
+
+ assertEquals("Results from center point to ridiculously far", 2, listResults.size());
}
+ @Test
+ public void testGeo4() throws Exception {
+ LOG.info("GeoIT.testGeo4");
+ EntityManager em = app.getEntityManager();
+ assertNotNull(em);
+
+ // create user at a location
+ Map<String, Object> properties = new LinkedHashMap<String, Object>() {{
+ put("name", "norwest");
+ put("location", new LinkedHashMap<String, Object>() {
+ {
+ put("latitude", -33.746369);
+ put("longitude", 150.952183);
+ }
+ });
+ }
+ };
+ Entity entity = em.create("store", properties);
+ assertNotNull(entity);
+ properties = new LinkedHashMap<String, Object>() {{
+ put("name", "ashfield");
+ put("location", new LinkedHashMap<String, Object>() {
+ {
+ put("latitude", -33.889058);
+ put("longitude", 151.124024);
+ }
+ });
+ }
+ };
+ entity = em.create("store", properties);
+ assertNotNull(entity);
+
+ em.refreshIndex();
- }
+ List<Point> points = new ArrayList<Point>();
+ points.add(new Point(33.746369, -89));//Woodland, MS
+ points.add(new Point(33.746369, -91));//Beulah, MS
+ points.add(new Point(-1.000000, 102.000000));//Somewhere in Indonesia
+ points.add(new Point(-90.000000, 90.000000));//Antarctica
+ points.add(new Point(90, 90));//Santa's house
+ //and the cartesian product...
+ for (int i = -90; i <= 90; i++) {
+ for (int j = -180; j <= 180; j++) {
+ points.add(new Point(i, j));
+ }
+ }
+ Iterator<Point> pointIterator = points.iterator();
+ for (Point p = pointIterator.next(); pointIterator.hasNext(); p = pointIterator.next()) {
+ Query query = Query.fromQL("select * where location within 10000 of "
+ + p.getLat() + "," + p.getLon());
+ Results listResults = em.searchCollection(em.getApplicationRef(), "stores", query);
+
+ this.dump(listResults);
+ assertEquals("Results less than 10000m away from center", 0, listResults.size());
+
+ query = Query.fromQL("select * where location within 40000000 of "
+ + p.getLat() + "," + p.getLon());
+ listResults = em.searchCollection(em.getApplicationRef(), "stores", query);
+
+ assertEquals("Results from center point to ridiculously far", 2, listResults.size());
+
+ }
+
+ }
+
+
+ @Test
+ public void testGeoBadPoints() throws Exception {
+ LOG.info("GeoIT.testGeoBadPoints");
+ double[][] vertices = {
+ {-91.000000, 90.000000},
+ {91.000000, 90.000000},
+ {90.000000, 400},
+ {90.000000, -270.000000},
+ {-91.000000, -91.000000}
+ };
+ for (int i = 0; i < vertices.length; i++) {
+ //bad coordinate. bad! you're supposed to have lat between -90 and 90
+ try {
+ Point p = new Point(vertices[i][0], vertices[i][1]);
+ assertTrue("Bad points should throw an exception ["
+ + vertices[i][0] + "," + vertices[i][1] + "]", false);
+ } catch (java.lang.IllegalArgumentException e) {
+ assertTrue("Bad points should throw an exception ["
+ + vertices[i][0] + "," + vertices[i][1] + "]", true);
+ }
+ }
+ }
@Test
[5/8] incubator-usergrid git commit: Fixes user ramp values
Posted by sf...@apache.org.
Fixes user ramp values
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9222856e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9222856e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9222856e
Branch: refs/heads/index-alias
Commit: 9222856e4f628cef0f90cc873e9c4be14b81bb5c
Parents: 08471c9
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Dec 3 09:55:33 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Dec 3 09:55:33 2014 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/simulations/PostUsersSimulation.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9222856e/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
index 45a4437..5184e92 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PostUsersSimulation.scala
@@ -43,7 +43,7 @@ class PostUsersSimulation extends Simulation {
* injection steps take from this forum post
* https://groups.google.com/forum/#!topic/gatling/JfYHaWCbA-w
*/
- rampUsersPerSec(1) to (Settings.maxPossibleUsers) during Settings.rampTime,
+ rampUsers(Settings.maxPossibleUsers) over Settings.rampTime,
constantUsersPerSec(Settings.maxPossibleUsers) during Settings.duration
)).protocols(Settings.httpConf.acceptHeader("application/json"))
[7/8] incubator-usergrid git commit: Merge branch 'USERGRID-252' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sf...@apache.org.
Merge branch 'USERGRID-252' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/da054a19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/da054a19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/da054a19
Branch: refs/heads/index-alias
Commit: da054a19838ace1bb4e4cb11fae365f917b4ddb9
Parents: 6210092 9222856
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Dec 3 13:25:32 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Dec 3 13:25:32 2014 -0700
----------------------------------------------------------------------
stack/awscluster/src/main/groovy/NodeRegistry.groovy | 12 +++++-------
.../usergrid/simulations/PostUsersSimulation.scala | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[3/8] incubator-usergrid git commit: Adding missing headers and
cleaning up imports only.
Posted by sf...@apache.org.
Adding missing headers and cleaning up imports only.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5d86227b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5d86227b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5d86227b
Branch: refs/heads/index-alias
Commit: 5d86227b011412d51c7b5e0c8f807e1af3e7105d
Parents: 277eb73
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Dec 3 07:46:18 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Dec 3 07:46:18 2014 -0500
----------------------------------------------------------------------
.../core/astyanax/BucketScopedRowKey.java | 3 +-
.../core/astyanax/CassandraConfig.java | 18 ++++++++++
.../core/astyanax/ColumnNameIterator.java | 1 -
.../persistence/core/astyanax/ColumnSearch.java | 30 ++++++++---------
.../persistence/core/astyanax/ColumnTypes.java | 19 ++++++++++-
.../core/astyanax/FieldBufferBuilder.java | 1 -
.../astyanax/MultiKeyColumnNameIterator.java | 2 --
.../core/astyanax/MultiRowColumnIterator.java | 4 ---
.../core/astyanax/MultiTennantColumnFamily.java | 1 -
.../persistence/core/astyanax/ScopedRowKey.java | 1 -
.../astyanax/StringRowCompositeSerializer.java | 35 ++++++++------------
.../core/hystrix/HystrixCassandra.java | 3 --
.../core/migration/data/DataMigration.java | 31 ++++++++---------
.../migration/data/DataMigrationException.java | 30 ++++++++---------
.../migration/data/DataMigrationManager.java | 30 ++++++++---------
.../data/DataMigrationManagerImpl.java | 3 --
.../data/MigrationInfoSerialization.java | 31 ++++++++---------
.../data/MigrationInfoSerializationImpl.java | 31 ++++++++---------
.../migration/schema/MigrationManagerFig.java | 18 ++++++++++
.../migration/schema/MigrationManagerImpl.java | 18 ++++++++++
.../core/shard/ExpandingShardLocator.java | 23 ++-----------
.../persistence/core/shard/StringHashUtils.java | 22 +-----------
.../usergrid/persistence/core/task/Task.java | 19 ++++++++++-
.../persistence/core/task/TaskExecutor.java | 18 ++++++++++
24 files changed, 211 insertions(+), 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/BucketScopedRowKey.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/BucketScopedRowKey.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/BucketScopedRowKey.java
index 265afa5..a20b710 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/BucketScopedRowKey.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/BucketScopedRowKey.java
@@ -1,4 +1,4 @@
-package org.apache.usergrid.persistence.core.astyanax;/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,6 +18,7 @@ package org.apache.usergrid.persistence.core.astyanax;/*
*/
+package org.apache.usergrid.persistence.core.astyanax;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfig.java
index 0ce7df1..ad4463a 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfig.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfig.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.usergrid.persistence.core.astyanax;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIterator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIterator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIterator.java
index 6256e9c..b38ffda 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIterator.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIterator.java
@@ -25,7 +25,6 @@ import java.util.NoSuchElementException;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
import com.netflix.astyanax.model.Column;
import com.netflix.astyanax.query.RowQuery;
-import com.netflix.hystrix.HystrixCommandGroupKey;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnSearch.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnSearch.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnSearch.java
index 41ee7c4..112f4aa 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnSearch.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnSearch.java
@@ -1,22 +1,20 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.usergrid.persistence.core.astyanax;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnTypes.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnTypes.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnTypes.java
index a055ca7..3f29f78 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnTypes.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ColumnTypes.java
@@ -1,7 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.usergrid.persistence.core.astyanax;
-import org.apache.cassandra.db.marshal.BooleanType;
import org.apache.cassandra.db.marshal.DynamicCompositeType;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/FieldBufferBuilder.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/FieldBufferBuilder.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/FieldBufferBuilder.java
index 88cfb62..fc4b13f 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/FieldBufferBuilder.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/FieldBufferBuilder.java
@@ -20,7 +20,6 @@
package org.apache.usergrid.persistence.core.astyanax;
-import com.netflix.astyanax.serializers.ByteBufferSerializer;
import com.netflix.astyanax.serializers.ByteSerializer;
import com.netflix.astyanax.serializers.BytesArraySerializer;
import com.netflix.astyanax.serializers.IntegerSerializer;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
index 16ae97a..15f9aab 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
@@ -35,10 +35,8 @@ import org.apache.usergrid.persistence.core.rx.OrderedMerge;
import com.amazonaws.services.redshift.model.UnsupportedOptionException;
-import rx.Notification;
import rx.Observable;
import rx.Subscriber;
-import rx.functions.Action1;
import rx.schedulers.Schedulers;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java
index 46405ad..fdc4768 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java
@@ -27,16 +27,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.TreeSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.collections4.iterators.PushbackIterator;
import org.apache.usergrid.persistence.core.hystrix.HystrixCassandra;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java
index faaa76d..38851a5 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiTennantColumnFamily.java
@@ -19,7 +19,6 @@
package org.apache.usergrid.persistence.core.astyanax;
-import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import com.netflix.astyanax.Serializer;
import com.netflix.astyanax.model.ColumnFamily;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ScopedRowKey.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ScopedRowKey.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ScopedRowKey.java
index 2fe7259..b1eef87 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ScopedRowKey.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/ScopedRowKey.java
@@ -19,7 +19,6 @@
package org.apache.usergrid.persistence.core.astyanax;
-import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.model.entity.Id;
import com.google.common.base.Preconditions;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/StringRowCompositeSerializer.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/StringRowCompositeSerializer.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/StringRowCompositeSerializer.java
index 3a246a5..ef7f19d 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/StringRowCompositeSerializer.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/StringRowCompositeSerializer.java
@@ -1,31 +1,24 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.usergrid.persistence.core.astyanax;
-import java.util.UUID;
-
-import org.apache.usergrid.persistence.model.entity.Id;
-import org.apache.usergrid.persistence.model.entity.SimpleId;
-
import com.netflix.astyanax.model.CompositeBuilder;
import com.netflix.astyanax.model.CompositeParser;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
index 356850e..7d5316f 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
@@ -21,11 +21,8 @@ package org.apache.usergrid.persistence.core.hystrix;
import com.netflix.astyanax.Execution;
-import com.netflix.astyanax.MutationBatch;
import com.netflix.astyanax.connectionpool.OperationResult;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
-import com.netflix.astyanax.model.ColumnList;
-import com.netflix.astyanax.query.RowQuery;
import com.netflix.hystrix.HystrixCommand;
import com.netflix.hystrix.HystrixCommandGroupKey;
import com.netflix.hystrix.HystrixThreadPoolProperties;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigration.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigration.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigration.java
index ecf9946..775df5d 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigration.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigration.java
@@ -1,24 +1,21 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-
package org.apache.usergrid.persistence.core.migration.data;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationException.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationException.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationException.java
index 0e1f29f..104ef95 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationException.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationException.java
@@ -1,22 +1,20 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.usergrid.persistence.core.migration.data;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManager.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManager.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManager.java
index c633a08..e47e264 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManager.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManager.java
@@ -1,22 +1,20 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.usergrid.persistence.core.migration.data;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
index 38c24e4..b9cc851 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
@@ -1,5 +1,4 @@
/*
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -16,9 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-
package org.apache.usergrid.persistence.core.migration.data;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerialization.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerialization.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerialization.java
index 5cd8a76..db2a747 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerialization.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerialization.java
@@ -1,24 +1,21 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-
package org.apache.usergrid.persistence.core.migration.data;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java
index 5dbadee..603ebb3 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java
@@ -1,24 +1,21 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-
package org.apache.usergrid.persistence.core.migration.data;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerFig.java
index 9595020..b95338a 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerFig.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerFig.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.usergrid.persistence.core.migration.schema;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
index 70ab713..346d2c9 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.usergrid.persistence.core.migration.schema;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/ExpandingShardLocator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/ExpandingShardLocator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/ExpandingShardLocator.java
index 02d4d1e..1fadf9f 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/ExpandingShardLocator.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/ExpandingShardLocator.java
@@ -1,25 +1,4 @@
/*
- *
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
- *
- */
-
-package org.apache.usergrid.persistence.core.shard;/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -38,6 +17,8 @@ package org.apache.usergrid.persistence.core.shard;/*
* under the License.
*/
+package org.apache.usergrid.persistence.core.shard;
+
import com.google.common.hash.Funnel;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/StringHashUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/StringHashUtils.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/StringHashUtils.java
index afe94a9..b033dbd 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/StringHashUtils.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/shard/StringHashUtils.java
@@ -1,25 +1,4 @@
/*
- *
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
- *
- */
-
-package org.apache.usergrid.persistence.core.shard;/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -38,6 +17,7 @@ package org.apache.usergrid.persistence.core.shard;/*
* under the License.
*/
+package org.apache.usergrid.persistence.core.shard;
import java.nio.charset.Charset;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/Task.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/Task.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/Task.java
index 5890627..5582161 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/Task.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/Task.java
@@ -1,8 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.usergrid.persistence.core.task;
import java.util.concurrent.Callable;
-import java.util.concurrent.RecursiveTask;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5d86227b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/TaskExecutor.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/TaskExecutor.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/TaskExecutor.java
index aaa9d60..5e9aa4c 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/TaskExecutor.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/task/TaskExecutor.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.usergrid.persistence.core.task;
[2/8] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sf...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/277eb730
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/277eb730
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/277eb730
Branch: refs/heads/index-alias
Commit: 277eb730e114454f063802854ad2392365d996ad
Parents: ce20abe de455c3
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Nov 27 09:03:54 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Nov 27 09:03:54 2014 -0500
----------------------------------------------------------------------
.../rest/management/users/UsersResource.java | 38 ++++++++++++--------
1 file changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[4/8] incubator-usergrid git commit: Changed comparator to be more
concise
Posted by sf...@apache.org.
Changed comparator to be more concise
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/08471c9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/08471c9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/08471c9e
Branch: refs/heads/index-alias
Commit: 08471c9e0f2268603423b9acdd19529190985352
Parents: c2bc921
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Dec 3 09:16:18 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Dec 3 09:16:18 2014 -0700
----------------------------------------------------------------------
stack/awscluster/src/main/groovy/NodeRegistry.groovy | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/08471c9e/stack/awscluster/src/main/groovy/NodeRegistry.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/NodeRegistry.groovy b/stack/awscluster/src/main/groovy/NodeRegistry.groovy
index 0288ae4..8d695e2 100644
--- a/stack/awscluster/src/main/groovy/NodeRegistry.groovy
+++ b/stack/awscluster/src/main/groovy/NodeRegistry.groovy
@@ -109,7 +109,6 @@ class NodeRegistry {
for (reservation in nodes.getReservations()) {
- //TODO, add these to a list then sort them by date, then name
for (instance in reservation.getInstances()) {
servers.add(new ServerEntry(instance.launchTime, instance.publicDnsName));
}
@@ -169,15 +168,14 @@ class NodeRegistry {
@Override
int compareTo(final ServerEntry o) {
- if (launchDate.before(o.launchDate)) {
- -1;
- } else if (launchDate.after(o.launchDate)) {
- return 1;
- }
- return publicIp.compareTo(o.publicIp);
+ int compare = launchDate.compareTo(o.launchDate)
+ if(compare == 0){
+ compare = publicIp.compareTo(o.publicIp);
+ }
+ return compare
}
boolean equals(final o) {
[6/8] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sf...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6210092f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6210092f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6210092f
Branch: refs/heads/index-alias
Commit: 6210092f073062bd5a147ddf2e42a00830e66c9d
Parents: 5d86227 c2bc921
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Dec 3 14:54:29 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Dec 3 14:54:29 2014 -0500
----------------------------------------------------------------------
stack/awscluster/gatling-cluster-cf.json | 387 +++++++++++++++++++
stack/awscluster/pom.xml | 2 +-
.../main/dist/init_instance/install_yourkit.sh | 6 +-
.../src/main/groovy/NodeRegistry.groovy | 197 +++++++---
.../main/groovy/configure_elasticsearch.groovy | 31 +-
.../src/main/groovy/registry_list.groovy | 36 --
stack/awscluster/ugcluster-cf.json | 7 +-
.../MvccEntitySerializationStrategyImpl.java | 2 +-
.../persistence/model/field/LocationField.java | 8 +
stack/loadtests/README.md | 19 +
stack/loadtests/pom.xml | 4 +-
.../usergrid/scenarios/DeviceScenarios.scala | 2 +-
.../usergrid/scenarios/UserScenarios.scala | 54 ++-
.../org/apache/usergrid/settings/Settings.scala | 2 +-
.../simulations/PostUsersSimulation.scala | 49 +--
.../usergrid/simulations/SetupSimulation.scala | 4 +-
stack/loadtests/src/test/scala/Engine.scala | 4 +-
stack/pom.xml | 1 +
18 files changed, 654 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
[8/8] incubator-usergrid git commit: Merge branch 'two-dot-o' into
index-alias
Posted by sf...@apache.org.
Merge branch 'two-dot-o' into index-alias
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7645a791
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7645a791
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7645a791
Branch: refs/heads/index-alias
Commit: 7645a7910d3df782fe56636a6626c59f987a3bfd
Parents: e7455e9 da054a1
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Dec 3 13:27:00 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Dec 3 13:27:00 2014 -0700
----------------------------------------------------------------------
.../src/main/groovy/NodeRegistry.groovy | 12 +-
.../org/apache/usergrid/persistence/GeoIT.java | 579 ++++++++++---------
.../core/astyanax/BucketScopedRowKey.java | 3 +-
.../core/astyanax/CassandraConfig.java | 18 +
.../core/astyanax/ColumnNameIterator.java | 1 -
.../persistence/core/astyanax/ColumnSearch.java | 30 +-
.../persistence/core/astyanax/ColumnTypes.java | 19 +-
.../core/astyanax/FieldBufferBuilder.java | 1 -
.../astyanax/MultiKeyColumnNameIterator.java | 2 -
.../core/astyanax/MultiRowColumnIterator.java | 4 -
.../core/astyanax/MultiTennantColumnFamily.java | 1 -
.../persistence/core/astyanax/ScopedRowKey.java | 1 -
.../astyanax/StringRowCompositeSerializer.java | 35 +-
.../core/hystrix/HystrixCassandra.java | 3 -
.../core/migration/data/DataMigration.java | 31 +-
.../migration/data/DataMigrationException.java | 30 +-
.../migration/data/DataMigrationManager.java | 30 +-
.../data/DataMigrationManagerImpl.java | 3 -
.../data/MigrationInfoSerialization.java | 31 +-
.../data/MigrationInfoSerializationImpl.java | 31 +-
.../migration/schema/MigrationManagerFig.java | 18 +
.../migration/schema/MigrationManagerImpl.java | 18 +
.../core/shard/ExpandingShardLocator.java | 23 +-
.../persistence/core/shard/StringHashUtils.java | 22 +-
.../usergrid/persistence/core/task/Task.java | 19 +-
.../persistence/core/task/TaskExecutor.java | 18 +
.../simulations/PostUsersSimulation.scala | 2 +-
27 files changed, 522 insertions(+), 463 deletions(-)
----------------------------------------------------------------------