You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-dev@jackrabbit.apache.org by Chetan Mehrotra <ch...@gmail.com> on 2014/11/17 16:16:39 UTC
Support for sort with lower case (OAK-2266 : UserQueryManager: Sort
Ignore Case Reversed)
Hi,
I do not think we current have support for sorting with lower case
within any of the QueryIndex. Also we do not have indexes defined for
normal sorting of authorizable types.
Should we create an index as part of default Oak setup for performant
UserQueryManager?
Chetan Mehrotra
---------- Forwarded message ----------
From: <an...@apache.org>
Date: Mon, Nov 17, 2014 at 4:43 PM
Subject: svn commit: r1640142 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
To: oak-commits@jackrabbit.apache.org
Author: angela
Date: Mon Nov 17 11:13:33 2014
New Revision: 1640142
URL: http://svn.apache.org/r1640142
Log:
OAK-2266 : UserQueryManager: Sort Ignore Case Reversed
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=1640142&r1=1640141&r2=1640142&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
Mon Nov 17 11:13:33 2014
@@ -117,11 +117,13 @@ public class UserQueryManager {
if (sortCol != null) {
boolean ignoreCase = builder.getSortIgnoreCase();
- statement.append(" order by ")
- .append(ignoreCase ? "" : "fn:lower-case(")
- .append(sortCol)
- .append(ignoreCase ? " " : ") ")
- .append(sortDir.getDirection());
+ statement.append(" order by ");
+ if (ignoreCase) {
+ statement.append("fn:lower-case(").append(sortCol).append(')');
+ } else {
+ statement.append(sortCol);
+ }
+ statement.append(' ').append(sortDir.getDirection());
}
final String groupId = builder.getGroupID();
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java?rev=1640142&r1=1640141&r2=1640142&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java
Mon Nov 17 11:13:33 2014
@@ -28,8 +28,8 @@ import javax.jcr.RepositoryException;
import javax.jcr.Value;
import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.Query;
@@ -111,10 +111,10 @@ public class UserQueryTest extends Abstr
User jackrabbit = createUser("jackrabbit", "carrots", 2500, true);
User deer = createUser("deer", "leaves", 120000, true);
- User opposum = createUser("opposum", "fruit", 1200, true);
+ User opossum = createUser("opossum", "fruit", 1200, true);
kangaroo = createUser("kangaroo", "grass", 90000, true);
elephant = createUser("elephant", "leaves", 5000000, true);
- addMembers(mammals, jackrabbit, deer, opposum, kangaroo, elephant);
+ addMembers(mammals, jackrabbit, deer, opossum, kangaroo, elephant);
User lemur = createUser("lemur", "nectar", 1100, true);
User gibbon = createUser("gibbon", "meat", 20000, true);
@@ -140,17 +140,23 @@ public class UserQueryTest extends Abstr
setProperty("poisonous", vf.createValue(true), blackWidow,
bee, poisonDartFrog);
setProperty("poisonous", vf.createValue(false), turtle, lemur);
setProperty("hasWings", vf.createValue(false), blackWidow,
gardenSpider, jumpingSpider, ant,
- jackrabbit, deer, opposum, kangaroo, elephant, lemur,
gibbon, crocodile, turtle, lizard,
+ jackrabbit, deer, opossum, kangaroo, elephant, lemur,
gibbon, crocodile, turtle, lizard,
salamander, goldenToad, poisonDartFrog);
setProperty("color", vf.createValue("black"), blackWidow,
gardenSpider, ant, fly, lizard, salamander);
- setProperty("color", vf.createValue("WHITE"), opposum, goose,
pelican, dove);
+ setProperty("color", vf.createValue("WHITE"), opossum, goose,
pelican, dove);
setProperty("color", vf.createValue("gold"), goldenToad);
setProperty("numberOfLegs", vf.createValue(2), kangaroo,
gibbon, kestrel, goose, dove);
- setProperty("numberOfLegs", vf.createValue(4), jackrabbit,
deer, opposum, elephant, lemur, crocodile,
+ setProperty("numberOfLegs", vf.createValue(4), jackrabbit,
deer, opossum, elephant, lemur, crocodile,
turtle, lizard, salamander, goldenToad, poisonDartFrog);
setProperty("numberOfLegs", vf.createValue(6), ant, bee, fly);
setProperty("numberOfLegs", vf.createValue(8), blackWidow,
gardenSpider, jumpingSpider);
+ // testing ignore-case with sort order
+ setProperty("continent", vf.createValue("africa"), lemur, gibbon);
+ setProperty("continent", vf.createValue("Africa"), elephant);
+ setProperty("continent", vf.createValue("australia"), kangaroo);
+ setProperty("continent", vf.createValue("America"), opossum);
+
elephant.getImpersonation().grantImpersonation(jackrabbit.getPrincipal());
authorizables.addAll(users);
@@ -676,12 +682,12 @@ public class UserQueryTest extends Abstr
}
@Test
- public void testSortOrder1() throws RepositoryException {
+ public void testSortOrderIgnoreCaseDescending() throws
RepositoryException {
Iterator<Authorizable> result = userMgr.findAuthorizables(new Query() {
public <T> void build(QueryBuilder<T> builder) {
builder.setCondition(builder.
exists("@color"));
- builder.setSortOrder("@color",
QueryBuilder.Direction.DESCENDING);
+ builder.setSortOrder("@color",
QueryBuilder.Direction.DESCENDING, true);
}
});
@@ -698,12 +704,34 @@ public class UserQueryTest extends Abstr
}
@Test
- public void testSortOrder2() throws RepositoryException {
+ public void testSortOrderRespectCaseDescending() throws
RepositoryException {
+ Iterator<Authorizable> result = userMgr.findAuthorizables(new Query() {
+ public <T> void build(QueryBuilder<T> builder) {
+ builder.setCondition(builder.
+ exists("@color"));
+ builder.setSortOrder("@color",
QueryBuilder.Direction.DESCENDING, false);
+ }
+ });
+
+ assertTrue(result.hasNext());
+ String prev = null;
+ while (result.hasNext()) {
+ Authorizable authorizable = result.next();
+ Value[] color = authorizable.getProperty("color");
+ assertNotNull(color);
+ assertEquals(1, color.length);
+ assertTrue(prev == null ||
prev.compareTo(color[0].getString()) >= 0);
+ prev = color[0].getString();
+ }
+ }
+
+ @Test
+ public void testSortOrderRespectCaseAscendingDoubleValue() throws
RepositoryException {
Iterator<Authorizable> result = userMgr.findAuthorizables(new Query() {
public <T> void build(QueryBuilder<T> builder) {
builder.setCondition(builder.
exists("profile/@weight"));
- builder.setSortOrder("profile/@weight",
QueryBuilder.Direction.ASCENDING, true);
+ builder.setSortOrder("profile/@weight",
QueryBuilder.Direction.ASCENDING, false);
}
});
@@ -719,6 +747,54 @@ public class UserQueryTest extends Abstr
}
}
+ /**
+ * @see <a
href="https://issues.apache.org/jira/browse/OAK-2266">OAK-2266</a>
+ */
+ @Test
+ public void testSortOrderIgnoreCaseAscending() throws Exception {
+ Iterator<Authorizable> result = userMgr.findAuthorizables(new Query() {
+ public <T> void build(QueryBuilder<T> builder) {
+ builder.setCondition(builder.exists("@continent"));
+ builder.setSortOrder("@continent",
QueryBuilder.Direction.ASCENDING, true);
+ }
+ });
+
+ Iterator<String> continents = ImmutableList.of("africa",
"america", "australia").iterator();
+ String expected = continents.next();
+ while (result.hasNext()) {
+ Authorizable a = result.next();
+ String continent =
a.getProperty("continent")[0].getString().toLowerCase();
+ if (!continent.equals(expected)) {
+ expected = continents.next();
+ assertEquals(expected, continent);
+ }
+ }
+ }
+
+ /**
+ * @see <a
href="https://issues.apache.org/jira/browse/OAK-2266">OAK-2266</a>
+ */
+ @Test()
+ public void testSortOrderRespectCaseAscending() throws Exception {
+ Iterator<Authorizable> result = userMgr.findAuthorizables(new Query() {
+ public <T> void build(QueryBuilder<T> builder) {
+ builder.setCondition(builder.exists("@continent"));
+ builder.setSortOrder("@continent",
QueryBuilder.Direction.ASCENDING, false);
+ }
+ });
+
+ Iterator<String> continents = ImmutableList.of("Africa",
"America", "africa", "australia").iterator();
+ String expected = continents.next();
+ while (result.hasNext()) {
+ Authorizable a = result.next();
+ String continent = a.getProperty("continent")[0].getString();
+ if (!continent.equals(expected)) {
+ expected = continents.next();
+ assertEquals(expected, continent);
+ }
+ }
+ }
+
@Test
public void testOffset() throws RepositoryException {
long[] offsets = {2, 0, 3, 0, 100000};
@@ -777,7 +853,7 @@ public class UserQueryTest extends Abstr
public <T> void build(QueryBuilder<T> builder) {
builder.setCondition(builder.
eq("profile/@cute", vf.createValue(true)));
- builder.setSortOrder("profile/@weight",
QueryBuilder.Direction.ASCENDING, true);
+ builder.setSortOrder("profile/@weight",
QueryBuilder.Direction.ASCENDING, false);
builder.setLimit(vf.createValue(1000.0), count);
}
});
Re: Support for sort with lower case (OAK-2266 : UserQueryManager:
Sort Ignore Case Reversed)
Posted by Angela Schreiber <an...@adobe.com>.
Hi Chetan
The only sorted query I am aware of is lookup of users/groups by
"name" which is either a query for rep:principalName or rep:authorizableId
or node-name or a combination of those.
As far as I know Dominique Jaeggi has been working on this recently
and if I am not mistaken he will provide patches for the default
user related index definitions as well as benchmark tests such that
we can track the performance.
If you could take a look at the patches from a query/index point of
view this would definitely be very helpful.
Thanks and kind regards
Angela
On 17/11/14 18:59, "Chetan Mehrotra" <ch...@gmail.com> wrote:
>Hi Angela,
>
>On Mon, Nov 17, 2014 at 11:17 PM, Angela Schreiber <an...@adobe.com>
>wrote:
>> unless we have a compelling reason for this, i would rather
>> list this as known limitation in the query and user-query documentation
>> section along with an instruction on to fix it in case someone
>> needs the ignore-case with a dedicated, sorted query for a
>> specific property.
>
>Makes sense! However do you know of cases where user do perform even
>normal sorting via UserManagerQuery API? If there is a major usecase
>for that then probably we need to back them up by indexes
>
>Chetan Mehrotra
Re: Support for sort with lower case (OAK-2266 : UserQueryManager:
Sort Ignore Case Reversed)
Posted by Chetan Mehrotra <ch...@gmail.com>.
Hi Angela,
On Mon, Nov 17, 2014 at 11:17 PM, Angela Schreiber <an...@adobe.com> wrote:
> unless we have a compelling reason for this, i would rather
> list this as known limitation in the query and user-query documentation
> section along with an instruction on to fix it in case someone
> needs the ignore-case with a dedicated, sorted query for a
> specific property.
Makes sense! However do you know of cases where user do perform even
normal sorting via UserManagerQuery API? If there is a major usecase
for that then probably we need to back them up by indexes
Chetan Mehrotra
Re: Support for sort with lower case (OAK-2266 : UserQueryManager:
Sort Ignore Case Reversed)
Posted by Angela Schreiber <an...@adobe.com>.
hi chetan
quit frankly i am not sure this was used very often as nobody
complained about the bug for years now.
unless we have a compelling reason for this, i would rather
list this as known limitation in the query and user-query documentation
section along with an instruction on to fix it in case someone
needs the ignore-case with a dedicated, sorted query for a
specific property.
regards
angela
On 17/11/14 16:16, "Chetan Mehrotra" <ch...@gmail.com> wrote:
>Hi,
>
>I do not think we current have support for sorting with lower case
>within any of the QueryIndex. Also we do not have indexes defined for
>normal sorting of authorizable types.
>
>Should we create an index as part of default Oak setup for performant
>UserQueryManager?
>
>Chetan Mehrotra
>
>
>
>---------- Forwarded message ----------
>From: <an...@apache.org>
>Date: Mon, Nov 17, 2014 at 4:43 PM
>Subject: svn commit: r1640142 - in /jackrabbit/oak/trunk:
>oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQ
>ueryManager.java
>oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserQuer
>yTest.java
>To: oak-commits@jackrabbit.apache.org
>
>
>Author: angela
>Date: Mon Nov 17 11:13:33 2014
>New Revision: 1640142
>
>URL: http://svn.apache.org/r1640142
>Log:
>OAK-2266 : UserQueryManager: Sort Ignore Case Reversed
>
>Modified:
>
>jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/secu
>rity/user/query/UserQueryManager.java
>
>jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/s
>ecurity/user/UserQueryTest.java
>
>Modified:
>jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/secu
>rity/user/query/UserQueryManager.java
>URL:
>http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/o
>rg/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=164
>0142&r1=1640141&r2=1640142&view=diff
>==========================================================================
>====
>---
>jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/secu
>rity/user/query/UserQueryManager.java
>(original)
>+++
>jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/secu
>rity/user/query/UserQueryManager.java
>Mon Nov 17 11:13:33 2014
>@@ -117,11 +117,13 @@ public class UserQueryManager {
>
> if (sortCol != null) {
> boolean ignoreCase = builder.getSortIgnoreCase();
>- statement.append(" order by ")
>- .append(ignoreCase ? "" : "fn:lower-case(")
>- .append(sortCol)
>- .append(ignoreCase ? " " : ") ")
>- .append(sortDir.getDirection());
>+ statement.append(" order by ");
>+ if (ignoreCase) {
>+
>statement.append("fn:lower-case(").append(sortCol).append(')');
>+ } else {
>+ statement.append(sortCol);
>+ }
>+ statement.append(' ').append(sortDir.getDirection());
> }
>
> final String groupId = builder.getGroupID();
>
>Modified:
>jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/s
>ecurity/user/UserQueryTest.java
>URL:
>http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/or
>g/apache/jackrabbit/oak/jcr/security/user/UserQueryTest.java?rev=1640142&r
>1=1640141&r2=1640142&view=diff
>==========================================================================
>====
>---
>jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/s
>ecurity/user/UserQueryTest.java
>(original)
>+++
>jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/s
>ecurity/user/UserQueryTest.java
>Mon Nov 17 11:13:33 2014
>@@ -28,8 +28,8 @@ import javax.jcr.RepositoryException;
> import javax.jcr.Value;
>
> import com.google.common.base.Predicate;
>+import com.google.common.collect.ImmutableList;
> import com.google.common.collect.Iterators;
>-import com.google.common.collect.Lists;
> import org.apache.jackrabbit.api.security.user.Authorizable;
> import org.apache.jackrabbit.api.security.user.Group;
> import org.apache.jackrabbit.api.security.user.Query;
>@@ -111,10 +111,10 @@ public class UserQueryTest extends Abstr
>
> User jackrabbit = createUser("jackrabbit", "carrots", 2500,
>true);
> User deer = createUser("deer", "leaves", 120000, true);
>- User opposum = createUser("opposum", "fruit", 1200, true);
>+ User opossum = createUser("opossum", "fruit", 1200, true);
> kangaroo = createUser("kangaroo", "grass", 90000, true);
> elephant = createUser("elephant", "leaves", 5000000, true);
>- addMembers(mammals, jackrabbit, deer, opposum, kangaroo,
>elephant);
>+ addMembers(mammals, jackrabbit, deer, opossum, kangaroo,
>elephant);
>
> User lemur = createUser("lemur", "nectar", 1100, true);
> User gibbon = createUser("gibbon", "meat", 20000, true);
>@@ -140,17 +140,23 @@ public class UserQueryTest extends Abstr
> setProperty("poisonous", vf.createValue(true), blackWidow,
>bee, poisonDartFrog);
> setProperty("poisonous", vf.createValue(false), turtle, lemur);
> setProperty("hasWings", vf.createValue(false), blackWidow,
>gardenSpider, jumpingSpider, ant,
>- jackrabbit, deer, opposum, kangaroo, elephant, lemur,
>gibbon, crocodile, turtle, lizard,
>+ jackrabbit, deer, opossum, kangaroo, elephant, lemur,
>gibbon, crocodile, turtle, lizard,
> salamander, goldenToad, poisonDartFrog);
> setProperty("color", vf.createValue("black"), blackWidow,
>gardenSpider, ant, fly, lizard, salamander);
>- setProperty("color", vf.createValue("WHITE"), opposum, goose,
>pelican, dove);
>+ setProperty("color", vf.createValue("WHITE"), opossum, goose,
>pelican, dove);
> setProperty("color", vf.createValue("gold"), goldenToad);
> setProperty("numberOfLegs", vf.createValue(2), kangaroo,
>gibbon, kestrel, goose, dove);
>- setProperty("numberOfLegs", vf.createValue(4), jackrabbit,
>deer, opposum, elephant, lemur, crocodile,
>+ setProperty("numberOfLegs", vf.createValue(4), jackrabbit,
>deer, opossum, elephant, lemur, crocodile,
> turtle, lizard, salamander, goldenToad, poisonDartFrog);
> setProperty("numberOfLegs", vf.createValue(6), ant, bee, fly);
> setProperty("numberOfLegs", vf.createValue(8), blackWidow,
>gardenSpider, jumpingSpider);
>
>+ // testing ignore-case with sort order
>+ setProperty("continent", vf.createValue("africa"), lemur,
>gibbon);
>+ setProperty("continent", vf.createValue("Africa"), elephant);
>+ setProperty("continent", vf.createValue("australia"), kangaroo);
>+ setProperty("continent", vf.createValue("America"), opossum);
>+
>
>elephant.getImpersonation().grantImpersonation(jackrabbit.getPrincipal());
>
> authorizables.addAll(users);
>@@ -676,12 +682,12 @@ public class UserQueryTest extends Abstr
> }
>
> @Test
>- public void testSortOrder1() throws RepositoryException {
>+ public void testSortOrderIgnoreCaseDescending() throws
>RepositoryException {
> Iterator<Authorizable> result = userMgr.findAuthorizables(new
>Query() {
> public <T> void build(QueryBuilder<T> builder) {
> builder.setCondition(builder.
> exists("@color"));
>- builder.setSortOrder("@color",
>QueryBuilder.Direction.DESCENDING);
>+ builder.setSortOrder("@color",
>QueryBuilder.Direction.DESCENDING, true);
> }
> });
>
>@@ -698,12 +704,34 @@ public class UserQueryTest extends Abstr
> }
>
> @Test
>- public void testSortOrder2() throws RepositoryException {
>+ public void testSortOrderRespectCaseDescending() throws
>RepositoryException {
>+ Iterator<Authorizable> result = userMgr.findAuthorizables(new
>Query() {
>+ public <T> void build(QueryBuilder<T> builder) {
>+ builder.setCondition(builder.
>+ exists("@color"));
>+ builder.setSortOrder("@color",
>QueryBuilder.Direction.DESCENDING, false);
>+ }
>+ });
>+
>+ assertTrue(result.hasNext());
>+ String prev = null;
>+ while (result.hasNext()) {
>+ Authorizable authorizable = result.next();
>+ Value[] color = authorizable.getProperty("color");
>+ assertNotNull(color);
>+ assertEquals(1, color.length);
>+ assertTrue(prev == null ||
>prev.compareTo(color[0].getString()) >= 0);
>+ prev = color[0].getString();
>+ }
>+ }
>+
>+ @Test
>+ public void testSortOrderRespectCaseAscendingDoubleValue() throws
>RepositoryException {
> Iterator<Authorizable> result = userMgr.findAuthorizables(new
>Query() {
> public <T> void build(QueryBuilder<T> builder) {
> builder.setCondition(builder.
> exists("profile/@weight"));
>- builder.setSortOrder("profile/@weight",
>QueryBuilder.Direction.ASCENDING, true);
>+ builder.setSortOrder("profile/@weight",
>QueryBuilder.Direction.ASCENDING, false);
> }
> });
>
>@@ -719,6 +747,54 @@ public class UserQueryTest extends Abstr
> }
> }
>
>+ /**
>+ * @see <a
>href="https://issues.apache.org/jira/browse/OAK-2266">OAK-2266</a>
>+ */
>+ @Test
>+ public void testSortOrderIgnoreCaseAscending() throws Exception {
>+ Iterator<Authorizable> result = userMgr.findAuthorizables(new
>Query() {
>+ public <T> void build(QueryBuilder<T> builder) {
>+ builder.setCondition(builder.exists("@continent"));
>+ builder.setSortOrder("@continent",
>QueryBuilder.Direction.ASCENDING, true);
>+ }
>+ });
>+
>+ Iterator<String> continents = ImmutableList.of("africa",
>"america", "australia").iterator();
>+ String expected = continents.next();
>+ while (result.hasNext()) {
>+ Authorizable a = result.next();
>+ String continent =
>a.getProperty("continent")[0].getString().toLowerCase();
>+ if (!continent.equals(expected)) {
>+ expected = continents.next();
>+ assertEquals(expected, continent);
>+ }
>+ }
>+ }
>+
>+ /**
>+ * @see <a
>href="https://issues.apache.org/jira/browse/OAK-2266">OAK-2266</a>
>+ */
>+ @Test()
>+ public void testSortOrderRespectCaseAscending() throws Exception {
>+ Iterator<Authorizable> result = userMgr.findAuthorizables(new
>Query() {
>+ public <T> void build(QueryBuilder<T> builder) {
>+ builder.setCondition(builder.exists("@continent"));
>+ builder.setSortOrder("@continent",
>QueryBuilder.Direction.ASCENDING, false);
>+ }
>+ });
>+
>+ Iterator<String> continents = ImmutableList.of("Africa",
>"America", "africa", "australia").iterator();
>+ String expected = continents.next();
>+ while (result.hasNext()) {
>+ Authorizable a = result.next();
>+ String continent = a.getProperty("continent")[0].getString();
>+ if (!continent.equals(expected)) {
>+ expected = continents.next();
>+ assertEquals(expected, continent);
>+ }
>+ }
>+ }
>+
> @Test
> public void testOffset() throws RepositoryException {
> long[] offsets = {2, 0, 3, 0, 100000};
>@@ -777,7 +853,7 @@ public class UserQueryTest extends Abstr
> public <T> void build(QueryBuilder<T> builder) {
> builder.setCondition(builder.
> eq("profile/@cute", vf.createValue(true)));
>- builder.setSortOrder("profile/@weight",
>QueryBuilder.Direction.ASCENDING, true);
>+ builder.setSortOrder("profile/@weight",
>QueryBuilder.Direction.ASCENDING, false);
> builder.setLimit(vf.createValue(1000.0), count);
> }
> });