You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/09/30 19:01:44 UTC
[1/6] git commit: Fix for BasicIT failure.
Repository: incubator-usergrid
Updated Branches:
refs/heads/eventsystem 429b12b4f -> 1a4162459
Fix for BasicIT failure.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4f68f720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4f68f720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4f68f720
Branch: refs/heads/eventsystem
Commit: 4f68f7207bc3827e817f90fc2184dc649200d7a8
Parents: 009a184
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Sep 29 14:10:11 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Sep 29 14:10:11 2014 -0400
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 6 ++--
.../persistence/index/impl/EsQueryVistor.java | 3 +-
.../java/org/apache/usergrid/rest/BasicIT.java | 34 ++++++++++++++------
3 files changed, 31 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4f68f720/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index 0345e23..3486fbc 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@ -1627,6 +1627,8 @@ public class CpRelationManager implements RelationManager {
private Results buildResults(Query query, CandidateResults crs, String collName ) {
+ logger.debug("buildResults() for {} from {} candidates", collName, crs.size());
+
Results results = null;
if ( query.getLevel().equals( Level.IDS )) {
@@ -1700,7 +1702,7 @@ public class CpRelationManager implements RelationManager {
logger.debug("Stale version of Entity uuid:{} type:{}, stale v:{}, latest v:{}",
new Object[] { cr.getId().getUuid(), cr.getId().getType(),
cr.getVersion(), e.getVersion()});
- continue;
+ continue;
}
org.apache.usergrid.persistence.model.entity.Entity alreadySeen =
@@ -1741,7 +1743,7 @@ public class CpRelationManager implements RelationManager {
results.setCursor( crs.getCursor() );
results.setQueryProcessor( new CpQueryProcessor(em, query, headEntity, collName) );
- logger.debug("Returning results size {}", results.getIds().size() );
+ logger.debug("Returning results size {}", results.size() );
return results;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4f68f720/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
index 4f9cd60..5634183 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsQueryVistor.java
@@ -214,6 +214,7 @@ public class EsQueryVistor implements QueryVisitor {
String svalue = (String)value;
BoolQueryBuilder qb = QueryBuilders.boolQuery(); // let's do a boolean OR
+ qb.minimumNumberShouldMatch(1);
// field is an entity/array that does not need a prefix on its name
qb = qb.should( QueryBuilders.wildcardQuery( name, svalue ) );
@@ -264,7 +265,6 @@ public class EsQueryVistor implements QueryVisitor {
// logic to deal with nested property names
// only add prefix to last name in property
-
String[] parts = origname.split("\\.");
if ( parts.length > 1 ) {
name = parts[ parts.length - 1 ];
@@ -286,6 +286,7 @@ public class EsQueryVistor implements QueryVisitor {
name = addStringPrefix( name );
}
+ // re-create nested property name
if ( parts.length > 1 ) {
parts[parts.length - 1] = name;
Joiner joiner = Joiner.on(".").skipNulls();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4f68f720/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
index ec30753..473052d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
@@ -230,7 +230,8 @@ public class BasicIT extends AbstractRestIT {
err_thrown = false;
try {
- node = mapper.readTree( resource().path( "/test-organization/test-app/users" ).accept( MediaType.APPLICATION_JSON )
+ node = mapper.readTree( resource().path( "/test-organization/test-app/users" )
+ .accept( MediaType.APPLICATION_JSON )
.get( String.class ));
}
catch ( UniformInterfaceException e ) {
@@ -241,8 +242,10 @@ public class BasicIT extends AbstractRestIT {
// test login app user with pin
- node = mapper.readTree( resource().path( "/test-organization/test-app/token" ).queryParam( "grant_type", "pin" )
- .queryParam( "username", "ed@anuff.com" ).queryParam( "pin", "1234" )
+ node = mapper.readTree( resource().path( "/test-organization/test-app/token" )
+ .queryParam( "grant_type", "pin" )
+ .queryParam( "username", "ed@anuff.com" )
+ .queryParam( "pin", "1234" )
.accept( MediaType.APPLICATION_JSON ).get( String.class ));
logNode( node );
@@ -254,22 +257,35 @@ public class BasicIT extends AbstractRestIT {
MultivaluedMap<String, String> formData = new MultivaluedMapImpl();
formData.add( "pin", "5678" );
- node = mapper.readTree( resource().path( "/test-organization/test-app/users/ed@anuff.com/setpin" )
- .queryParam( "access_token", user_access_token ).type( "application/x-www-form-urlencoded" )
+ node = mapper.readTree( resource()
+ .path( "/test-organization/test-app/users/ed@anuff.com/setpin" )
+ .queryParam( "access_token", user_access_token )
+ .type( "application/x-www-form-urlencoded" )
.post( String.class, formData ));
- node = mapper.readTree( resource().path( "/test-organization/test-app/token" ).queryParam( "grant_type", "pin" )
- .queryParam( "username", "ed@anuff.com" ).queryParam( "pin", "5678" )
- .accept( MediaType.APPLICATION_JSON ).get( String.class ));
+ refreshIndex("test-organization", "test-app");
+
+ node = mapper.readTree( resource()
+ .path( "/test-organization/test-app/token" )
+ .queryParam( "grant_type", "pin" )
+ .queryParam( "username", "ed@anuff.com" )
+ .queryParam( "pin", "5678" )
+ .accept( MediaType.APPLICATION_JSON )
+ .get( String.class ));
logNode( node );
user_access_token = node.get( "access_token" ).textValue();
assertTrue( isNotBlank( user_access_token ) );
+ refreshIndex("test-organization", "test-app");
+
// test user test extension resource
- node = mapper.readTree( resource().path( "/test-organization/test-app/users/ed@anuff.com/test" ).get( String.class ));
+ node = mapper.readTree( resource()
+ .path( "/test-organization/test-app/users/ed@anuff.com/test" )
+ .queryParam( "access_token", user_access_token )
+ .get( String.class ));
logNode( node );
// test create user with guest permissions (no token)
[5/6] git commit: update queue numbers
Posted by to...@apache.org.
update queue numbers
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d6fd7dd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d6fd7dd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d6fd7dd3
Branch: refs/heads/eventsystem
Commit: d6fd7dd3009728a25b84ad87dcf9819587fdd758
Parents: 48a3af1
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Sep 29 16:24:34 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Sep 29 16:24:34 2014 -0600
----------------------------------------------------------------------
.../usergrid/services/notifications/ApplicationQueueManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d6fd7dd3/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
index a9491d0..cde14a5 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public class ApplicationQueueManager implements QueueManager {
- public static String DEFAULT_QUEUE_NAME = "notifications/queuelistenerv1_23;notifications/queuelistenerv1_24;notifications/queuelistenerv1_25";
+ public static String DEFAULT_QUEUE_NAME = "notifications/queuelistenerv1_34;notifications/queuelistenerv1_35;notifications/queuelistenerv1_36";
public static final String DEFAULT_QUEUE_PROPERTY = "usergrid.notifications.listener.queueName";
private static final Logger LOG = LoggerFactory.getLogger(ApplicationQueueManager.class);
[4/6] git commit: shorter transaction times; smaller batches
Posted by to...@apache.org.
shorter transaction times; smaller batches
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/48a3af16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/48a3af16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/48a3af16
Branch: refs/heads/eventsystem
Commit: 48a3af163cbf120f55adab1d16bb91edaba1af66
Parents: 2ea3ee1
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Sep 29 16:07:54 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Sep 29 16:07:54 2014 -0600
----------------------------------------------------------------------
.../apache/usergrid/services/notifications/QueueListener.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48a3af16/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
index 42f9dc4..31df5e7 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
@@ -35,12 +35,12 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
public class QueueListener {
- public final long MESSAGE_TRANSACTION_TIMEOUT = 60 * 5 * 1000;
+ public final long MESSAGE_TRANSACTION_TIMEOUT = 1 * 60 * 1000;
+
public long DEFAULT_SLEEP = 5000;
private static final Logger LOG = LoggerFactory.getLogger(QueueListener.class);
-
private MetricsFactory metricsService;
private ServiceManagerFactory smf;
@@ -62,7 +62,7 @@ public class QueueListener {
private List<Future> futures;
public final String MAX_THREADS = "2";
- private Integer batchSize = 1000;
+ private Integer batchSize = 100;
private String[] queueNames;
[3/6] git commit: Need to support order by boolean too.
Posted by to...@apache.org.
Need to support order by boolean too.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2ea3ee1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2ea3ee1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2ea3ee1a
Branch: refs/heads/eventsystem
Commit: 2ea3ee1adde4275e32167d84e3076bfdf7b3f7ad
Parents: a05ed4e
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Sep 29 14:50:16 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Sep 29 14:50:16 2014 -0400
----------------------------------------------------------------------
.../persistence/index/impl/EsEntityIndexImpl.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2ea3ee1a/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 8a1233f..8401e13 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
@@ -411,6 +411,11 @@ public class EsEntityIndexImpl implements EntityIndex {
order = SortOrder.DESC;
}
+ // we do not know the type of the "order by" property and so we do not know what
+ // type prefix to use. So, here we add an order by clause for every possible type
+ // that you can order by: string, number and boolean and we ask ElasticSearch
+ // to ignore any fields that are not present.
+
final String stringFieldName = STRING_PREFIX + sp.getPropertyName();
final FieldSortBuilder stringSort = SortBuilders
.fieldSort( stringFieldName )
@@ -426,6 +431,14 @@ public class EsEntityIndexImpl implements EntityIndex {
.ignoreUnmapped(true);
srb.addSort( numberSort );
log.debug(" Sort: {} order by {}", numberFieldName, order.toString());
+
+ final String booleanFieldName = BOOLEAN_PREFIX + sp.getPropertyName();
+ final FieldSortBuilder booleanSort = SortBuilders
+ .fieldSort( booleanFieldName )
+ .order(order)
+ .ignoreUnmapped(true);
+ srb.addSort( booleanSort );
+ log.debug(" Sort: {} order by {}", booleanFieldName, order.toString());
}
searchResponse = srb.execute().actionGet();
[2/6] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by to...@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/a05ed4ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a05ed4ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a05ed4ec
Branch: refs/heads/eventsystem
Commit: a05ed4ec729795ec7de68ac056aea1f368a55b78
Parents: 4f68f72 9e2743d
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Sep 29 14:10:22 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Sep 29 14:10:22 2014 -0400
----------------------------------------------------------------------
.../mq/cassandra/io/AbstractSearch.java | 17 ++--------
.../persistence/PerformanceEntityReadTest.java | 2 ++
.../persistence/PerformanceEntityWriteTest.java | 2 ++
.../services/notifications/QueueListener.java | 34 ++++++++++----------
.../resources/usergrid-services-context.xml | 9 ++++--
.../apns/NotificationsServiceIT.java | 2 +-
.../gcm/NotificationsServiceIT.java | 4 +--
7 files changed, 34 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'two-dot-o' into eventsystem
Posted by to...@apache.org.
Merge branch 'two-dot-o' into eventsystem
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1a416245
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1a416245
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1a416245
Branch: refs/heads/eventsystem
Commit: 1a4162459ae8c31a489937d8a5d2f76f5ca6c2e2
Parents: 429b12b d6fd7dd
Author: Todd Nine <to...@apache.org>
Authored: Tue Sep 30 10:25:44 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Tue Sep 30 10:25:44 2014 -0600
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 6 ++--
.../index/impl/EsEntityIndexImpl.java | 13 ++++++++
.../persistence/index/impl/EsQueryVistor.java | 3 +-
.../java/org/apache/usergrid/rest/BasicIT.java | 34 ++++++++++++++------
.../notifications/ApplicationQueueManager.java | 2 +-
.../services/notifications/QueueListener.java | 6 ++--
6 files changed, 48 insertions(+), 16 deletions(-)
----------------------------------------------------------------------