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 035B2976E for ; Thu, 5 Apr 2012 13:27:01 +0000 (UTC) Received: (qmail 72921 invoked by uid 500); 5 Apr 2012 13:27:00 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 72897 invoked by uid 500); 5 Apr 2012 13:27:00 -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 72885 invoked by uid 99); 5 Apr 2012 13:27:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2012 13:27:00 +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; Thu, 05 Apr 2012 13:26:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 96C00238897A; Thu, 5 Apr 2012 13:26:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1309842 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api: QueryEngine.java Result.java Date: Thu, 05 Apr 2012 13:26:39 -0000 To: oak-commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120405132639.96C00238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Thu Apr 5 13:26:39 2012 New Revision: 1309842 URL: http://svn.apache.org/viewvc?rev=1309842&view=rev Log: OAK-34 Define query API (changes as discussed) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/QueryEngine.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Result.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/QueryEngine.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/QueryEngine.java?rev=1309842&r1=1309841&r2=1309842&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/QueryEngine.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/QueryEngine.java Thu Apr 5 13:26:39 2012 @@ -24,23 +24,11 @@ import org.apache.jackrabbit.oak.query.C /** * The query engine allows to parse and execute queries. *

- * At least the query languages {@code QueryEngine.XPATH} and {@code - * QueryEngine.SQL2} are supported. Other query languages might be supported - * depending on the configured query parsers. + * What query languages are supported depends on the registered query parsers. */ public interface QueryEngine { /** - * The XPath query language. - */ - String XPATH = "xpath"; - - /** - * The SQL-2 query language. - */ - String SQL2 = "sql2"; - - /** * Parse the query (check if it's valid) and get the list of bind variable names. * * @param statement Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Result.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Result.java?rev=1309842&r1=1309841&r2=1309842&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Result.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Result.java Thu Apr 5 13:26:39 2012 @@ -16,8 +16,6 @@ */ package org.apache.jackrabbit.oak.api; -import java.util.Iterator; - /** * A result from executing a query. */ @@ -27,6 +25,6 @@ public interface Result { String[] getSelectorNames(); - Iterator getRows(); + Iterable getRows(); }