|
65 | 65 | import java.util.function.UnaryOperator;
|
66 | 66 |
|
67 | 67 | import static org.opensearch.Version.V_2_7_0;
|
68 |
| -import static org.opensearch.common.util.FeatureFlags.DOC_ID_FUZZY_SET_SETTING; |
69 | 68 | import static org.opensearch.common.util.FeatureFlags.SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY;
|
70 | 69 | import static org.opensearch.index.codec.fuzzy.FuzzySetParameters.DEFAULT_FALSE_POSITIVE_PROBABILITY;
|
71 | 70 | import static org.opensearch.index.mapper.MapperService.INDEX_MAPPING_DEPTH_LIMIT_SETTING;
|
@@ -969,11 +968,8 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
|
969 | 968 | */
|
970 | 969 | widenIndexSortType = IndexMetadata.SETTING_INDEX_VERSION_CREATED.get(settings).before(V_2_7_0);
|
971 | 970 |
|
972 |
| - boolean isOptimizeDocIdLookupUsingFuzzySetFeatureEnabled = FeatureFlags.isEnabled(DOC_ID_FUZZY_SET_SETTING); |
973 |
| - if (isOptimizeDocIdLookupUsingFuzzySetFeatureEnabled) { |
974 |
| - enableFuzzySetForDocId = scopedSettings.get(INDEX_DOC_ID_FUZZY_SET_ENABLED_SETTING); |
975 |
| - docIdFuzzySetFalsePositiveProbability = scopedSettings.get(INDEX_DOC_ID_FUZZY_SET_FALSE_POSITIVE_PROBABILITY_SETTING); |
976 |
| - } |
| 971 | + setEnableFuzzySetForDocId(scopedSettings.get(INDEX_DOC_ID_FUZZY_SET_ENABLED_SETTING)); |
| 972 | + setDocIdFuzzySetFalsePositiveProbability(scopedSettings.get(INDEX_DOC_ID_FUZZY_SET_FALSE_POSITIVE_PROBABILITY_SETTING)); |
977 | 973 |
|
978 | 974 | scopedSettings.addSettingsUpdateConsumer(
|
979 | 975 | TieredMergePolicyProvider.INDEX_COMPOUND_FORMAT_SETTING,
|
@@ -1873,30 +1869,14 @@ public boolean isEnableFuzzySetForDocId() {
|
1873 | 1869 | }
|
1874 | 1870 |
|
1875 | 1871 | public void setEnableFuzzySetForDocId(boolean enableFuzzySetForDocId) {
|
1876 |
| - verifyFeatureToSetDocIdFuzzySetSetting(enabled -> this.enableFuzzySetForDocId = enabled, enableFuzzySetForDocId); |
| 1872 | + this.enableFuzzySetForDocId = enableFuzzySetForDocId; |
1877 | 1873 | }
|
1878 | 1874 |
|
1879 | 1875 | public double getDocIdFuzzySetFalsePositiveProbability() {
|
1880 | 1876 | return docIdFuzzySetFalsePositiveProbability;
|
1881 | 1877 | }
|
1882 | 1878 |
|
1883 | 1879 | public void setDocIdFuzzySetFalsePositiveProbability(double docIdFuzzySetFalsePositiveProbability) {
|
1884 |
| - verifyFeatureToSetDocIdFuzzySetSetting( |
1885 |
| - fpp -> this.docIdFuzzySetFalsePositiveProbability = fpp, |
1886 |
| - docIdFuzzySetFalsePositiveProbability |
1887 |
| - ); |
1888 |
| - } |
1889 |
| - |
1890 |
| - private static <T> void verifyFeatureToSetDocIdFuzzySetSetting(Consumer<T> settingUpdater, T val) { |
1891 |
| - if (FeatureFlags.isEnabled(DOC_ID_FUZZY_SET_SETTING)) { |
1892 |
| - settingUpdater.accept(val); |
1893 |
| - } else { |
1894 |
| - throw new IllegalArgumentException( |
1895 |
| - "Fuzzy set for optimizing doc id lookup " |
1896 |
| - + "cannot be enabled with feature flag [" |
1897 |
| - + FeatureFlags.DOC_ID_FUZZY_SET |
1898 |
| - + "] set to false" |
1899 |
| - ); |
1900 |
| - } |
| 1880 | + this.docIdFuzzySetFalsePositiveProbability = docIdFuzzySetFalsePositiveProbability; |
1901 | 1881 | }
|
1902 | 1882 | }
|
0 commit comments