From b6cef227a59800acceccbe61b417b8b4492e7bfc Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Mon, 29 Jul 2019 11:46:53 -0400
Subject: [PATCH] Geo: fix geo query decomposition (#44924)

The recent refactoring introduced an issue where queries where not
going through the decomposition processing.

Fixes #44891
---
 .../elasticsearch/index/query/VectorGeoShapeQueryProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/index/query/VectorGeoShapeQueryProcessor.java b/server/src/main/java/org/elasticsearch/index/query/VectorGeoShapeQueryProcessor.java
index 1012e2ec045..68772d0e4d2 100644
--- a/server/src/main/java/org/elasticsearch/index/query/VectorGeoShapeQueryProcessor.java
+++ b/server/src/main/java/org/elasticsearch/index/query/VectorGeoShapeQueryProcessor.java
@@ -66,7 +66,7 @@ public class VectorGeoShapeQueryProcessor implements AbstractGeometryFieldMapper
         if (processedShape == null) {
             return new MatchNoDocsQuery();
         }
-        return queryShape.visit(new ShapeVisitor(context, fieldName, relation));
+        return processedShape.visit(new ShapeVisitor(context, fieldName, relation));
     }
 
     private class ShapeVisitor implements GeometryVisitor<Query, RuntimeException> {