You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/10/18 15:46:04 UTC
svn commit: r1023801 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
Author: jukka
Date: Mon Oct 18 13:46:04 2010
New Revision: 1023801
URL: http://svn.apache.org/viewvc?rev=1023801&view=rev
Log:
JCR-2715: Improved join query performance
Optimize handling of cases where the other join source produces no results.
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java?rev=1023801&r1=1023800&r2=1023801&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java Mon Oct 18 13:46:04 2010
@@ -143,6 +143,7 @@ abstract class JoinMerger {
public QueryResult merge(
RowIterator leftRows, RowIterator rightRows)
throws RepositoryException {
+ RowIterator joinRows;
if (JCR_JOIN_TYPE_RIGHT_OUTER.equals(type)) {
Map<String, List<Row>> map = new HashMap<String, List<Row>>();
for (Row row : new RowIterable(leftRows)) {
@@ -155,7 +156,7 @@ abstract class JoinMerger {
rows.add(row);
}
}
- return mergeRight(map, rightRows);
+ joinRows = mergeRight(map, rightRows);
} else {
Map<String, List<Row>> map = new HashMap<String, List<Row>>();
for (Row row : new RowIterable(rightRows)) {
@@ -169,52 +170,67 @@ abstract class JoinMerger {
}
}
boolean outer = JCR_JOIN_TYPE_LEFT_OUTER.equals(type);
- return mergeLeft(leftRows, map, outer);
+ joinRows = mergeLeft(leftRows, map, outer);
}
+ return new SimpleQueryResult(columnNames, selectorNames, joinRows);
}
- private QueryResult mergeLeft(
+ private RowIterator mergeLeft(
RowIterator leftRows, Map<String, List<Row>> rightRowMap,
boolean outer) throws RepositoryException {
- System.out.println("Available right matches " + rightRowMap.keySet());
- List<Row> rows = new ArrayList<Row>();
- for (Row leftRow : new RowIterable(leftRows)) {
- System.out.println("Finding matchers for left row " + leftRow);
- for (String value : getLeftValues(leftRow)) {
- System.out.println(" - checking for matches for " + value);
- List<Row> rightRows = rightRowMap.get(value);
- if (rightRows != null) {
- for (Row rightRow : rightRows) {
- System.out.println(" -> found matching row " + rightRow);
- rows.add(mergeRow(leftRow, rightRow));
+ if (!rightRowMap.isEmpty()) {
+ List<Row> rows = new ArrayList<Row>();
+ for (Row leftRow : new RowIterable(leftRows)) {
+ for (String value : getLeftValues(leftRow)) {
+ List<Row> rightRows = rightRowMap.get(value);
+ if (rightRows != null) {
+ for (Row rightRow : rightRows) {
+ rows.add(mergeRow(leftRow, rightRow));
+ }
+ } else if (outer) {
+ rows.add(mergeRow(leftRow, null));
}
- } else if (outer) {
- rows.add(mergeRow(leftRow, null));
}
}
+ return new RowIteratorAdapter(rows);
+ } else if (outer) {
+ return new RowIteratorAdapter(leftRows) {
+ @Override
+ public Object next() {
+ return mergeRow((Row) super.next(), null);
+ }
+ };
+ } else {
+ return new RowIteratorAdapter(Collections.emptySet());
}
- return new SimpleQueryResult(
- columnNames, selectorNames, new RowIteratorAdapter(rows));
}
- private QueryResult mergeRight(
+ private RowIterator mergeRight(
Map<String, List<Row>> leftRowMap, RowIterator rightRows)
throws RepositoryException {
- List<Row> rows = new ArrayList<Row>();
- for (Row rightRow : new RowIterable(rightRows)) {
- for (String value : getRightValues(rightRow)) {
- List<Row> leftRows = leftRowMap.get(value);
- if (leftRows != null) {
- for (Row leftRow : leftRows) {
- rows.add(mergeRow(leftRow, rightRow));
+ if (leftRowMap.isEmpty()) {
+ List<Row> rows = new ArrayList<Row>();
+ for (Row rightRow : new RowIterable(rightRows)) {
+ for (String value : getRightValues(rightRow)) {
+ List<Row> leftRows = leftRowMap.get(value);
+ if (leftRows != null) {
+ for (Row leftRow : leftRows) {
+ rows.add(mergeRow(leftRow, rightRow));
+ }
+ } else {
+ rows.add(mergeRow(null, rightRow));
}
- } else {
- rows.add(mergeRow(null, rightRow));
}
}
+ return new RowIteratorAdapter(rows);
+ } else {
+ return new RowIteratorAdapter(rightRows) {
+ @Override
+ public Object next() {
+ return mergeRow(null, (Row) super.next());
+ }
+ };
}
- return new SimpleQueryResult(
- columnNames, selectorNames, new RowIteratorAdapter(rows));
}
/**
@@ -223,11 +239,11 @@ abstract class JoinMerger {
* @param left left row, possibly <code>null</code> in a right outer join
* @param right right row, possibly <code>null</code> in a left outer join
* @return joined row
- * @throws RepositoryException if the rows can't be joined
*/
- private Row mergeRow(Row left, Row right) throws RepositoryException {
+ private Row mergeRow(Row left, Row right) {
return new JoinRow(
- columns, evaluator, left, leftSelectors, right, rightSelectors);
+ columns, evaluator,
+ left, leftSelectors, right, rightSelectors);
}
public abstract Set<String> getLeftValues(Row row)