Skip to content

Commit a0bf253

Browse files
committed
upgrade lucene 5.4 snapshot
1 parent 9d7ca53 commit a0bf253

24 files changed

+13
-23
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 3.0.0-SNAPSHOT
2-
lucene = 5.4.0-snapshot-1712973
2+
lucene = 5.4.0-snapshot-1714615
33

44
# optional dependencies
55
spatial4j = 0.5

core/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeQuery.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,16 @@ public boolean matches() throws IOException {
172172
}
173173
return false;
174174
}
175+
176+
@Override
177+
public float matchCost() {
178+
if (distanceBoundingCheck == GeoDistance.ALWAYS_INSTANCE) {
179+
return 0.0f;
180+
} else {
181+
// TODO: is this right (up to 4 comparisons from GeoDistance.SimpleDistanceBoundingCheck)?
182+
return 4.0f;
183+
}
184+
}
175185
};
176186
return new ConstantScoreScorer(this, score(), twoPhaseIterator);
177187
}

core/src/main/resources/org/elasticsearch/bootstrap/security.policy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ grant codeBase "${codebase.securesm-1.0.jar}" {
3131
//// Very special jar permissions:
3232
//// These are dangerous permissions that we don't want to grant to everything.
3333

34-
grant codeBase "${codebase.lucene-core-5.4.0-snapshot-1712973.jar}" {
34+
grant codeBase "${codebase.lucene-core-5.4.0-snapshot-1714615.jar}" {
3535
// needed to allow MMapDirectory's "unmap hack"
3636
permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
3737
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";

core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ grant codeBase "${codebase.securemock-1.1.jar}" {
3030
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
3131
};
3232

33-
grant codeBase "${codebase.lucene-test-framework-5.4.0-snapshot-1712973.jar}" {
33+
grant codeBase "${codebase.lucene-test-framework-5.4.0-snapshot-1714615.jar}" {
3434
// needed by RamUsageTester
3535
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
3636
};

distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-core-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-grouping-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-highlighter-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-join-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-memory-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-misc-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-queries-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-queryparser-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-sandbox-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-spatial-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

distribution/licenses/lucene-suggest-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1712973.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)