Guard for adding null value tags to vector tiles (#87051) (#87056)

This commit adds a guard so tags with null values are ignored.
elastic · May 23, 2022 · 753c028 · 753c028
1 parent e18fae6
commit 753c028
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/docs/changelog/87051.yaml b/docs/changelog/87051.yaml
@@ -0,0 +1,5 @@
+pr: 87051
+summary: Guard for adding null value tags to vector tiles
+area: Geo
+type: bug
+issues: []
diff --git a/...ector-tile/src/javaRestTest/java/org/elasticsearch/xpack/vectortile/VectorTileRestIT.java b/...ector-tile/src/javaRestTest/java/org/elasticsearch/xpack/vectortile/VectorTileRestIT.java
@@ -120,6 +120,10 @@ private void createIndexAndPutGeometry(String indexName, Geometry geometry, Stri
                 },
                 "name": {
                   "type": "keyword"
+                },
+                "ignore_value": {
+                  "type": "double",
+                  "ignore_malformed" : true
                 }
               }
             }""");
@@ -129,7 +133,7 @@ private void createIndexAndPutGeometry(String indexName, Geometry geometry, Stri
         final Request putRequest = new Request(HttpPost.METHOD_NAME, indexName + "/_doc/" + id);
         putRequest.setJsonEntity("""
             {
-              "location": "%s", "name": "geometry", "value1": %s, "value2": %s, "nullField" : null
+              "location": "%s", "name": "geometry", "value1": %s, "value2": %s, "nullField" : null, "ignore_value" : ""
             }""".formatted(WellKnownText.toWKT(geometry), 1, 2));
         response = client().performRequest(putRequest);
         assertThat(response.getStatusLine().getStatusCode(), Matchers.equalTo(HttpStatus.SC_CREATED));
@@ -653,6 +657,16 @@ public void testWithNullFields() throws Exception {
         assertLayer(tile, META_LAYER, 4096, 1, 13);
     }
 
+    public void testWithIgnoreMalformedValueFields() throws Exception {
+        final Request mvtRequest = new Request(getHttpMethod(), INDEX_POLYGON + "/_mvt/location/" + z + "/" + x + "/" + y);
+        mvtRequest.setJsonEntity("{\"fields\": [ \"ignore_value\"] }");
+        final VectorTile.Tile tile = execute(mvtRequest);
+        assertThat(tile.getLayersCount(), Matchers.equalTo(3));
+        assertLayer(tile, HITS_LAYER, 4096, 1, 2);
+        assertLayer(tile, AGGS_LAYER, 4096, 256 * 256, 2);
+        assertLayer(tile, META_LAYER, 4096, 1, 13);
+    }
+
     public void testWithFieldsWildCard() throws Exception {
         final Request mvtRequest = new Request(getHttpMethod(), INDEX_POLYGON + "/_mvt/location/" + z + "/" + x + "/" + y);
         mvtRequest.setJsonEntity("{\"fields\": [\"*\"] }");

diff --git a/...in/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/rest/VectorTileUtils.java b/...in/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/rest/VectorTileUtils.java
@@ -60,6 +60,10 @@ public static void addToXContentToFeature(VectorTile.Tile.Feature.Builder featur
      * Adds the provided key / value pair into the feature as tags.
      */
     public static void addPropertyToFeature(VectorTile.Tile.Feature.Builder feature, MvtLayerProps layerProps, String key, Object value) {
+        if (value == null) {
+            // guard for null values
+            return;
+        }
         feature.addTags(layerProps.addKey(key));
         feature.addTags(layerProps.addValue(value));
     }