You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2012/04/05 15:26:39 UTC
svn commit: r1309842 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api:
QueryEngine.java Result.java
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.
* <p>
- * 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<? extends ResultRow> getRows();
+ Iterable<? extends ResultRow> getRows();
}