You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2012/03/12 18:45:30 UTC
svn commit: r1299755 - in
/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query:
./ qom/ qom/tree/ reader/
Author: mduerig
Date: Mon Mar 12 17:45:29 2012
New Revision: 1299755
URL: http://svn.apache.org/viewvc?rev=1299755&view=rev
Log:
Microkernel based prototype of JCR implementation (WIP)
- reduce line noise
Modified:
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/QueryObjectModelImpl.java
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/ComparisonImpl.java
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/JoinType.java
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Operator.java
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Order.java
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java?rev=1299755&r1=1299754&r2=1299755&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/ParserSQL2.java Mon Mar 12 17:45:29 2012
@@ -913,7 +913,7 @@ public class ParserSQL2 {
}
private void checkLiterals(boolean text) throws InvalidQueryException {
- if (text && !allowTextLiterals || (!text && !allowNumberLiterals)) {
+ if (text && !allowTextLiterals || !text && !allowNumberLiterals) {
throw getSyntaxError("bind variable (literals of this type not allowed)");
}
}
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java?rev=1299755&r1=1299754&r2=1299755&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/XPathToSQL2Converter.java Mon Mar 12 17:45:29 2012
@@ -625,7 +625,7 @@ public class XPathToSQL2Converter {
return new InvalidQueryException("Query:\n" + query);
}
- static abstract class Expression {
+ abstract static class Expression {
boolean isCondition() {
return false;
}
@@ -678,9 +678,9 @@ public class XPathToSQL2Converter {
}
public String toString() {
return
- (left == null ? "" : (left + " ")) +
+ (left == null ? "" : left + " ") +
operator +
- (right == null ? "" : (" " + right));
+ (right == null ? "" : " " + right);
}
@Override
boolean isCondition() {
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/QueryObjectModelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/QueryObjectModelImpl.java?rev=1299755&r1=1299754&r2=1299755&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/QueryObjectModelImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/QueryObjectModelImpl.java Mon Mar 12 17:45:29 2012
@@ -301,7 +301,7 @@ public class QueryObjectModelImpl implem
public void setExplain(boolean explain) {
this.explain = explain;
- };
+ }
public Iterator<? extends Row> executeQuery(String revisionId) {
prepare();
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/ComparisonImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/ComparisonImpl.java?rev=1299755&r1=1299754&r2=1299755&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/ComparisonImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/ComparisonImpl.java Mon Mar 12 17:45:29 2012
@@ -130,7 +130,7 @@ public class ComparisonImpl extends Cons
for (; pi < patternLength; pi++) {
switch (types[pi]) {
case MATCH:
- if ((si >= sLen) || !compare(pattern, s, pi, si++)) {
+ if (si >= sLen || !compare(pattern, s, pi, si++)) {
return false;
}
break;
@@ -195,7 +195,7 @@ public class ComparisonImpl extends Cons
patternChars[patternLength++] = c;
}
for (int i = 0; i < patternLength - 1; i++) {
- if ((patternTypes[i] == ANY) && (patternTypes[i + 1] == ONE)) {
+ if (patternTypes[i] == ANY && patternTypes[i + 1] == ONE) {
patternTypes[i] = ONE;
patternTypes[i + 1] = ANY;
}
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/JoinType.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/JoinType.java?rev=1299755&r1=1299754&r2=1299755&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/JoinType.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/JoinType.java Mon Mar 12 17:45:29 2012
@@ -43,7 +43,7 @@ public enum JoinType {
private final String sql;
- private JoinType(String name, String sql) {
+ JoinType(String name, String sql) {
this.name = name;
this.sql = sql;
}
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Operator.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Operator.java?rev=1299755&r1=1299754&r2=1299755&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Operator.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Operator.java Mon Mar 12 17:45:29 2012
@@ -59,11 +59,11 @@ public enum Operator {
*/
private final String sql;
- private Operator(String name, String op) {
+ Operator(String name, String op) {
this(name, op, op);
}
- private Operator(String name, String xpath, String sql) {
+ Operator(String name, String xpath, String sql) {
this.name = name;
this.xpath = xpath;
this.sql = sql;
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Order.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Order.java?rev=1299755&r1=1299754&r2=1299755&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Order.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/qom/tree/Order.java Mon Mar 12 17:45:29 2012
@@ -34,7 +34,7 @@ public enum Order {
*/
private final String name;
- private Order(String name) {
+ Order(String name) {
this.name = name;
}
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java?rev=1299755&r1=1299754&r2=1299755&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java Mon Mar 12 17:45:29 2012
@@ -36,7 +36,7 @@ public class TraversingCursor implements
this.mk = mk;
this.revisionId = revisionId;
this.childBlockSize = childBlockSize;
- this.currentPath = path;
+ currentPath = path;
}
private boolean loadChildren(String path, long offset) {