elastic · mikemccand · Nov 16, 2015 · Nov 16, 2015 · Nov 16, 2015
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 3.0.0-SNAPSHOT
-lucene            = 5.4.0-snapshot-1712973
+lucene            = 5.4.0-snapshot-1714615
 
 # optional dependencies
 spatial4j         = 0.5

diff --git a/core/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeQuery.java b/core/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeQuery.java
@@ -172,6 +172,16 @@ public boolean matches() throws IOException {
                         }
                         return false;
                     }
+
+                    @Override
+                    public float matchCost() {
+                        if (distanceBoundingCheck == GeoDistance.ALWAYS_INSTANCE) {
+                            return 0.0f;
+                        } else {
+                            // TODO: is this right (up to 4 comparisons from GeoDistance.SimpleDistanceBoundingCheck)?
+                            return 4.0f;
+                        }
+                    }
                 };
                 return new ConstantScoreScorer(this, score(), twoPhaseIterator);
             }

diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
@@ -31,7 +31,7 @@ grant codeBase "${codebase.securesm-1.0.jar}" {
 //// Very special jar permissions:
 //// These are dangerous permissions that we don't want to grant to everything.
 
-grant codeBase "${codebase.lucene-core-5.4.0-snapshot-1712973.jar}" {
+grant codeBase "${codebase.lucene-core-5.4.0-snapshot-1714615.jar}" {
   // needed to allow MMapDirectory's "unmap hack"
   permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";

diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
@@ -30,7 +30,7 @@ grant codeBase "${codebase.securemock-1.1.jar}" {
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
 
-grant codeBase "${codebase.lucene-test-framework-5.4.0-snapshot-1712973.jar}" {
+grant codeBase "${codebase.lucene-test-framework-5.4.0-snapshot-1714615.jar}" {
   // needed by RamUsageTester
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };

diff --git a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+95e58f09a8878e74f2cceba8aca898d7464782a8
diff --git a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+bf7600f7556e4cbdfb7b93947e0ef2312d4bfa6f
diff --git a/distribution/licenses/lucene-core-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-core-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-core-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-core-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+d8d3f55ea169ec7a483c076d8d786d2fa7ec0447
diff --git a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+a77cedd6e706317f2f3c1b693736ed191a30a488
diff --git a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+84d9d5617fae821a7cf1f0f5ac961f4128a936e9
diff --git a/distribution/licenses/lucene-join-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-join-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-join-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-join-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+9e7646fb8cfbb72e061eba83467a05671cfa5ee1
diff --git a/distribution/licenses/lucene-memory-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-memory-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-memory-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-memory-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+068417b06ee7adf7f751bbeabdb2ed14e5ef3172
diff --git a/distribution/licenses/lucene-misc-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-misc-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-misc-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-misc-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+f12de7f380e1f40b9432c90a2bb0b9ba67e94c41
diff --git a/distribution/licenses/lucene-queries-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-queries-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-queries-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-queries-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+8313aa54e3d13e40bf7bf32b6ee68c7c4b547d6a
diff --git a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+62696f81612a2594c5eac93c9db57c108d3e951a
diff --git a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+a506a09e97070b74c226627ab8adcde9f32576ef
diff --git a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+22924c220508d02a30e9425f6293fcff1621a23a
diff --git a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+af3be612c990303f6c575411b436c967f665876c
diff --git a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1712973.jar.sha1 b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1712973.jar.sha1
diff --git a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1714615.jar.sha1 b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+c797cf414ac18868e804afe6be65c30046a5d2dc
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1712973.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1712973.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1714615.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+392aa5769188f7290628f4e2740ddad830d19069
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1712973.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1712973.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1714615.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+b08b3182b931cb22c41e5535bc47acb6f6bf67df
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1712973.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1712973.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1714615.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+1952d76f8f0d339f7f6c3500f61954696f08d743
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1712973.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1712973.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1714615.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+f27b8e582861492f3743b90094fdd28286ddb270
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1712973.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1712973.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1714615.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+3c39cf9826697f1558d999a52f4b0faf526950e4
diff --git a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1712973.jar.sha1 b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1712973.jar.sha1
diff --git a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1714615.jar.sha1 b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1714615.jar.sha1
@@ -0,0 +1 @@
+1a4ece7c891f99b5a61b72dbe86f69ce26fc18ad