You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@lucene.apache.org by GitBox <gi...@apache.org> on 2020/06/30 21:32:03 UTC
[GitHub] [lucene-solr] mikemccand commented on a change in pull request #1613: LUCENE-8574 Cache ExpressionFunctionValues
mikemccand commented on a change in pull request #1613:
URL: https://github.com/apache/lucene-solr/pull/1613#discussion_r447986202
##########
File path: lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java
##########
@@ -128,6 +128,34 @@ public void testDoubleValuesSourceEquals() throws Exception {
assertFalse(vs1.equals(vs4));
}
+ public void testFibonacciExpr() throws Exception {
+ int n = 40;
+ SimpleBindings bindings = new SimpleBindings();
+ bindings.add("f0", DoubleValuesSource.constant(0));
+ bindings.add("f1", DoubleValuesSource.constant(1));
+ for (int i = 2; i < n + 1; i++) {
Review comment:
Maybe adds comments to explain that before the fix, this test takes XXX hours to finish, and after the fix it's nearly instantaneous as judged by casual human observer?
##########
File path: lucene/expressions/src/java/org/apache/lucene/expressions/CachingExpressionValueSource.java
##########
@@ -0,0 +1,70 @@
+/*
+ * 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.expressions;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.DoubleValues;
+import org.apache.lucene.search.DoubleValuesSource;
+
+final class CachingExpressionValueSource extends ExpressionValueSource {
Review comment:
Maybe add some javadocs explaining why this is needed, and explain that the cache is only per-hit?
##########
File path: lucene/expressions/src/java/org/apache/lucene/expressions/CachingExpressionValueSource.java
##########
@@ -0,0 +1,70 @@
+/*
+ * 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.expressions;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.DoubleValues;
+import org.apache.lucene.search.DoubleValuesSource;
+
+final class CachingExpressionValueSource extends ExpressionValueSource {
+
+ CachingExpressionValueSource(Bindings bindings, Expression expression) {
+ super(bindings, expression);
+ }
+
+ CachingExpressionValueSource(DoubleValuesSource[] variables, Expression expression, boolean needsScores) {
+ super(variables, expression, needsScores);
+ }
+
+ public CachingExpressionValueSource(ExpressionValueSource expressionValueSource) {
+ super(expressionValueSource.variables, expressionValueSource.expression, expressionValueSource.needsScores);
+ }
+
+ @Override
+ public DoubleValues getValues(LeafReaderContext readerContext, DoubleValues scores) throws IOException {
+ return getValuesWithCache(readerContext, scores, new HashMap<>());
+ }
+
+ public DoubleValues getValuesWithCache(LeafReaderContext readerContext, DoubleValues scores,
+ Map<String, DoubleValues> valuesCache) throws IOException {
+ DoubleValues[] externalValues = new DoubleValues[expression.variables.length];
+
+ for (int i = 0; i < variables.length; ++i) {
+ String externalName = expression.variables[i];
+ DoubleValues values = valuesCache.get(externalName);
+ if (values == null) {
+ if (variables[i] instanceof CachingExpressionValueSource) {
+ values = ((CachingExpressionValueSource)variables[i]).getValuesWithCache(readerContext, scores, valuesCache);
Review comment:
Add space between the cast and `variables[i]`?
##########
File path: lucene/expressions/src/java/org/apache/lucene/expressions/CachingExpressionValueSource.java
##########
@@ -0,0 +1,70 @@
+/*
+ * 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.expressions;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.DoubleValues;
+import org.apache.lucene.search.DoubleValuesSource;
+
+final class CachingExpressionValueSource extends ExpressionValueSource {
+
+ CachingExpressionValueSource(Bindings bindings, Expression expression) {
+ super(bindings, expression);
+ }
+
+ CachingExpressionValueSource(DoubleValuesSource[] variables, Expression expression, boolean needsScores) {
+ super(variables, expression, needsScores);
+ }
+
+ public CachingExpressionValueSource(ExpressionValueSource expressionValueSource) {
+ super(expressionValueSource.variables, expressionValueSource.expression, expressionValueSource.needsScores);
+ }
+
+ @Override
+ public DoubleValues getValues(LeafReaderContext readerContext, DoubleValues scores) throws IOException {
+ return getValuesWithCache(readerContext, scores, new HashMap<>());
+ }
+
+ public DoubleValues getValuesWithCache(LeafReaderContext readerContext, DoubleValues scores,
Review comment:
Can this be `private`?
##########
File path: lucene/expressions/src/java/org/apache/lucene/expressions/CachingExpressionValueSource.java
##########
@@ -0,0 +1,70 @@
+/*
+ * 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.expressions;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.DoubleValues;
+import org.apache.lucene.search.DoubleValuesSource;
+
+final class CachingExpressionValueSource extends ExpressionValueSource {
+
+ CachingExpressionValueSource(Bindings bindings, Expression expression) {
+ super(bindings, expression);
+ }
+
+ CachingExpressionValueSource(DoubleValuesSource[] variables, Expression expression, boolean needsScores) {
+ super(variables, expression, needsScores);
+ }
+
+ public CachingExpressionValueSource(ExpressionValueSource expressionValueSource) {
+ super(expressionValueSource.variables, expressionValueSource.expression, expressionValueSource.needsScores);
+ }
+
+ @Override
+ public DoubleValues getValues(LeafReaderContext readerContext, DoubleValues scores) throws IOException {
+ return getValuesWithCache(readerContext, scores, new HashMap<>());
+ }
+
+ public DoubleValues getValuesWithCache(LeafReaderContext readerContext, DoubleValues scores,
+ Map<String, DoubleValues> valuesCache) throws IOException {
+ DoubleValues[] externalValues = new DoubleValues[expression.variables.length];
+
+ for (int i = 0; i < variables.length; ++i) {
+ String externalName = expression.variables[i];
+ DoubleValues values = valuesCache.get(externalName);
+ if (values == null) {
+ if (variables[i] instanceof CachingExpressionValueSource) {
+ values = ((CachingExpressionValueSource)variables[i]).getValuesWithCache(readerContext, scores, valuesCache);
+ } else {
+ values = variables[i].getValues(readerContext, scores);
+ }
+ if (values == null) {
+ throw new RuntimeException("Internal error. External (" + externalName + ") does not exist.");
Review comment:
Hmm when does this happen? Is it if the expression references a dependent variable that was not bound? Can we change the message to something like: `Unrecognized variable XXX referenced in expression YYY`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org