iter

Author: lkts

server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java

@@ -194,9 +194,7 @@ protected BlockLoader blockLoaderFromSource(BlockLoaderContext blContext) {
         protected abstract Object nullValueAsSource(T nullValue);
 
         protected BlockLoader blockLoaderFromFallbackSyntheticSource(BlockLoaderContext blContext) {
-            Function<List<T>, List<Object>> formatter = getFormatter(GeometryFormatterFactory.WKB);
-
-            return new FallbackSyntheticSourceBlockLoader(new GeometriesFallbackSyntheticSourceReader(geometryParser, formatter), name()) {
+            return new FallbackSyntheticSourceBlockLoader(new GeometriesFallbackSyntheticSourceReader(), name()) {
                 @Override
                 public Builder builder(BlockFactory factory, int expectedCount) {
                     return factory.bytesRefs(expectedCount);
@@ -205,12 +203,10 @@ public Builder builder(BlockFactory factory, int expectedCount) {
         }
 
         private class GeometriesFallbackSyntheticSourceReader implements FallbackSyntheticSourceBlockLoader.Reader<BytesRef> {
-            private final Parser<T> geometryParser;
             private final Function<List<T>, List<Object>> formatter;
 
-            private GeometriesFallbackSyntheticSourceReader(Parser<T> geometryParser, Function<List<T>, List<Object>> formatter) {
-                this.geometryParser = geometryParser;
-                this.formatter = formatter;
+            private GeometriesFallbackSyntheticSourceReader() {
+                this.formatter = getFormatter(GeometryFormatterFactory.WKB);
             }
 
             @Override

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

@@ -15,6 +15,7 @@ public class DefaultFieldDataGeneratorHandler implements DataSourceHandler {
     public DataSourceResponse.FieldDataGenerator handle(DataSourceRequest.FieldDataGenerator request) {
         var fieldType = FieldType.tryParse(request.fieldType());
         if (fieldType == null) {
+            // This is a custom field type
             return null;
         }
 

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/qa/DataGenerationHelper.java

@@ -76,7 +76,6 @@ public DataGenerationHelper(Consumer<DataGeneratorSpecification.Builder> builder
                     )
                 )
             )
-            // "shape" and "geo_shape" are very similar so we'll use only one of them
             .withDataSourceHandlers(List.of(new GeoShapeDataSourceHandler(), new ShapeDataSourceHandler()))
             .withDataSourceHandlers(List.of(new DataSourceHandler() {
                 @Override
@@ -87,16 +86,18 @@ public DataSourceResponse.FieldTypeGenerator handle(DataSourceRequest.FieldTypeG
 
                         @Override
                         public DataSourceResponse.FieldTypeGenerator.FieldTypeInfo get() {
+                            // Base set of field types
                             var options = Arrays.stream(FieldType.values()).map(FieldType::toString).collect(Collectors.toSet());
                             // Custom types coming from specific functionality modules
+
                             if (shapesGenerated < 5) {
                                 options.add("geo_shape");
                                 options.add("shape");
                             }
 
                             var randomChoice = ESTestCase.randomFrom(options);
                             if (randomChoice.equals("geo_shape") || randomChoice.equals("shape")) {
-                                shapesGenerated++;
+                                shapesGenerated += 1;
                             }
 
                             return new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(ESTestCase.randomFrom(options));

x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/GeoShapeFieldDataGenerator.java

@@ -43,7 +43,8 @@ public GeoShapeFieldDataGenerator(DataSource dataSource) {
     @Override
     public Object generateValue(Map<String, Object> fieldMapping) {
         if (fieldMapping == null) {
-            // ???
+            // dynamically mapped and dynamic mapping does not play well with this type (it gets mapped as an object)
+            // return null to skip indexing this field
             return null;
         }
 

x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/datageneration/ShapeFieldDataGenerator.java

@@ -43,7 +43,8 @@ public ShapeFieldDataGenerator(DataSource dataSource) {
     @Override
     public Object generateValue(Map<String, Object> fieldMapping) {
         if (fieldMapping == null) {
-            // ???
+            // dynamically mapped and dynamic mapping does not play well with this type (it gets mapped as an object)
+            // return null to skip indexing this field
             return null;
         }