Remove tf() painless method (opensearch-project#9995) (opensearch-pro…

…ject#9999) (cherry picked from commit 0566926) Signed-off-by: Louis Chu <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
gashutos · Sep 12, 2023 · 2166b47 · 2166b47
1 parent 6f0ffd3
commit 2166b47
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 34 deletions.
diff --git a/...les/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.score.txt b/...les/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.score.txt
@@ -24,7 +24,6 @@ class org.opensearch.script.ScoreScript @no_import {
 
 static_import {
     int termFreq(org.opensearch.script.ScoreScript, String, String) bound_to org.opensearch.script.ScoreScriptUtils$TermFreq
-    float tf(org.opensearch.script.ScoreScript, String, String) bound_to org.opensearch.script.ScoreScriptUtils$TF
     long totalTermFreq(org.opensearch.script.ScoreScript, String, String) bound_to org.opensearch.script.ScoreScriptUtils$TotalTermFreq
     long sumTotalTermFreq(org.opensearch.script.ScoreScript, String) bound_to org.opensearch.script.ScoreScriptUtils$SumTotalTermFreq
     double saturation(double, double) from_class org.opensearch.script.ScoreScriptUtils

diff --git a/.../src/main/java/org/opensearch/index/query/functionscore/TermFrequencyFunctionFactory.java b/.../src/main/java/org/opensearch/index/query/functionscore/TermFrequencyFunctionFactory.java
@@ -11,7 +11,6 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.queries.function.FunctionValues;
 import org.apache.lucene.queries.function.valuesource.SumTotalTermFreqValueSource;
-import org.apache.lucene.queries.function.valuesource.TFValueSource;
 import org.apache.lucene.queries.function.valuesource.TermFreqValueSource;
 import org.apache.lucene.queries.function.valuesource.TotalTermFreqValueSource;
 import org.apache.lucene.search.IndexSearcher;
@@ -42,15 +41,6 @@ public static TermFrequencyFunction createFunction(
                 TermFreqValueSource termFreqValueSource = new TermFreqValueSource(field, term, field, BytesRefs.toBytesRef(term));
                 FunctionValues functionValues = termFreqValueSource.getValues(null, readerContext);
                 return docId -> functionValues.intVal(docId);
-            case TF:
-                TFValueSource tfValueSource = new TFValueSource(field, term, field, BytesRefs.toBytesRef(term));
-                Map<Object, Object> tfContext = new HashMap<>() {
-                    {
-                        put("searcher", indexSearcher);
-                    }
-                };
-                functionValues = tfValueSource.getValues(tfContext, readerContext);
-                return docId -> functionValues.floatVal(docId);
             case TOTAL_TERM_FREQ:
                 TotalTermFreqValueSource totalTermFreqValueSource = new TotalTermFreqValueSource(
                     field,
@@ -78,7 +68,6 @@ public static TermFrequencyFunction createFunction(
      */
     public enum TermFrequencyFunctionName {
         TERM_FREQ("termFreq"),
-        TF("tf"),
         TOTAL_TERM_FREQ("totalTermFreq"),
         SUM_TOTAL_TERM_FREQ("sumTotalTermFreq");
 

diff --git a/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java b/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java
@@ -49,7 +49,6 @@
 import static org.opensearch.common.util.BitMixer.mix32;
 import static org.opensearch.index.query.functionscore.TermFrequencyFunctionFactory.TermFrequencyFunctionName.SUM_TOTAL_TERM_FREQ;
 import static org.opensearch.index.query.functionscore.TermFrequencyFunctionFactory.TermFrequencyFunctionName.TERM_FREQ;
-import static org.opensearch.index.query.functionscore.TermFrequencyFunctionFactory.TermFrequencyFunctionName.TF;
 import static org.opensearch.index.query.functionscore.TermFrequencyFunctionFactory.TermFrequencyFunctionName.TOTAL_TERM_FREQ;
 
 /**
@@ -94,27 +93,6 @@ public int termFreq(String field, String term) {
         }
     }
 
-    /**
-     * Calculates the term frequency-inverse document frequency (tf-idf) for a specific term within a field.
-     *
-     * @opensearch.internal
-     */
-    public static final class TF {
-        private final ScoreScript scoreScript;
-
-        public TF(ScoreScript scoreScript) {
-            this.scoreScript = scoreScript;
-        }
-
-        public float tf(String field, String term) {
-            try {
-                return (float) scoreScript.getTermFrequency(TF, field, term);
-            } catch (Exception e) {
-                throw ExceptionsHelper.convertToOpenSearchException(e);
-            }
-        }
-    }
-
     /**
      * Retrieves the total term frequency within a field for a specific term.
      *