Skip to content

Commit 22099ba

Browse files
authored
[TEST] Restore copy_to, double and float randomized testing (elastic#120906)
Partial rollback of elastic#120859, these data types seem fine.
1 parent 0fabaf7 commit 22099ba

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/FieldType.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
import org.elasticsearch.logsdb.datageneration.datasource.DataSource;
1313
import org.elasticsearch.logsdb.datageneration.fields.leaf.ByteFieldDataGenerator;
14+
import org.elasticsearch.logsdb.datageneration.fields.leaf.DoubleFieldDataGenerator;
15+
import org.elasticsearch.logsdb.datageneration.fields.leaf.FloatFieldDataGenerator;
1416
import org.elasticsearch.logsdb.datageneration.fields.leaf.IntegerFieldDataGenerator;
1517
import org.elasticsearch.logsdb.datageneration.fields.leaf.KeywordFieldDataGenerator;
1618
import org.elasticsearch.logsdb.datageneration.fields.leaf.LongFieldDataGenerator;
@@ -26,7 +28,9 @@ public enum FieldType {
2628
UNSIGNED_LONG("unsigned_long"),
2729
INTEGER("integer"),
2830
SHORT("short"),
29-
BYTE("byte");
31+
BYTE("byte"),
32+
DOUBLE("double"),
33+
FLOAT("float");
3034

3135
private final String name;
3236

@@ -42,6 +46,8 @@ public FieldDataGenerator generator(String fieldName, DataSource dataSource) {
4246
case INTEGER -> new IntegerFieldDataGenerator(fieldName, dataSource);
4347
case SHORT -> new ShortFieldDataGenerator(fieldName, dataSource);
4448
case BYTE -> new ByteFieldDataGenerator(fieldName, dataSource);
49+
case DOUBLE -> new DoubleFieldDataGenerator(fieldName, dataSource);
50+
case FLOAT -> new FloatFieldDataGenerator(fieldName, dataSource);
4551
};
4652
}
4753

test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ public DataSourceResponse.LeafMappingParametersGenerator handle(DataSourceReques
3232

3333
return new DataSourceResponse.LeafMappingParametersGenerator(switch (request.fieldType()) {
3434
case KEYWORD -> keywordMapping(request, map);
35-
case LONG, INTEGER, SHORT, BYTE, UNSIGNED_LONG -> plain(map);
36-
35+
case LONG, INTEGER, SHORT, BYTE, DOUBLE, FLOAT, UNSIGNED_LONG -> plain(map);
3736
});
3837
}
3938

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

6362
if (options.isEmpty() == false) {
64-
// TODO: re-enable once #120831 is resolved
65-
// injected.put("copy_to", ESTestCase.randomFrom(options));
63+
injected.put("copy_to", ESTestCase.randomFrom(options));
6664
}
6765
}
6866

0 commit comments

Comments
 (0)