svn commit: r1750759 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java

[th...@apache.org]

Author: thomasm
Date: Thu Jun 30 09:01:59 2016
New Revision: 1750759

URL: http://svn.apache.org/viewvc?rev=1750759&view=rev
Log:
OAK-4523 Query: first selector should be main selector

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java?rev=1750759&r1=1750758&r2=1750759&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java Thu Jun 30 09:01:59 2016
@@ -20,6 +20,7 @@ import static org.apache.jackrabbit.oak.
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -932,6 +933,9 @@ public class QueryImpl implements Query
         for (int i = 0; i < list.length; i++) {
             list[i] = selectors.get(i).getSelectorName();
         }
+        // reverse names to that for xpath, 
+        // the first selector is the same as the node iterator
+        Collections.reverse(Arrays.asList(list));
         return list;
     }
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java?rev=1750759&r1=1750758&r2=1750759&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java Thu Jun 30 09:01:59 2016
@@ -67,6 +67,24 @@ public class QueryTest extends AbstractR
     public QueryTest(NodeStoreFixture fixture) {
         super(fixture);
     }
+    
+    @Test
+    public void firstSelector() throws Exception {
+        Session session = getAdminSession();
+        Node root = session.getRootNode();
+        Node a = root.addNode("a");
+        a.setProperty("test", true);
+        Node b = a.addNode("b");
+        b.setProperty("test", true);
+        session.save();
+        QueryResult r = session.getWorkspace().getQueryManager()
+                .createQuery("//a[@test]/b[@test]", "xpath").execute();
+        String firstSelector = r.getSelectorNames()[0];
+        RowIterator rows = r.getRows();
+        Row row = rows.nextRow();
+        String path = row.getPath(firstSelector);
+        assertEquals("/a/b", path);
+    }
 
     @Test
     public void join() throws Exception {