Upgrade to lucene-5.4-snapshot-1708254.
This commit is contained in:
Adrien Grand
parent
56834e3c38
commit
5ae810991c
|
|
@ -453,7 +453,7 @@ public long ramBytesUsed() {
|
|||
@Override
|
||||
public void build(InputIterator iterator) throws IOException {
|
||||
String prefix = getClass().getSimpleName();
|
||||
Path directory = OfflineSorter.defaultTempDir();
|
||||
Path directory = OfflineSorter.getDefaultTempDir();
|
||||
Path tempInput = Files.createTempFile(directory, prefix, ".input");
|
||||
Path tempSorted = Files.createTempFile(directory, prefix, ".sorted");
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ package org.elasticsearch.index.query;
|
|||
import org.apache.lucene.search.BooleanClause;
|
||||
import org.apache.lucene.search.BooleanQuery;
|
||||
import org.apache.lucene.search.ConstantScoreQuery;
|
||||
import org.apache.lucene.search.Filter;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.spatial.prefix.PrefixTreeStrategy;
|
||||
import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
|
||||
|
|
@ -294,12 +293,12 @@ public class GeoShapeQueryBuilder extends AbstractQueryBuilder<GeoShapeQueryBuil
|
|||
// in this case, execute disjoint as exists && !intersects
|
||||
BooleanQuery.Builder bool = new BooleanQuery.Builder();
|
||||
Query exists = ExistsQueryBuilder.newFilter(context, fieldName);
|
||||
Filter intersects = strategy.makeFilter(getArgs(shape, ShapeRelation.INTERSECTS));
|
||||
Query intersects = strategy.makeQuery(getArgs(shape, ShapeRelation.INTERSECTS));
|
||||
bool.add(exists, BooleanClause.Occur.MUST);
|
||||
bool.add(intersects, BooleanClause.Occur.MUST_NOT);
|
||||
query = new ConstantScoreQuery(bool.build());
|
||||
} else {
|
||||
query = strategy.makeQuery(getArgs(shape, relation));
|
||||
query = new ConstantScoreQuery(strategy.makeQuery(getArgs(shape, relation)));
|
||||
}
|
||||
return query;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -584,7 +584,7 @@ public class GeoFilterIT extends ESIntegTestCase {
|
|||
RecursivePrefixTreeStrategy strategy = new RecursivePrefixTreeStrategy(tree, "area");
|
||||
Shape shape = SpatialContext.GEO.makePoint(0, 0);
|
||||
SpatialArgs args = new SpatialArgs(relation, shape);
|
||||
strategy.makeFilter(args);
|
||||
strategy.makeQuery(args);
|
||||
return true;
|
||||
} catch (UnsupportedSpatialOperation e) {
|
||||
e.printStackTrace();
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
5792c4b38aa2cf1f66c9dea8bf139907e33fa018
|
||||
|
|
@ -0,0 +1 @@
|
|||
16aa0bdb66b7471e9a26f78a9a5701f678a905db
|
||||
|
|
@ -1 +0,0 @@
|
|||
cd6fa25bc29718d8c964b0734fc9a009547453db
|
||||
|
|
@ -0,0 +1 @@
|
|||
7f16ec8294a09118237817d8c9c03b87cec67e29
|
||||
|
|
@ -1 +0,0 @@
|
|||
e4e0076ce4331309d1270a9c5b2edb51915fe32a
|
||||
|
|
@ -0,0 +1 @@
|
|||
0a2305ed749cb8abc321ee50b871097b4bda8a64
|
||||
|
|
@ -1 +0,0 @@
|
|||
49992ef742b6d3a24b551e06c96c0ab9cbad21e7
|
||||
|
|
@ -0,0 +1 @@
|
|||
51ed4b60eddd2ce38fcdc8c89903c1ece336ab4f
|
||||
|
|
@ -1 +0,0 @@
|
|||
85544da78c2d33b2fdfa6f76eb621c8c963eae37
|
||||
|
|
@ -0,0 +1 @@
|
|||
d71c018d888dc5fe71c7fb20c2a6009c36ef117f
|
||||
|
|
@ -1 +0,0 @@
|
|||
5c8b58d902a01cfce046e656eddee5c4e0578316
|
||||
|
|
@ -0,0 +1 @@
|
|||
5e82bc11bccb55af5d88d5526abe9bd3d04f0d13
|
||||
|
|
@ -1 +0,0 @@
|
|||
55202617e88437dd6def4e42ceb42d18d08a9f6e
|
||||
|
|
@ -0,0 +1 @@
|
|||
0dfec35d41e7120e48cf6d0ae16a88ef2949e778
|
||||
|
|
@ -1 +0,0 @@
|
|||
50b8439558061d0bbf09ddf8144d769143d33f00
|
||||
|
|
@ -0,0 +1 @@
|
|||
30ddb3175c08d443c5a9f74e50e50e3a95afa72d
|
||||
|
|
@ -1 +0,0 @@
|
|||
ce470e38912676ebc63838635663f17d8db844f5
|
||||
|
|
@ -0,0 +1 @@
|
|||
5e45b31ff8374ac5dc651ac2477dde5299b7e746
|
||||
|
|
@ -1 +0,0 @@
|
|||
318e192d61eb28de09cc62c42d4e9d044a497e8b
|
||||
|
|
@ -0,0 +1 @@
|
|||
ff0780a5ad9620036f80114b2ce0b30d25647a62
|
||||
|
|
@ -1 +0,0 @@
|
|||
043b3c3c03a5e0687884e5894754933d7e8f2f3e
|
||||
|
|
@ -0,0 +1 @@
|
|||
7679111888ccd185db0b360954777e68364eb88a
|
||||
|
|
@ -1 +0,0 @@
|
|||
a9ab07d808456d9a2de248f3b4eba9765808b1cb
|
||||
|
|
@ -0,0 +1 @@
|
|||
a1699a0ed320c4db66ae4e8dc9dfd80e4bfc4017
|
||||
|
|
@ -1 +0,0 @@
|
|||
c9ae48e40c89364e0e69f27c514c924d52e0d57e
|
||||
|
|
@ -0,0 +1 @@
|
|||
7bcd15e2e685a8c92f48c3d2f355d2dd63073420
|
||||
|
|
@ -1 +0,0 @@
|
|||
8bd8fb7e75746fd7bce00b4d2813fca738d68f0b
|
||||
|
|
@ -0,0 +1 @@
|
|||
be74ad2360527cca776379499254f355ccd93484
|
||||
|
|
@ -0,0 +1 @@
|
|||
bdcdf20a723516a233b5bcc0ca7d4decaa88b6ed
|
||||
|
|
@ -1 +0,0 @@
|
|||
a71d7e2780ae064a6e6ea5b43357d070351620b8
|
||||
|
|
@ -0,0 +1 @@
|
|||
0ffcda4683ae66ecb96882a6809516d9a288ba52
|
||||
|
|
@ -1 +0,0 @@
|
|||
a82b7a125e7cc16c6eb050b68bafc9f1e63eb646
|
||||
|
|
@ -0,0 +1 @@
|
|||
9e34274dd0f1903453f8e4f76ee8e88f15437752
|
||||
|
|
@ -1 +0,0 @@
|
|||
64b4db89ab7612284b5c685769c3550fb3018bbc
|
||||
|
|
@ -0,0 +1 @@
|
|||
8020f9e0a9c3f30fe1989dcac2085134385a9e93
|
||||
|
|
@ -1 +0,0 @@
|
|||
a79e5ed1671d9f511c5aff273ba287557f5f9103
|
||||
|
|
@ -0,0 +1 @@
|
|||
f8c9a0775dd92a2e537e0e19fc1831b3214eeef5
|
||||
|
|
@ -1 +0,0 @@
|
|||
7b0b74aebbbfdd2175d6ce045fc538261e016417
|
||||
|
|
@ -0,0 +1 @@
|
|||
a3111a7cff126498ce361d56e363bcf8bee945a9
|
||||
|
|
@ -1 +0,0 @@
|
|||
ecfb9a923b19fac61b4e9a79275f6bd242b1f091
|
||||
|
|
@ -0,0 +1 @@
|
|||
40f4f54812a7a34312519ceb8b3f128feb4e2185
|
||||
2
pom.xml
2
pom.xml
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
<!-- libraries -->
|
||||
<lucene.version>5.4.0</lucene.version>
|
||||
<lucene.snapshot.revision>1702855</lucene.snapshot.revision>
|
||||
<lucene.snapshot.revision>1708254</lucene.snapshot.revision>
|
||||
<lucene.maven.version>5.4.0-snapshot-${lucene.snapshot.revision}</lucene.maven.version>
|
||||
<testframework.version>2.1.17</testframework.version>
|
||||
<jackson.version>2.6.2</jackson.version>
|
||||
|
|
|
|||
Loading…
Reference in New Issue