You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/03/01 05:00:34 UTC
[2/2] lucene-solr git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/79b62ee7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/79b62ee7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/79b62ee7
Branch: refs/heads/master
Commit: 79b62ee731d81f2eb9abf084c86a5c2f1435af41
Parents: 1734d03 502b880
Author: Noble Paul <no...@apache.org>
Authored: Tue Mar 1 09:30:22 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Mar 1 09:30:22 2016 +0530
----------------------------------------------------------------------
dev-tools/idea/.idea/ant.xml | 1 +
dev-tools/idea/.idea/modules.xml | 1 +
dev-tools/idea/.idea/workspace.xml | 41 +-
.../idea/lucene/benchmark/src/benchmark.iml | 2 +-
.../lucene/spatial-extras/spatial-extras.iml | 32 +
dev-tools/idea/lucene/spatial/spatial.iml | 15 -
dev-tools/idea/solr/core/src/java/solr-core.iml | 2 +-
.../idea/solr/core/src/solr-core-tests.iml | 2 +-
dev-tools/maven/lucene/pom.xml.template | 1 +
.../lucene/spatial-extras/pom.xml.template | 62 +
dev-tools/maven/lucene/spatial/pom.xml.template | 2 +-
dev-tools/scripts/smokeTestRelease.py | 2 +-
lucene/CHANGES.txt | 16 +-
.../miscellaneous/StemmerOverrideFilter.java | 2 +-
lucene/benchmark/build.xml | 8 +-
lucene/build.xml | 3 +-
.../codecs/blockterms/BlockTermsReader.java | 4 +-
.../lucene/index/SortedDocValuesWriter.java | 2 +-
.../lucene/index/SortedSetDocValuesWriter.java | 2 +-
.../apache/lucene/index/TermsHashPerField.java | 2 +-
.../apache/lucene/search/FuzzyTermsEnum.java | 5 +-
.../lucene/search/LegacyNumericRangeQuery.java | 12 +-
.../apache/lucene/search/PointInSetQuery.java | 92 +-
.../apache/lucene/search/PointRangeQuery.java | 20 +-
.../apache/lucene/search/ScoringRewrite.java | 2 +-
.../org/apache/lucene/search/SortField.java | 2 +-
.../search/UsageTrackingQueryCachingPolicy.java | 16 +-
.../org/apache/lucene/store/MMapDirectory.java | 10 +-
.../java/org/apache/lucene/util/ArrayUtil.java | 20 +-
.../java/org/apache/lucene/util/BytesRef.java | 122 +-
.../org/apache/lucene/util/BytesRefHash.java | 10 +-
.../org/apache/lucene/util/CollectionUtil.java | 4 +-
.../org/apache/lucene/util/DocIdSetBuilder.java | 14 +-
.../apache/lucene/util/LegacyNumericUtils.java | 4 -
.../org/apache/lucene/util/OfflineSorter.java | 2 +-
.../apache/lucene/index/TestMultiFields.java | 4 +-
.../apache/lucene/search/TestPointQueries.java | 7 +-
.../apache/lucene/util/TestBytesRefArray.java | 5 +-
.../apache/lucene/util/TestBytesRefHash.java | 12 +-
.../lucene/util/TestInPlaceMergeSorter.java | 4 +-
.../org/apache/lucene/util/TestIntroSorter.java | 4 +-
.../org/apache/lucene/util/TestTimSorter.java | 3 +-
.../org/apache/lucene/util/TestUnicodeUtil.java | 15 +-
.../search/join/TermsIncludingScoreQuery.java | 2 +-
.../apache/lucene/search/join/TermsQuery.java | 11 +-
.../apache/lucene/search/join/TestJoinUtil.java | 2 +-
.../apache/lucene/index/memory/MemoryIndex.java | 13 +-
lucene/module-build.xml | 22 +
.../apache/lucene/queries/TermsQueryTest.java | 25 +
.../org/apache/lucene/document/LatLonPoint.java | 9 +
.../lucene/search/DocValuesTermsQuery.java | 2 +-
.../lucene/search/PointDistanceQuery.java | 179 +
.../lucene/search/PointInPolygonQuery.java | 6 +-
.../apache/lucene/document/TestLatLonPoint.java | 106 +
.../lucene/search/TestLatLonPointQueries.java | 62 +-
lucene/spatial-extras/build.xml | 57 +
lucene/spatial-extras/ivy.xml | 36 +
.../apache/lucene/spatial/SpatialStrategy.java | 149 +
.../bbox/BBoxOverlapRatioValueSource.java | 251 +
.../spatial/bbox/BBoxSimilarityValueSource.java | 117 +
.../lucene/spatial/bbox/BBoxStrategy.java | 588 +
.../lucene/spatial/bbox/BBoxValueSource.java | 115 +
.../lucene/spatial/bbox/package-info.java | 23 +
.../composite/CompositeSpatialStrategy.java | 144 +
.../spatial/composite/CompositeVerifyQuery.java | 120 +
.../composite/IntersectsRPTVerifyQuery.java | 235 +
.../lucene/spatial/composite/package-info.java | 19 +
.../java/org/apache/lucene/spatial/package.html | 26 +
.../spatial/prefix/AbstractPrefixTreeQuery.java | 133 +
.../prefix/AbstractVisitingPrefixTreeQuery.java | 380 +
.../prefix/BytesRefIteratorTokenStream.java | 72 +
.../spatial/prefix/CellToBytesRefIterator.java | 49 +
.../spatial/prefix/ContainsPrefixTreeQuery.java | 362 +
.../spatial/prefix/HeatmapFacetCounter.java | 310 +
.../prefix/IntersectsPrefixTreeQuery.java | 95 +
.../prefix/NumberRangePrefixTreeStrategy.java | 199 +
.../PointPrefixTreeFieldCacheProvider.java | 48 +
.../spatial/prefix/PrefixTreeFacetCounter.java | 201 +
.../spatial/prefix/PrefixTreeStrategy.java | 208 +
.../prefix/RecursivePrefixTreeStrategy.java | 192 +
.../prefix/TermQueryPrefixTreeStrategy.java | 111 +
.../spatial/prefix/WithinPrefixTreeQuery.java | 232 +
.../lucene/spatial/prefix/package-info.java | 21 +
.../apache/lucene/spatial/prefix/tree/Cell.java | 109 +
.../spatial/prefix/tree/CellIterator.java | 76 +
.../prefix/tree/DateRangePrefixTree.java | 444 +
.../spatial/prefix/tree/FilterCellIterator.java | 61 +
.../spatial/prefix/tree/GeohashPrefixTree.java | 162 +
.../lucene/spatial/prefix/tree/LegacyCell.java | 242 +
.../spatial/prefix/tree/LegacyPrefixTree.java | 84 +
.../prefix/tree/NumberRangePrefixTree.java | 989 +
.../prefix/tree/PackedQuadPrefixTree.java | 459 +
.../spatial/prefix/tree/QuadPrefixTree.java | 308 +
.../prefix/tree/SingletonCellIterator.java | 36 +
.../spatial/prefix/tree/SpatialPrefixTree.java | 117 +
.../prefix/tree/SpatialPrefixTreeFactory.java | 99 +
.../spatial/prefix/tree/TreeCellIterator.java | 87 +
.../spatial/prefix/tree/package-info.java | 30 +
.../lucene/spatial/query/SpatialArgs.java | 148 +
.../lucene/spatial/query/SpatialArgsParser.java | 146 +
.../lucene/spatial/query/SpatialOperation.java | 179 +
.../query/UnsupportedSpatialOperation.java | 28 +
.../lucene/spatial/query/package-info.java | 21 +
.../serialized/SerializedDVStrategy.java | 278 +
.../lucene/spatial/serialized/package-info.java | 21 +
.../lucene/spatial/spatial4j/Geo3dShape.java | 185 +
.../lucene/spatial/spatial4j/package-info.java | 19 +
.../spatial/util/CachingDoubleValueSource.java | 93 +
.../util/DistanceToShapeValueSource.java | 122 +
.../spatial/util/ShapeAreaValueSource.java | 116 +
.../lucene/spatial/util/ShapeFieldCache.java | 54 +
.../ShapeFieldCacheDistanceValueSource.java | 112 +
.../spatial/util/ShapeFieldCacheProvider.java | 87 +
.../spatial/util/ShapePredicateValueSource.java | 113 +
.../org/apache/lucene/spatial/util/package.html | 26 +
.../spatial/vector/DistanceValueSource.java | 120 +
.../spatial/vector/PointVectorStrategy.java | 178 +
.../lucene/spatial/vector/package-info.java | 21 +
lucene/spatial-extras/src/java/overview.html | 67 +
.../src/test-files/cities-Intersects-BBox.txt | 3 +
.../src/test-files/data/LUCENE-4464.txt | 3 +
.../src/test-files/data/countries-bbox.txt | 249 +
.../src/test-files/data/countries-poly.txt | 249 +
.../src/test-files/data/geonames-IE.txt | 22929 +++++++++++++++++
.../src/test-files/data/simple-bbox.txt | 4 +
.../src/test-files/data/states-bbox.txt | 52 +
.../src/test-files/data/states-poly.txt | 52 +
.../src/test-files/data/world-cities-points.txt | 2680 ++
.../src/test-files/simple-Queries-BBox.txt | 9 +
.../src/test-files/states-Intersects-BBox.txt | 3 +
.../src/test-files/states-IsWithin-BBox.txt | 4 +
.../lucene/spatial/DistanceStrategyTest.java | 135 +
.../apache/lucene/spatial/PortedSolr3Test.java | 167 +
.../lucene/spatial/QueryEqualsHashCodeTest.java | 119 +
.../apache/lucene/spatial/SpatialArgsTest.java | 50 +
.../apache/lucene/spatial/SpatialExample.java | 200 +
.../lucene/spatial/SpatialMatchConcern.java | 31 +
.../apache/lucene/spatial/SpatialTestCase.java | 280 +
.../apache/lucene/spatial/SpatialTestData.java | 71 +
.../apache/lucene/spatial/SpatialTestQuery.java | 96 +
.../apache/lucene/spatial/StrategyTestCase.java | 252 +
.../lucene/spatial/TestTestFramework.java | 68 +
.../lucene/spatial/bbox/TestBBoxStrategy.java | 301 +
.../composite/CompositeStrategyTest.java | 142 +
.../prefix/CellToBytesRefIterator50.java | 44 +
.../spatial/prefix/DateNRStrategyTest.java | 143 +
.../spatial/prefix/HeatmapFacetCounterTest.java | 252 +
.../lucene/spatial/prefix/JtsPolygonTest.java | 117 +
.../spatial/prefix/NumberRangeFacetsTest.java | 275 +
.../RandomSpatialOpFuzzyPrefixTree50Test.java | 31 +
.../RandomSpatialOpFuzzyPrefixTreeTest.java | 533 +
.../prefix/RandomSpatialOpStrategyTestCase.java | 141 +
.../prefix/TestRecursivePrefixTreeStrategy.java | 122 +
.../prefix/TestTermQueryPrefixGridStrategy.java | 63 +
.../prefix/tree/DateRangePrefixTreeTest.java | 175 +
.../prefix/tree/SpatialPrefixTreeTest.java | 114 +
.../spatial/query/SpatialArgsParserTest.java | 77 +
.../serialized/SerializedStrategyTest.java | 66 +
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 227 +
.../Geo3dShapeRectRelationTestCase.java | 262 +
.../Geo3dShapeSphereModelRectRelationTest.java | 72 +
.../Geo3dShapeWGS84ModelRectRelationTest.java | 94 +
.../spatial4j/RandomizedShapeTestCase.java | 288 +
.../spatial/spatial4j/geo3d/GeoPointTest.java | 80 +
.../spatial/vector/TestPointVectorStrategy.java | 63 +
lucene/spatial/build.xml | 30 -
lucene/spatial/ivy.xml | 15 -
.../apache/lucene/spatial/SpatialStrategy.java | 149 -
.../bbox/BBoxOverlapRatioValueSource.java | 251 -
.../spatial/bbox/BBoxSimilarityValueSource.java | 117 -
.../lucene/spatial/bbox/BBoxStrategy.java | 591 -
.../lucene/spatial/bbox/BBoxValueSource.java | 115 -
.../lucene/spatial/bbox/package-info.java | 23 -
.../composite/CompositeSpatialStrategy.java | 144 -
.../spatial/composite/CompositeVerifyQuery.java | 121 -
.../composite/IntersectsRPTVerifyQuery.java | 235 -
.../lucene/spatial/composite/package-info.java | 19 -
.../geopoint/search/GeoPointDistanceQuery.java | 5 +
.../search/GeoPointDistanceRangeQuery.java | 6 +
.../geopoint/search/GeoPointInBBoxQuery.java | 10 +
.../geopoint/search/GeoPointInPolygonQuery.java | 6 +
.../spatial/prefix/AbstractPrefixTreeQuery.java | 133 -
.../prefix/AbstractVisitingPrefixTreeQuery.java | 380 -
.../prefix/BytesRefIteratorTokenStream.java | 72 -
.../spatial/prefix/CellToBytesRefIterator.java | 49 -
.../spatial/prefix/ContainsPrefixTreeQuery.java | 362 -
.../spatial/prefix/HeatmapFacetCounter.java | 310 -
.../prefix/IntersectsPrefixTreeQuery.java | 95 -
.../prefix/NumberRangePrefixTreeStrategy.java | 199 -
.../PointPrefixTreeFieldCacheProvider.java | 48 -
.../spatial/prefix/PrefixTreeFacetCounter.java | 201 -
.../spatial/prefix/PrefixTreeStrategy.java | 208 -
.../prefix/RecursivePrefixTreeStrategy.java | 196 -
.../prefix/TermQueryPrefixTreeStrategy.java | 111 -
.../spatial/prefix/WithinPrefixTreeQuery.java | 233 -
.../lucene/spatial/prefix/package-info.java | 21 -
.../apache/lucene/spatial/prefix/tree/Cell.java | 109 -
.../spatial/prefix/tree/CellIterator.java | 76 -
.../prefix/tree/DateRangePrefixTree.java | 444 -
.../spatial/prefix/tree/FilterCellIterator.java | 61 -
.../spatial/prefix/tree/GeohashPrefixTree.java | 162 -
.../lucene/spatial/prefix/tree/LegacyCell.java | 242 -
.../spatial/prefix/tree/LegacyPrefixTree.java | 84 -
.../prefix/tree/NumberRangePrefixTree.java | 989 -
.../prefix/tree/PackedQuadPrefixTree.java | 459 -
.../spatial/prefix/tree/QuadPrefixTree.java | 308 -
.../prefix/tree/SingletonCellIterator.java | 36 -
.../spatial/prefix/tree/SpatialPrefixTree.java | 117 -
.../prefix/tree/SpatialPrefixTreeFactory.java | 99 -
.../spatial/prefix/tree/TreeCellIterator.java | 87 -
.../spatial/prefix/tree/package-info.java | 30 -
.../lucene/spatial/query/SpatialArgs.java | 148 -
.../lucene/spatial/query/SpatialArgsParser.java | 146 -
.../lucene/spatial/query/SpatialOperation.java | 179 -
.../query/UnsupportedSpatialOperation.java | 28 -
.../lucene/spatial/query/package-info.java | 21 -
.../serialized/SerializedDVStrategy.java | 278 -
.../lucene/spatial/serialized/package-info.java | 21 -
.../lucene/spatial/spatial4j/Geo3dShape.java | 185 -
.../lucene/spatial/spatial4j/package-info.java | 19 -
.../spatial/util/CachingDoubleValueSource.java | 93 -
.../util/DistanceToShapeValueSource.java | 122 -
.../lucene/spatial/util/GeoEncodingUtils.java | 26 +-
.../org/apache/lucene/spatial/util/GeoRect.java | 7 +
.../lucene/spatial/util/GeoRelationUtils.java | 4 +
.../spatial/util/ShapeAreaValueSource.java | 116 -
.../lucene/spatial/util/ShapeFieldCache.java | 54 -
.../ShapeFieldCacheDistanceValueSource.java | 112 -
.../spatial/util/ShapeFieldCacheProvider.java | 87 -
.../spatial/util/ShapePredicateValueSource.java | 113 -
.../spatial/vector/DistanceValueSource.java | 120 -
.../spatial/vector/PointVectorStrategy.java | 182 -
.../lucene/spatial/vector/package-info.java | 21 -
lucene/spatial/src/java/overview.html | 50 +-
.../src/test-files/cities-Intersects-BBox.txt | 3 -
.../spatial/src/test-files/data/LUCENE-4464.txt | 3 -
.../src/test-files/data/countries-bbox.txt | 249 -
.../src/test-files/data/countries-poly.txt | 249 -
.../spatial/src/test-files/data/geonames-IE.txt | 22929 -----------------
.../spatial/src/test-files/data/simple-bbox.txt | 5 -
.../spatial/src/test-files/data/states-bbox.txt | 52 -
.../spatial/src/test-files/data/states-poly.txt | 52 -
.../src/test-files/data/world-cities-points.txt | 2680 --
.../src/test-files/simple-Queries-BBox.txt | 9 -
.../src/test-files/states-Intersects-BBox.txt | 3 -
.../src/test-files/states-IsWithin-BBox.txt | 4 -
.../lucene/spatial/DistanceStrategyTest.java | 135 -
.../apache/lucene/spatial/PortedSolr3Test.java | 167 -
.../lucene/spatial/QueryEqualsHashCodeTest.java | 119 -
.../apache/lucene/spatial/SpatialArgsTest.java | 50 -
.../apache/lucene/spatial/SpatialExample.java | 200 -
.../lucene/spatial/SpatialMatchConcern.java | 31 -
.../apache/lucene/spatial/SpatialTestCase.java | 281 -
.../apache/lucene/spatial/SpatialTestData.java | 71 -
.../apache/lucene/spatial/SpatialTestQuery.java | 96 -
.../apache/lucene/spatial/StrategyTestCase.java | 252 -
.../lucene/spatial/TestTestFramework.java | 68 -
.../lucene/spatial/bbox/TestBBoxStrategy.java | 301 -
.../composite/CompositeStrategyTest.java | 142 -
.../prefix/CellToBytesRefIterator50.java | 44 -
.../spatial/prefix/DateNRStrategyTest.java | 143 -
.../spatial/prefix/HeatmapFacetCounterTest.java | 252 -
.../lucene/spatial/prefix/JtsPolygonTest.java | 117 -
.../spatial/prefix/NumberRangeFacetsTest.java | 275 -
.../RandomSpatialOpFuzzyPrefixTree50Test.java | 31 -
.../RandomSpatialOpFuzzyPrefixTreeTest.java | 533 -
.../prefix/RandomSpatialOpStrategyTestCase.java | 141 -
.../prefix/TestRecursivePrefixTreeStrategy.java | 122 -
.../prefix/TestTermQueryPrefixGridStrategy.java | 63 -
.../prefix/tree/DateRangePrefixTreeTest.java | 175 -
.../prefix/tree/SpatialPrefixTreeTest.java | 114 -
.../spatial/query/SpatialArgsParserTest.java | 77 -
.../serialized/SerializedStrategyTest.java | 66 -
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 227 -
.../Geo3dShapeRectRelationTestCase.java | 264 -
.../Geo3dShapeSphereModelRectRelationTest.java | 72 -
.../Geo3dShapeWGS84ModelRectRelationTest.java | 95 -
.../spatial4j/RandomizedShapeTestCase.java | 289 -
.../spatial/spatial4j/geo3d/GeoPointTest.java | 82 -
.../spatial/util/BaseGeoPointTestCase.java | 20 +-
.../spatial/vector/TestPointVectorStrategy.java | 63 -
.../lucene/geo3d/PointInGeo3DShapeQuery.java | 6 +-
.../search/suggest/SortedInputIterator.java | 7 +-
.../suggest/fst/FSTCompletionBuilder.java | 5 +-
.../lucene/search/suggest/tst/TSTLookup.java | 51 +-
.../search/suggest/TestInputIterator.java | 21 +-
.../search/suggest/fst/BytesRefSortersTest.java | 5 +-
.../codecs/asserting/AssertingPointFormat.java | 17 +-
.../index/BaseDocValuesFormatTestCase.java | 2 +-
.../org/apache/lucene/index/RandomCodec.java | 37 +-
.../org/apache/lucene/util/LuceneTestCase.java | 18 +
.../java/org/apache/lucene/util/TestUtil.java | 23 +-
solr/CHANGES.txt | 27 +
solr/common-build.xml | 8 +-
.../solr/collection1/conf/solrconfig.xml | 2 +-
.../test-files/solr/minimr/conf/solrconfig.xml | 2 +-
.../test-files/solr/mrunit/conf/solrconfig.xml | 2 +-
.../collection1/conf/solrconfig.xml | 2 +-
.../solr/solrcloud/conf/solrconfig.xml | 2 +-
.../org/apache/solr/cloud/ElectionContext.java | 114 +-
.../java/org/apache/solr/cloud/Overseer.java | 122 +-
.../cloud/OverseerCollectionMessageHandler.java | 36 +-
.../solr/cloud/OverseerNodePrioritizer.java | 2 +-
.../solr/cloud/OverseerTaskProcessor.java | 14 +-
.../solr/cloud/SizeLimitedDistributedMap.java | 5 +-
.../org/apache/solr/cloud/ZkController.java | 15 +-
.../solr/core/CachingDirectoryFactory.java | 3 +-
.../org/apache/solr/core/CoreDescriptor.java | 1 +
.../solr/handler/admin/CollectionsHandler.java | 5 +-
.../solr/handler/admin/CoreAdminOperation.java | 22 +-
.../handler/component/StatsValuesFactory.java | 10 +-
.../org/apache/solr/update/SolrIndexConfig.java | 12 +-
.../processor/DistributedUpdateProcessor.java | 2 +-
.../org/apache/solr/cloud/DeleteShardTest.java | 2 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 4 +-
.../apache/solr/cloud/OverseerRolesTest.java | 2 +-
.../org/apache/solr/cloud/OverseerTest.java | 28 +-
.../cloud/TestRandomRequestDistribution.java | 2 +-
.../cloud/TestSizeLimitedDistributedMap.java | 58 +
.../solr/core/TestImplicitCoreProperties.java | 61 +-
.../handler/component/StatsComponentTest.java | 6 +-
.../example-DIH/solr/db/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/mail/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/rss/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/solr/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/tika/conf/solrconfig.xml | 2 +-
solr/example/files/conf/solrconfig.xml | 2 +-
.../conf/solrconfig.xml | 2 +-
.../conf/solrconfig.xml | 4 +-
.../cloud/AbstractFullDistribZkTestBase.java | 2 +-
.../apache/solr/cloud/SolrCloudTestCase.java | 163 +
solr/webapp/web/index.html | 2 +-
332 files changed, 42843 insertions(+), 41759 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/79b62ee7/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------