You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2004/11/29 19:46:51 UTC

cvs commit: jakarta-slide/src/share/org/apache/slide/search/basic/expression GenericBasicExpression.java MergeExpression.java

luetzkendorf    2004/11/29 10:46:51

  Modified:    src/share/org/apache/slide/search/basic/expression
                        GenericBasicExpression.java MergeExpression.java
  Log:
  added setRequestedResourcePool method to allow optimization in and expressions
  
  Revision  Changes    Path
  1.5       +6 -3      jakarta-slide/src/share/org/apache/slide/search/basic/expression/GenericBasicExpression.java
  
  Index: GenericBasicExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/expression/GenericBasicExpression.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GenericBasicExpression.java	28 Jul 2004 09:34:50 -0000	1.4
  +++ GenericBasicExpression.java	29 Nov 2004 18:46:51 -0000	1.5
  @@ -24,6 +24,7 @@
   package org.apache.slide.search.basic.expression;
   
   import org.apache.slide.search.InvalidQueryException;
  +import org.apache.slide.search.basic.ComparableResourcesPool;
   import org.jdom.Element;
   
   /**
  @@ -42,6 +43,8 @@
       protected GenericBasicExpression (Element e) throws InvalidQueryException{
           super (e);
       }
  +    
  +    public abstract void setRequestedResourcePool(ComparableResourcesPool pool);
               
   }
   
  
  
  
  1.7       +15 -4     jakarta-slide/src/share/org/apache/slide/search/basic/expression/MergeExpression.java
  
  Index: MergeExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/expression/MergeExpression.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MergeExpression.java	28 Jul 2004 09:34:50 -0000	1.6
  +++ MergeExpression.java	29 Nov 2004 18:46:51 -0000	1.7
  @@ -28,6 +28,7 @@
   
   import org.apache.slide.search.InvalidQueryException;
   import org.apache.slide.search.SearchException;
  +import org.apache.slide.search.basic.ComparableResourcesPool;
   import org.apache.slide.search.basic.IBasicExpression;
   import org.apache.slide.search.basic.IBasicResultSet;
   import org.jdom.Element;
  @@ -114,6 +115,16 @@
        */
       private static String getMustHaveMergeExpressionsMessage(String operationName) {
           return "<" + operationName + "> must have at least on nested expression.";
  +    }
  +    
  +    
  +    public void setRequestedResourcePool(ComparableResourcesPool pool) {
  +    	for(Iterator i = this.expressionsToMerge.iterator(); i.hasNext();) {
  +    		Object o = i.next();
  +    		if (o instanceof GenericBasicExpression) {
  +    			((GenericBasicExpression)o).setRequestedResourcePool(pool);
  +    		}
  +    	}
       }
   }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org