Skip to content

[8.x] [TEST] Restore copy_to, double and float randomized testing (#120906) #120922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elasticsearchmachine merged 2 commits into from
Jan 27, 2025
Merged

[8.x] [TEST] Restore copy_to, double and float randomized testing (#120906) #120922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c2047c
[TEST] Restore copy_to, double and float randomized testing (#120906)
kkrik-es Jan 27, 2025
d1dbb4a
Merge branch '8.x' into backport/8.x/pr-120906
kkrik-es Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

import org.elasticsearch.logsdb.datageneration.datasource.DataSource;
import org.elasticsearch.logsdb.datageneration.fields.leaf.ByteFieldDataGenerator;
import org.elasticsearch.logsdb.datageneration.fields.leaf.DoubleFieldDataGenerator;
import org.elasticsearch.logsdb.datageneration.fields.leaf.FloatFieldDataGenerator;
import org.elasticsearch.logsdb.datageneration.fields.leaf.IntegerFieldDataGenerator;
import org.elasticsearch.logsdb.datageneration.fields.leaf.KeywordFieldDataGenerator;
import org.elasticsearch.logsdb.datageneration.fields.leaf.LongFieldDataGenerator;
Expand All @@ -26,7 +28,9 @@ public enum FieldType {
UNSIGNED_LONG("unsigned_long"),
INTEGER("integer"),
SHORT("short"),
BYTE("byte");
BYTE("byte"),
DOUBLE("double"),
FLOAT("float");

private final String name;

Expand All @@ -42,6 +46,8 @@ public FieldDataGenerator generator(String fieldName, DataSource dataSource) {
case INTEGER -> new IntegerFieldDataGenerator(fieldName, dataSource);
case SHORT -> new ShortFieldDataGenerator(fieldName, dataSource);
case BYTE -> new ByteFieldDataGenerator(fieldName, dataSource);
case DOUBLE -> new DoubleFieldDataGenerator(fieldName, dataSource);
case FLOAT -> new FloatFieldDataGenerator(fieldName, dataSource);
};
}

Expand Down
6 changes: 2 additions & 4 deletions ...a/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ public DataSourceResponse.LeafMappingParametersGenerator handle(DataSourceReques

return new DataSourceResponse.LeafMappingParametersGenerator(switch (request.fieldType()) {
case KEYWORD -> keywordMapping(request, map);
case LONG, INTEGER, SHORT, BYTE, UNSIGNED_LONG -> plain(map);

case LONG, INTEGER, SHORT, BYTE, DOUBLE, FLOAT, UNSIGNED_LONG -> plain(map);
});
}

Expand Down Expand Up @@ -61,8 +60,7 @@ private Supplier<Map<String, Object>> keywordMapping(
.collect(Collectors.toSet());

if (options.isEmpty() == false) {
// TODO: re-enable once #120831 is resolved
// injected.put("copy_to", ESTestCase.randomFrom(options));
injected.put("copy_to", ESTestCase.randomFrom(options));
}
}

Expand Down