Author: thomasm
Date: Fri Jul 21 11:19:32 2017
New Revision: 1802566
URL: http://svn.apache.org/viewvc?rev=1802566&view=rev
Log:
OAK-6359 Change behavior for very complex queries
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/XPathTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 21 11:19:32 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799393,1799924,1800269,1800606,1800613,1800974,1801118-1801119,1801675
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801118-1801119,1801675,1802548
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java?rev=1802566&r1=1802565&r2=1802566&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
Fri Jul 21 11:19:32 2017
@@ -139,6 +139,10 @@ public class QueryImpl implements Query
*/
public static final String REP_SUGGEST = "rep:suggest()";
+ public static final UnsupportedOperationException TOO_MANY_UNION =
+ new UnsupportedOperationException("Too many union queries");
+ public final static int MAX_UNION = Integer.getInteger("oak.sql2MaxUnion",
1000);
+
private static final Logger LOG = LoggerFactory.getLogger(QueryImpl.class);
private boolean potentiallySlowTraversalQueryLogged;
@@ -1262,7 +1266,13 @@ public class QueryImpl implements Query
Query result = this;
if (constraint != null) {
- Set<ConstraintImpl> unionList = constraint.convertToUnion();
+ Set<ConstraintImpl> unionList;
+ try {
+ unionList = constraint.convertToUnion();
+ } catch (UnsupportedOperationException e) {
+ // too many union
+ return this;
+ }
if (unionList.size() > 1) {
// there are some cases where multiple ORs simplify into a
single one. If we get a
// union list of just one we don't really have to UNION
anything.
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java?rev=1802566&r1=1802565&r2=1802566&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java
Fri Jul 21 11:19:32 2017
@@ -34,6 +34,7 @@ import java.util.Set;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.query.fulltext.FullTextAnd;
import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression;
+import org.apache.jackrabbit.oak.query.QueryImpl;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import com.google.common.collect.Sets;
@@ -295,6 +296,9 @@ public class AndImpl extends ConstraintI
nonUnion.add(c);
} else {
union.addAll(converted);
+ if (union.size() > QueryImpl.MAX_UNION) {
+ throw QueryImpl.TOO_MANY_UNION;
+ }
}
}
if (!union.isEmpty() && nonUnion.size() == 1) {
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java?rev=1802566&r1=1802565&r2=1802566&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java
Fri Jul 21 11:19:32 2017
@@ -29,6 +29,10 @@ import org.apache.jackrabbit.oak.query.x
* An xpath statement.
*/
public class Statement {
+
+ private static final UnsupportedOperationException TOO_MANY_UNION =
+ new UnsupportedOperationException("Too many union queries");
+ private final static int MAX_UNION =
Integer.getInteger("oak.xpathMaxUnion", 1000);
boolean explain;
boolean measure;
@@ -62,7 +66,12 @@ public class Statement {
where = where.optimize();
optimizeSelectorNodeTypes();
ArrayList<Expression> unionList = new ArrayList<Expression>();
- addToUnionList(where, unionList);
+ try {
+ addToUnionList(where, unionList);
+ } catch (UnsupportedOperationException e) {
+ // too many union
+ return this;
+ }
if (unionList.size() == 1) {
return this;
}
@@ -141,6 +150,9 @@ public class Statement {
return;
}
}
+ if (unionList.size() > MAX_UNION) {
+ throw TOO_MANY_UNION;
+ }
unionList.add(condition);
}
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/XPathTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/XPathTest.java?rev=1802566&r1=1802565&r2=1802566&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/XPathTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/XPathTest.java
Fri Jul 21 11:19:32 2017
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.query;
import static
org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent.INITIAL_CONTENT;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.text.ParseException;
@@ -35,6 +36,40 @@ public class XPathTest {
new NodeStateNodeTypeInfoProvider(INITIAL_CONTENT);
@Test
+ public void complexQuery() throws ParseException {
+ for(int n = 1; n < 15; n++) {
+ for(int m = 1; m < 15; m++) {
+ complexQuery(n, m);
+ }
+ }
+ }
+
+ private void complexQuery(int n, int m) throws ParseException {
+ StringBuilder buff = new StringBuilder();
+ buff.append("/jcr:root//*[");
+ for (int i = 0; i < n; i++) {
+ if (i > 0) {
+ buff.append("and ");
+ }
+ buff.append("(");
+ for (int j = 0; j < m; j++) {
+ if (j > 0) {
+ buff.append("or ");
+ }
+ buff.append("@x" + j + " = " + j);
+ }
+ buff.append(")\n");
+ }
+ buff.append("]");
+ String xpath = buff.toString();
+ String sql2 = new XPathToSQL2Converter().convert(xpath);
+ assertTrue("Length: " + sql2.length(), sql2.length() < 200000);
+ SQL2Parser p = new SQL2Parser(null, nodeTypes, new
QueryEngineSettings());
+ Query q = p.parse(sql2, false);
+ q.buildAlternativeQuery();
+ }
+
+ @Test
public void queryOptions() throws ParseException {
verify("(/jcr:root/a//* | /jcr:root/b//*) order by @jcr:score",
"select [jcr:path], [jcr:score], * " +
