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 02:55:17 UTC
[1/5] 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/USERGRID-405 e54b2639a -> e83caf285
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/USERGRID-405
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;
[4/5] incubator-usergrid git commit: Revert "Merge branch
'context-term-hotfix' into two-dot-o"
Posted by to...@apache.org.
Revert "Merge branch 'context-term-hotfix' into two-dot-o"
This reverts commit ef3f77da6948d7c6c0c5d846d7786d9b7186a279, reversing
changes made to c1f5b78429b1017bf7bc685c7c09f5c762ab7027.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/710a1a3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/710a1a3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/710a1a3c
Branch: refs/heads/USERGRID-405
Commit: 710a1a3c171bd67c549e98178db256a0efb75073
Parents: ef3f77d
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 4 18:42:30 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 4 18:42:30 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/710a1a3c/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 3720987..da68772 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
- .matchQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context ) );
+ .termQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context ) );
}
//nothing was specified ensure we specify the context in the search
else {
- queryBuilder = QueryBuilders.matchQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context );
+ queryBuilder = QueryBuilders.termQuery( IndexingUtils.ENTITY_CONTEXT_FIELDNAME, context );
}
return queryBuilder;
[3/5] incubator-usergrid git commit: Merge branch 'two-dot-o' into
USERGRID-405
Posted by to...@apache.org.
Merge branch 'two-dot-o' into USERGRID-405
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/49fe0ac8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/49fe0ac8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/49fe0ac8
Branch: refs/heads/USERGRID-405
Commit: 49fe0ac86f5d0b17ca0f9c18b3f6e701505e0612
Parents: e54b263 ef3f77d
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 4 17:45:28 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 4 17:45:28 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/persistence/index/query/Query.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] 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/USERGRID-405
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(-)
----------------------------------------------------------------------
[5/5] incubator-usergrid git commit: Merge branch 'two-dot-o' into
USERGRID-405
Posted by to...@apache.org.
Merge branch 'two-dot-o' into USERGRID-405
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e83caf28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e83caf28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e83caf28
Branch: refs/heads/USERGRID-405
Commit: e83caf2853b92c398d328c54de7665cb0fd56586
Parents: 49fe0ac 710a1a3
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 4 18:55:13 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 4 18:55:13 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/persistence/index/query/Query.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------