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 2015/03/05 01:43:13 UTC

[1/2] incubator-usergrid git commit: Changes the search for context from term to match, since it should be an exact match query.

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o c1f5b7842 -> ef3f77da6


Changes the search for context from term to match, since it should be an exact match query.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/040de68c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/040de68c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/040de68c

Branch: refs/heads/two-dot-o
Commit: 040de68c0c88bd5bceb3917945608356ece190f1
Parents: 99d694b
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 4 17:20:13 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 4 17:20:13 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/usergrid/persistence/index/query/Query.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/040de68c/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java
index da68772..3720987 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/query/Query.java
@@ -176,12 +176,12 @@ public class Query {
         // Do we need to put the context term first for performance?
         if ( queryBuilder != null ) {
             queryBuilder = QueryBuilders.boolQuery().must( queryBuilder ).must( QueryBuilders
-                    .termQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context ) );
+                    .matchQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context ) );
         }
 
         //nothing was specified ensure we specify the context in the search
         else {
-            queryBuilder = QueryBuilders.termQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context );
+            queryBuilder = QueryBuilders.matchQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context );
         }
 
         return queryBuilder;


[2/2] incubator-usergrid git commit: Merge branch 'context-term-hotfix' into two-dot-o

Posted by to...@apache.org.
Merge branch 'context-term-hotfix' 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/ef3f77da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ef3f77da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ef3f77da

Branch: refs/heads/two-dot-o
Commit: ef3f77da6948d7c6c0c5d846d7786d9b7186a279
Parents: c1f5b78 040de68
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 4 17:43:08 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 4 17:43:08 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/usergrid/persistence/index/query/Query.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------