You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/02/09 20:10:07 UTC
[50/50] lucene-solr:jira/solr-9858: Merge branch 'master' into
jira/solr-9858
Merge branch 'master' into jira/solr-9858
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/32ab5aa4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/32ab5aa4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/32ab5aa4
Branch: refs/heads/jira/solr-9858
Commit: 32ab5aa4eb7f79bd20ed84b33653d3c1baf1e795
Parents: a6f66c3 0b817e6
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Feb 9 09:36:04 2017 -0800
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Feb 9 09:36:04 2017 -0800
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 9 +
dev-tools/doap/solr.rdf | 9 +
lucene/CHANGES.txt | 36 +-
lucene/analysis/build.xml | 3 +
.../analysis/cn/smart/hhmm/WordDictionary.java | 1 -
.../lucene/legacy/doc-files/nrq-formula-1.png | Bin 0 -> 3171 bytes
.../lucene/legacy/doc-files/nrq-formula-2.png | Bin 0 -> 3694 bytes
.../index/TestBackwardsCompatibility.java | 4 +-
.../org/apache/lucene/index/index.6.4.1-cfs.zip | Bin 0 -> 15848 bytes
.../apache/lucene/index/index.6.4.1-nocfs.zip | Bin 0 -> 15838 bytes
lucene/build.xml | 4 +
lucene/common-build.xml | 8 +
.../java/org/apache/lucene/index/FieldInfo.java | 3 +-
.../apache/lucene/index/FilterCodecReader.java | 24 ++
.../org/apache/lucene/index/PointValues.java | 3 +-
.../lucene/search/doc-files/nrq-formula-1.png | Bin 3171 -> 0 bytes
.../lucene/search/doc-files/nrq-formula-2.png | Bin 3694 -> 0 bytes
.../org/apache/lucene/util/QueryBuilder.java | 122 ++++--
.../util/automaton/FiniteStringsIterator.java | 36 +-
.../org/apache/lucene/util/bkd/BKDReader.java | 19 +-
.../graph/GraphTokenStreamFiniteStrings.java | 212 +++++++---
.../lucene/index/TestFilterCodecReader.java | 49 +++
.../apache/lucene/index/TestIndexSorting.java | 3 +-
.../apache/lucene/util/TestQueryBuilder.java | 71 ++++
.../TestGraphTokenStreamFiniteStrings.java | 421 +++++++++++++++++--
.../apache/lucene/index/memory/MemoryIndex.java | 75 ++--
.../lucene/index/memory/TestMemoryIndex.java | 18 +-
.../function/valuesource/DoubleFieldSource.java | 6 +-
.../function/valuesource/FloatFieldSource.java | 6 +-
.../function/valuesource/IntFieldSource.java | 8 +-
.../function/valuesource/LongFieldSource.java | 6 +-
.../MultiValuedDoubleFieldSource.java | 78 ++++
.../MultiValuedFloatFieldSource.java | 78 ++++
.../valuesource/MultiValuedIntFieldSource.java | 78 ++++
.../valuesource/MultiValuedLongFieldSource.java | 78 ++++
.../queries/function/FunctionTestSetup.java | 58 +++
.../function/TestDocValuesFieldSources.java | 14 +-
.../queries/function/TestFieldScoreQuery.java | 26 ++
.../function/TestFunctionRangeQuery.java | 37 +-
.../queries/function/TestValueSources.java | 113 +++--
.../classic/TestMultiFieldQueryParser.java | 4 +-
.../queryparser/classic/TestQueryParser.java | 58 +--
.../geopoint/document/GeoPointField.java | 266 ------------
.../geopoint/document/GeoPointTokenStream.java | 218 ----------
.../spatial/geopoint/document/package-info.java | 21 -
.../geopoint/search/GeoPointDistanceQuery.java | 171 --------
.../search/GeoPointDistanceQueryImpl.java | 132 ------
.../geopoint/search/GeoPointInBBoxQuery.java | 171 --------
.../search/GeoPointInBBoxQueryImpl.java | 148 -------
.../geopoint/search/GeoPointInPolygonQuery.java | 103 -----
.../search/GeoPointInPolygonQueryImpl.java | 94 -----
.../geopoint/search/GeoPointMultiTermQuery.java | 148 -------
.../GeoPointTermQueryConstantScoreWrapper.java | 160 -------
.../geopoint/search/GeoPointTermsEnum.java | 199 ---------
.../spatial/geopoint/search/package-info.java | 21 -
.../geopoint/search/TestGeoPointQuery.java | 85 ----
.../lucene/spatial/util/TestGeoPointField.java | 51 ---
.../org/apache/lucene/util/LuceneTestCase.java | 28 ++
solr/CHANGES.txt | 39 +-
solr/bin/solr | 31 +-
solr/bin/solr.cmd | 37 +-
solr/bin/solr.in.cmd | 4 +-
solr/bin/solr.in.sh | 4 +-
solr/build.xml | 3 +
.../facet/FieldFacetAccumulator.java | 2 +-
.../analytics/util/RangeEndpointCalculator.java | 3 +-
.../util/valuesource/ConstDoubleSource.java | 3 +-
.../ltr/feature/TestFeatureLtrScoringModel.java | 71 ----
.../solr/ltr/feature/TestFeatureStore.java | 106 -----
.../ltr/store/rest/TestManagedFeatureStore.java | 119 +++++-
.../org/apache/solr/handler/StreamHandler.java | 2 +-
.../solr/handler/component/FacetComponent.java | 8 +-
.../handler/component/RangeFacetRequest.java | 8 +-
.../solr/handler/component/StatsField.java | 26 +-
.../solr/highlight/DefaultSolrHighlighter.java | 3 +-
.../solr/highlight/PostingsSolrHighlighter.java | 4 +-
.../apache/solr/highlight/SolrHighlighter.java | 1 +
.../solr/highlight/UnifiedSolrHighlighter.java | 8 +-
.../org/apache/solr/metrics/SolrMetricInfo.java | 6 +-
.../apache/solr/request/DocValuesFacets.java | 20 +-
.../org/apache/solr/request/IntervalFacets.java | 42 +-
.../org/apache/solr/request/NumericFacets.java | 12 +-
.../request/PerSegmentSingleValuedFaceting.java | 14 +-
.../org/apache/solr/request/SimpleFacets.java | 122 ++++--
.../solr/request/SubstringBytesRefFilter.java | 52 +++
.../java/org/apache/solr/schema/EnumField.java | 9 +
.../java/org/apache/solr/schema/FieldType.java | 13 +-
.../java/org/apache/solr/schema/NumberType.java | 25 ++
.../apache/solr/schema/NumericFieldType.java | 29 +-
.../schema/SpatialPointVectorFieldType.java | 8 +-
.../apache/solr/search/SolrIndexSearcher.java | 37 +-
.../apache/solr/search/facet/FacetField.java | 4 +-
.../FacetFieldProcessorByEnumTermsStream.java | 2 +-
.../facet/FacetFieldProcessorByHashDV.java | 2 +-
.../apache/solr/search/facet/FacetRange.java | 13 +-
.../org/apache/solr/search/facet/HLLAgg.java | 2 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 2 +-
.../solr/search/function/OrdFieldSource.java | 2 +-
.../search/function/ReverseOrdFieldSource.java | 2 +-
.../solr/search/grouping/CommandHandler.java | 2 +-
.../distributed/command/GroupConverter.java | 4 +-
.../command/SearchGroupsFieldCommand.java | 6 +-
.../command/TopGroupsFieldCommand.java | 4 +-
.../apache/solr/search/mlt/CloudMLTQParser.java | 2 +-
.../solr/search/mlt/SimpleMLTQParser.java | 4 +-
.../apache/solr/security/HadoopAuthPlugin.java | 37 ++
.../solr/spelling/suggest/SolrSuggester.java | 11 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 39 --
.../conf/solrconfig-infixsuggesters.xml | 101 +++++
.../org/apache/solr/TestRandomDVFaceting.java | 2 +-
.../cloud/CdcrReplicationDistributedZkTest.java | 2 +
.../cloud/CollectionsAPIDistributedZkTest.java | 2 +-
.../cloud/SharedFSAutoReplicaFailoverTest.java | 2 +-
.../HdfsCollectionsAPIDistributedZkTest.java | 2 +-
.../apache/solr/cloud/hdfs/HdfsTestUtil.java | 6 +
.../HdfsWriteToMultipleCollectionsTest.java | 16 +-
.../org/apache/solr/core/TestLazyCores.java | 1 +
.../handler/component/InfixSuggestersTest.java | 136 ++++++
.../apache/solr/request/SimpleFacetsTest.java | 172 +++++++-
.../request/SubstringBytesRefFilterTest.java | 51 +++
.../suggest/RandomTestDictionaryFactory.java | 117 ++++++
.../solr/update/TestInPlaceUpdatesDistrib.java | 26 +-
solr/example/example-DIH/build.xml | 1 +
solr/server/build.xml | 1 +
.../solr/client/solrj/impl/HttpClientUtil.java | 37 +-
.../solrj/impl/Krb5HttpClientBuilder.java | 5 +-
.../solr/client/solrj/impl/PreemptiveAuth.java | 59 +++
...PreemptiveBasicAuthClientBuilderFactory.java | 132 ++++++
.../apache/solr/common/params/FacetParams.java | 5 +
.../solr/common/params/HighlightParams.java | 2 +-
.../apache/solr/cloud/SolrCloudTestCase.java | 2 +-
solr/webapp/build.xml | 1 +
.../web/js/angular/controllers/dataimport.js | 2 +-
solr/webapp/web/js/scripts/dataimport.js | 2 +-
134 files changed, 2965 insertions(+), 2723 deletions(-)
----------------------------------------------------------------------