honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix flaky usage tracking test (#51169) (#51179) 

We added tracking of index feature usage in #51031 but due to some copy
and paste errors the test fails on some seeds. This fixes those errors.
This commit is contained in:
Nik Everett 2020-01-17 16:53:13 -05:00 committed by GitHub
parent 9ce4d2b901
commit 977b53ab91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/oss/IndexFeatureSetUsage.java
View File

@ -6,6 +6,7 @@
package org.elasticsearch.xpack.oss; package org.elasticsearch.xpack.oss;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
@ -110,28 +111,28 @@ public class IndexFeatureSetUsage extends XPackFeatureSet.Usage {
* Return the set of used built-in char filters in the cluster. * Return the set of used built-in char filters in the cluster.
*/ */
public Set<String> getUsedBuiltInCharFilters() { public Set<String> getUsedBuiltInCharFilters() {
return usedCharFilters; return usedBuiltInCharFilters;
} }
/** /**
* Return the set of used built-in tokenizers in the cluster. * Return the set of used built-in tokenizers in the cluster.
*/ */
public Set<String> getUsedBuiltInTokenizers() { public Set<String> getUsedBuiltInTokenizers() {
return usedTokenizers; return usedBuiltInTokenizers;
} }
/** /**
* Return the set of used built-in token filters in the cluster. * Return the set of used built-in token filters in the cluster.
*/ */
public Set<String> getUsedBuiltInTokenFilters() { public Set<String> getUsedBuiltInTokenFilters() {
return usedTokenFilters; return usedBuiltInTokenFilters;
} }
/** /**
* Return the set of used built-in analyzers in the cluster. * Return the set of used built-in analyzers in the cluster.
*/ */
public Set<String> getUsedBuiltInAnalyzers() { public Set<String> getUsedBuiltInAnalyzers() {
return usedAnalyzers; return usedBuiltInAnalyzers;
} }
@Override @Override
@ -182,4 +183,9 @@ public class IndexFeatureSetUsage extends XPackFeatureSet.Usage {
usedAnalyzers, usedBuiltInCharFilters, usedBuiltInTokenizers, usedBuiltInTokenFilters, usedAnalyzers, usedBuiltInCharFilters, usedBuiltInTokenizers, usedBuiltInTokenFilters,
usedBuiltInAnalyzers); usedBuiltInAnalyzers);
} }
@Override
public String toString() {
return Strings.toString(this, true, true);
}
} }

10
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/oss/IndexFeatureSetUsageTests.java
View File

@ -116,7 +116,7 @@ public class IndexFeatureSetUsageTests extends AbstractWireSerializingTestCase<I
instance.getUsedBuiltInTokenizers(), instance.getUsedBuiltInTokenFilters(), instance.getUsedBuiltInTokenizers(), instance.getUsedBuiltInTokenFilters(),
instance.getUsedBuiltInAnalyzers()); instance.getUsedBuiltInAnalyzers());
case 4: case 4:
Set<String> analyzers = new HashSet<>(instance.getUsedAnalyzerTypes()); Set<String> analyzers = new HashSet<>(instance.getUsedAnalyzerTypes());
if (analyzers.add("english") == false) { if (analyzers.add("english") == false) {
analyzers.remove("english"); analyzers.remove("english");
} }
@ -125,7 +125,7 @@ public class IndexFeatureSetUsageTests extends AbstractWireSerializingTestCase<I
instance.getUsedBuiltInCharFilters(), instance.getUsedBuiltInTokenizers(), instance.getUsedBuiltInTokenFilters(), instance.getUsedBuiltInCharFilters(), instance.getUsedBuiltInTokenizers(), instance.getUsedBuiltInTokenFilters(),
instance.getUsedBuiltInAnalyzers()); instance.getUsedBuiltInAnalyzers());
case 5: case 5:
Set<String> builtInCharFilters = new HashSet<>(); Set<String> builtInCharFilters = new HashSet<>(instance.getUsedBuiltInCharFilters());
if (builtInCharFilters.add("html_strip") == false) { if (builtInCharFilters.add("html_strip") == false) {
builtInCharFilters.remove("html_strip"); builtInCharFilters.remove("html_strip");
} }
@ -135,7 +135,7 @@ public class IndexFeatureSetUsageTests extends AbstractWireSerializingTestCase<I
instance.getUsedBuiltInTokenizers(), instance.getUsedBuiltInTokenFilters(), instance.getUsedBuiltInTokenizers(), instance.getUsedBuiltInTokenFilters(),
instance.getUsedBuiltInAnalyzers()); instance.getUsedBuiltInAnalyzers());
case 6: case 6:
Set<String> builtInTokenizers = new HashSet<>(); Set<String> builtInTokenizers = new HashSet<>(instance.getUsedBuiltInTokenizers());
if (builtInTokenizers.add("keyword") == false) { if (builtInTokenizers.add("keyword") == false) {
builtInTokenizers.remove("keyword"); builtInTokenizers.remove("keyword");
} }
@ -144,7 +144,7 @@ public class IndexFeatureSetUsageTests extends AbstractWireSerializingTestCase<I
instance.getUsedBuiltInCharFilters(), builtInTokenizers, instance.getUsedBuiltInTokenFilters(), instance.getUsedBuiltInCharFilters(), builtInTokenizers, instance.getUsedBuiltInTokenFilters(),
instance.getUsedBuiltInAnalyzers()); instance.getUsedBuiltInAnalyzers());
case 7: case 7:
Set<String> builtInTokenFilters = new HashSet<>(); Set<String> builtInTokenFilters = new HashSet<>(instance.getUsedBuiltInTokenFilters());
if (builtInTokenFilters.add("trim") == false) { if (builtInTokenFilters.add("trim") == false) {
builtInTokenFilters.remove("trim"); builtInTokenFilters.remove("trim");
} }
@ -153,7 +153,7 @@ public class IndexFeatureSetUsageTests extends AbstractWireSerializingTestCase<I
instance.getUsedBuiltInCharFilters(), instance.getUsedBuiltInTokenizers(), builtInTokenFilters, instance.getUsedBuiltInCharFilters(), instance.getUsedBuiltInTokenizers(), builtInTokenFilters,
instance.getUsedBuiltInAnalyzers()); instance.getUsedBuiltInAnalyzers());
case 8: case 8:
Set<String> builtInAnalyzers = new HashSet<>(); Set<String> builtInAnalyzers = new HashSet<>(instance.getUsedBuiltInAnalyzers());
if (builtInAnalyzers.add("french") == false) { if (builtInAnalyzers.add("french") == false) {
builtInAnalyzers.remove("french"); builtInAnalyzers.remove("french");
} }