Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: oak-dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1382878 - in /jackrabbit/oak/trunk/oak-core/src/test:
 java/org/apache/jackrabbit/oak/query/QueryTest.java
 resources/org/apache/jackrabbit/oak/query/sql2.txt
Date: Mon, 10 Sep 2012 14:30:20 -0000
To: oak-commits@jackrabbit.apache.org
From: alexparvulescu@apache.org
Message-Id: <20120910143020.BF1C22388900@eris.apache.org>

Author: alexparvulescu
Date: Mon Sep 10 14:30:20 2012
New Revision: 1382878

URL: http://svn.apache.org/viewvc?rev=1382878&view=rev
Log:
OAK-288 QueryTests should use the NodeStore apis

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java?rev=1382878&r1=1382877&r2=1382878&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java Mon Sep 10 14:30:20 2012
@@ -49,7 +49,6 @@ public class QueryTest extends AbstractQ
     }
 
     @Test
-    @Ignore("OAK-288")
     public void sql2() throws Exception {
         test("sql2.txt");
     }

Modified: jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt?rev=1382878&r1=1382877&r2=1382878&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt Mon Sep 10 14:30:20 2012
@@ -110,8 +110,6 @@ select * from [nt:base] as b where local
 
 select * from [nt:base] as x where isdescendantnode(x, '/') and not isdescendantnode(x, '/jcr:system')
 /jcr:system
-/oak-index
-/oak-index/indexes
 /test
 /test/jcr:resource
 /test/resource
@@ -135,7 +133,6 @@ select * from [nt:base] as [p] where [p]
 select * from [nt:base] as p inner join [nt:base] as p2 on ischildnode(p2, p) where p.[jcr:path] = '/'
 /, /children
 /, /jcr:system
-/, /oak-index
 /, /parents
 
 select * from [nt:base] as p inner join [nt:base] as p2 on isdescendantnode(p2, p) where p.[jcr:path] = '/parents'
@@ -160,8 +157,8 @@ select id from [nt:base] where id is not
 0
 
 measure select * from [nt:base] as c right outer join [nt:base] as p on p.id = c.p where p.id is not null and not isdescendantnode(p, '/jcr:system')
-c, 630
-p, 210
+c, 624
+p, 208
 query, 4
 
 select * from [nt:base] as c right outer join [nt:base] as p on p.id = c.p where p.id is not null and not isdescendantnode(p, '/jcr:system')
@@ -171,8 +168,8 @@ select * from [nt:base] as c right outer
 null, /parents/p0
 
 measure select * from [nt:base] as p left outer join [nt:base] as c on p.id = c.p where p.id is not null
-c, 630
-p, 210
+c, 624
+p, 208
 query, 4
 
 select * from [nt:base] as p left outer join [nt:base] as c on p.id = c.p where p.id is not null
@@ -182,16 +179,16 @@ select * from [nt:base] as p left outer 
 /parents/p2, /children/c3
 
 measure select * from [nt:base] as p left outer join [nt:base] as c on p.id = c.p where p.id is not null and c.p is null
-c, 630
-p, 210
+c, 624
+p, 208
 query, 1
 
 select * from [nt:base] as p left outer join [nt:base] as c on p.id = c.p where p.id is not null and c.p is null
 /parents/p0, null
 
 measure select * from [nt:base] as p left outer join [nt:base] as c on p.id = c.p where p.id is not null and c.p is not null
-c, 630
-p, 210
+c, 624
+p, 208
 query, 3
 
 select * from [nt:base] as p left outer join [nt:base] as c on p.id = c.p where p.id is not null and c.p is not null
@@ -203,8 +200,8 @@ explain select * from [nt:base] as p inn
 [nt:base] as p /* traverse "//*" where p.id is not null */ inner join [nt:base] as c /* traverse "//*" where c.p is not null */ on p.id = c.p
 
 measure select * from [nt:base] as p inner join [nt:base] as c on p.id = c.p
-c, 630
-p, 210
+c, 624
+p, 208
 query, 3
 
 select * from [nt:base] as p inner join [nt:base] as c on p.id = c.p
@@ -221,8 +218,6 @@ commit / + "test2": { "id":"1", "x": "2"
 select * from [nt:base] where not isdescendantnode('/jcr:system')
 /
 /jcr:system
-/oak-index
-/oak-index/indexes
 /test
 /test/hello
 /test/world
@@ -241,16 +236,12 @@ select * from [nt:base] where id = '1' o
 select * from [nt:base] where not (id = '1' or x = '2') and not isdescendantnode('/jcr:system')
 /
 /jcr:system
-/oak-index
-/oak-index/indexes
 /test
 /test/hello
 
 select * from [nt:base] where x is null and not isdescendantnode('/jcr:system')
 /
 /jcr:system
-/oak-index
-/oak-index/indexes
 /test
 
 commit / - "test"