[dna-commits] DNA SVN: r1302 - trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize.
dna-commits at lists.jboss.org
dna-commits at lists.jboss.org
Wed Oct 21 13:29:08 EDT 2009
Author: rhauch
Date: 2009-10-21 13:29:08 -0400 (Wed, 21 Oct 2009)
New Revision: 1302
Added:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/AbstractMergeSelectNodes.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/MergeSetCriteria.java
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/RuleBasedOptimizer.java
Log:
Fixed merge conflicts
Added: trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/AbstractMergeSelectNodes.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/AbstractMergeSelectNodes.java (rev 0)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/AbstractMergeSelectNodes.java 2009-10-21 17:29:08 UTC (rev 1302)
@@ -0,0 +1,113 @@
+/*
+ * JBoss DNA (http://www.jboss.org/dna)
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * See the AUTHORS.txt file in the distribution for a full listing of
+ * individual contributors.
+ *
+ * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+ * is licensed to you under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * JBoss DNA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.graph.query.optimize;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import net.jcip.annotations.Immutable;
+import org.jboss.dna.graph.query.QueryContext;
+import org.jboss.dna.graph.query.model.Constraint;
+import org.jboss.dna.graph.query.model.SetCriteria;
+import org.jboss.dna.graph.query.plan.PlanNode;
+import org.jboss.dna.graph.query.plan.PlanNode.Property;
+import org.jboss.dna.graph.query.plan.PlanNode.Type;
+
+/**
+ * An {@link OptimizerRule optimizer rule} that merges SELECT nodes that have {@link SetCriteria} applied to the same column on
+ * the same selector.
+ *
+ * @param <SimilarityType> the type used to compare and identify similar nodes
+ * @param <ConstraintType> the concrete type of Constraint objects that are being merged
+ */
+ at Immutable
+public abstract class AbstractMergeSelectNodes<SimilarityType, ConstraintType extends Constraint> implements OptimizerRule {
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.graph.query.optimize.OptimizerRule#execute(org.jboss.dna.graph.query.QueryContext,
+ * org.jboss.dna.graph.query.plan.PlanNode, java.util.LinkedList)
+ */
+ @SuppressWarnings( "unchecked" )
+ public PlanNode execute( QueryContext context,
+ PlanNode plan,
+ LinkedList<OptimizerRule> ruleStack ) {
+ Map<SimilarityType, LinkedList<PlanNode>> mergeables = new HashMap<SimilarityType, LinkedList<PlanNode>>();
+ for (PlanNode source : plan.findAllAtOrBelow(Type.SOURCE)) {
+ // Walk up from the SOURCE and look for all SELECT nodes ...
+ PlanNode node = source.getParent();
+ while (node != null && node.is(Type.SELECT)) {
+ Constraint constraint = node.getProperty(Property.SELECT_CRITERIA, Constraint.class);
+ SimilarityType operand = getSimilarityKey(constraint);
+ if (operand != null) {
+ LinkedList<PlanNode> nodes = mergeables.get(operand);
+ if (nodes == null) {
+ nodes = new LinkedList<PlanNode>();
+ mergeables.put(operand, nodes);
+ }
+ nodes.addFirst(node); // So that the list is in the downward order they appear in the plan
+ }
+ node = node.getParent();
+ }
+
+ // Merge all mergeable SELECT nodes ...
+ for (LinkedList<PlanNode> mergeable : mergeables.values()) {
+ if (mergeable.size() > 1) {
+ Iterator<PlanNode> iter = mergeable.iterator();
+ PlanNode firstSelect = iter.next();
+ Constraint constraint = firstSelect.getProperty(Property.SELECT_CRITERIA, Constraint.class);
+ while (iter.hasNext()) {
+ PlanNode nextSelect = iter.next();
+ Constraint nextConstraint = nextSelect.getProperty(Property.SELECT_CRITERIA, Constraint.class);
+ constraint = merge((ConstraintType)constraint, (ConstraintType)nextConstraint);
+ nextSelect.extractFromParent();
+ }
+ firstSelect.setProperty(Property.SELECT_CRITERIA, constraint);
+ }
+ }
+ mergeables.clear();
+ }
+ return plan;
+ }
+
+ /**
+ * Obtain the similarity key that will be used to determine whether two SELECT nodes should be merged.
+ *
+ * @param constraint the constraint from the SELECT node
+ * @return the similarity key, or null if the constraint should not be merged
+ */
+ protected abstract SimilarityType getSimilarityKey( Constraint constraint );
+
+ /**
+ * Merge the two constraints.
+ *
+ * @param firstConstraint the first constraint
+ * @param secondConstraint the second constraint
+ * @return the merged constraint
+ */
+ protected abstract Constraint merge( ConstraintType firstConstraint,
+ ConstraintType secondConstraint );
+}
Property changes on: trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/AbstractMergeSelectNodes.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/MergeSetCriteria.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/MergeSetCriteria.java (rev 0)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/MergeSetCriteria.java 2009-10-21 17:29:08 UTC (rev 1302)
@@ -0,0 +1,89 @@
+/*
+ * JBoss DNA (http://www.jboss.org/dna)
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * See the AUTHORS.txt file in the distribution for a full listing of
+ * individual contributors.
+ *
+ * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+ * is licensed to you under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * JBoss DNA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.graph.query.optimize;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import net.jcip.annotations.Immutable;
+import org.jboss.dna.graph.query.model.Constraint;
+import org.jboss.dna.graph.query.model.DynamicOperand;
+import org.jboss.dna.graph.query.model.SetCriteria;
+import org.jboss.dna.graph.query.model.StaticOperand;
+
+/**
+ * An {@link OptimizerRule optimizer rule} that merges SELECT nodes that have {@link SetCriteria} applied to the same column on
+ * the same selector.
+ */
+ at Immutable
+public class MergeSetCriteria extends AbstractMergeSelectNodes<DynamicOperand, SetCriteria> {
+
+ public static final MergeSetCriteria INSTANCE = new MergeSetCriteria();
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.graph.query.optimize.AbstractMergeSelectNodes#getSimilarityKey(org.jboss.dna.graph.query.model.Constraint)
+ */
+ @Override
+ protected DynamicOperand getSimilarityKey( Constraint constraint ) {
+ if (constraint instanceof SetCriteria) {
+ // Look for the list of plan nodes for this operand ...
+ return ((SetCriteria)constraint).getLeftOperand();
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.dna.graph.query.optimize.AbstractMergeSelectNodes#merge(org.jboss.dna.graph.query.model.Constraint,
+ * org.jboss.dna.graph.query.model.Constraint)
+ */
+ @Override
+ protected Constraint merge( SetCriteria firstConstraint,
+ SetCriteria secondConstraint ) {
+ assert firstConstraint.getLeftOperand().equals(secondConstraint.getLeftOperand());
+ Set<StaticOperand> allOperands = new HashSet<StaticOperand>();
+ List<StaticOperand> orderedOperands = new ArrayList<StaticOperand>(firstConstraint.getRightOperands());
+ allOperands.addAll(firstConstraint.getRightOperands());
+ for (StaticOperand second : secondConstraint.getRightOperands()) {
+ if (allOperands.add(second)) {
+ orderedOperands.add(second);
+ }
+ }
+ return new SetCriteria(firstConstraint.getLeftOperand(), orderedOperands);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return getClass().getSimpleName();
+ }
+}
Property changes on: trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/MergeSetCriteria.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/RuleBasedOptimizer.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/RuleBasedOptimizer.java 2009-10-21 17:21:57 UTC (rev 1301)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/RuleBasedOptimizer.java 2009-10-21 17:29:08 UTC (rev 1302)
@@ -69,6 +69,7 @@
*/
protected void populateRuleStack( LinkedList<OptimizerRule> ruleStack,
PlanHints hints ) {
+ ruleStack.addFirst(MergeSetCriteria.INSTANCE);
if (hints.hasJoin) {
ruleStack.addFirst(ChooseJoinAlgorithm.USE_ONLY_NESTED_JOIN_ALGORITHM);
ruleStack.addFirst(RewriteIdentityJoins.INSTANCE);
More information about the dna-commits
mailing list