Hi I noticed that the function 'func' in MaxFloatFunction.java could be refactored a little, so that the if statement is only evaluated once.Should make it run a little faster over large arrays.
Please share your thoughts on the change I have attached a patch file. Many thanks
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java index 9f998fd..f2190fa 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java @@ -1,50 +1,52 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; /** * <code>MaxFloatFunction</code> returns the max of it's components. */ public class MaxFloatFunction extends MultiFloatFunction { public MaxFloatFunction(ValueSource[] sources) { super(sources); } @Override protected String name() { return "max"; } @Override protected float func(int doc, FunctionValues[] valsArr) { - boolean first = true; - float val = 0.0f; + float val = initialValue(valsArr); for (FunctionValues vals : valsArr) { - if (first) { - first = false; - val = vals.floatVal(doc); - } else { val = Math.max(vals.floatVal(doc),val); } - } return val; } + + private float initialValue(FunctionValues[] valsArr){ + if(valsArr.length == 0){ + return 0.0f; + } + return valsArr[0].floatVal(doc); + } + }
--------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
