Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A30ED9700 for ; Wed, 11 Apr 2012 09:07:51 +0000 (UTC) Received: (qmail 74146 invoked by uid 500); 11 Apr 2012 09:07:51 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 74121 invoked by uid 500); 11 Apr 2012 09:07:51 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 74112 invoked by uid 99); 11 Apr 2012 09:07:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2012 09:07:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2012 09:07:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 26D0423888EA; Wed, 11 Apr 2012 09:07:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1324658 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java Date: Wed, 11 Apr 2012 09:07:30 -0000 To: oak-commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120411090730.26D0423888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Wed Apr 11 09:07:29 2012 New Revision: 1324658 URL: http://svn.apache.org/viewvc?rev=1324658&view=rev Log: OAK-28 Query implementation (simplify a bit) Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java 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=1324658&r1=1324657&r2=1324658&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 Wed Apr 11 09:07:29 2012 @@ -27,12 +27,10 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; - import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.core.MicroKernelImpl; import org.apache.jackrabbit.oak.api.Result; import org.apache.jackrabbit.oak.api.ResultRow; -import org.junit.Before; import org.junit.Test; /** @@ -41,15 +39,7 @@ import org.junit.Test; public class QueryTest { private final MicroKernel mk = new MicroKernelImpl(); - - String head; - QueryEngineImpl qe; - - @Before - public void setUp() { - head = mk.getHeadRevision(); - qe = new QueryEngineImpl(mk); - } + private QueryEngineImpl qe = new QueryEngineImpl(mk); @Test public void script() throws Exception { @@ -63,7 +53,7 @@ public class QueryTest { @Test public void bindVariableTest() throws Exception { - head = mk.commit("/", "+ \"test\": { \"hello\": {\"id\": \"1\"}, \"world\": {\"id\": \"2\"}}", + mk.commit("/", "+ \"test\": { \"hello\": {\"id\": \"1\"}, \"world\": {\"id\": \"2\"}}", null, null); HashMap sv = new HashMap(); CoreValueFactory vf = new CoreValueFactory(); @@ -80,7 +70,6 @@ public class QueryTest { assertTrue(result.hasNext()); assertEquals("/test/world", result.next().getPath()); - result = qe.executeQuery("explain select * from [nt:base] where id = 1 order by id", QueryEngineImpl.SQL2, null).getRows().iterator(); assertTrue(result.hasNext()); @@ -166,35 +155,34 @@ public class QueryTest { r.close(); } if (errors) { - throw new Exception("Results in target/queryTest.txt don't match expected " + - "results in src/test/resources/queryTest.txt; compare the files for details"); + throw new Exception("Results in target/" + file + " don't match expected " + + "results in src/test/resources/" + file + "; compare the files for details"); } } private List executeQuery(String query) throws ParseException { List lines = new ArrayList(); - Result result = qe.executeQuery(query, QueryEngineImpl.SQL2, null); - Iterator iterator = result.getRows().iterator(); - while (iterator.hasNext()) { - ResultRow row = iterator.next(); - StringBuilder buff = new StringBuilder(); - CoreValue[] values = row.getValues(); - for (int i = 0; i < values.length; i++) { - if (i > 0) { - buff.append(", "); - } - CoreValue v = values[i]; - buff.append(v == null ? "null" : v.getString()); - } - lines.add(buff.toString()); + for (ResultRow row : result.getRows()) { + lines.add(readRow(row)); } - if (!query.contains("order by")) { Collections.sort(lines); } - return lines; } + private String readRow(ResultRow row) { + StringBuilder buff = new StringBuilder(); + CoreValue[] values = row.getValues(); + for (int i = 0; i < values.length; i++) { + if (i > 0) { + buff.append(", "); + } + CoreValue v = values[i]; + buff.append(v == null ? "null" : v.getString()); + } + return buff.toString(); + } + }