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 2016/12/30 15:56:59 UTC
[23/50] [abbrv] lucene-solr:jira/solr-9854: Merge branch 'master'
into jira/solr-9854
Merge branch 'master' into jira/solr-9854
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e1bf9b94
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e1bf9b94
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e1bf9b94
Branch: refs/heads/jira/solr-9854
Commit: e1bf9b9416defd02274ead610a829e31fca885dc
Parents: 6ceb050 56476fb
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Dec 27 11:43:39 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Dec 27 11:43:39 2016 +0100
----------------------------------------------------------------------
build.xml | 40 +-
.../lucene/analysis/common/pom.xml.template | 36 +-
.../maven/lucene/analysis/icu/pom.xml.template | 42 +-
.../lucene/analysis/kuromoji/pom.xml.template | 38 +-
.../lucene/analysis/morfologik/pom.xml.template | 38 +-
.../lucene/analysis/phonetic/pom.xml.template | 38 +-
.../maven/lucene/analysis/pom.xml.template | 36 +-
.../lucene/analysis/smartcn/pom.xml.template | 36 +-
.../lucene/analysis/stempel/pom.xml.template | 36 +-
.../maven/lucene/analysis/uima/pom.xml.template | 36 +-
.../lucene/backward-codecs/pom.xml.template | 36 +-
.../maven/lucene/benchmark/pom.xml.template | 36 +-
.../lucene/classification/pom.xml.template | 36 +-
dev-tools/maven/lucene/codecs/pom.xml.template | 36 +-
.../lucene/codecs/src/java/pom.xml.template | 36 +-
.../lucene/codecs/src/test/pom.xml.template | 36 +-
dev-tools/maven/lucene/core/pom.xml.template | 36 +-
.../maven/lucene/core/src/java/pom.xml.template | 36 +-
.../maven/lucene/core/src/test/pom.xml.template | 36 +-
dev-tools/maven/lucene/demo/pom.xml.template | 36 +-
.../maven/lucene/expressions/pom.xml.template | 36 +-
dev-tools/maven/lucene/facet/pom.xml.template | 36 +-
.../maven/lucene/grouping/pom.xml.template | 36 +-
.../maven/lucene/highlighter/pom.xml.template | 36 +-
dev-tools/maven/lucene/join/pom.xml.template | 36 +-
dev-tools/maven/lucene/memory/pom.xml.template | 36 +-
dev-tools/maven/lucene/misc/pom.xml.template | 36 +-
dev-tools/maven/lucene/pom.xml.template | 36 +-
dev-tools/maven/lucene/queries/pom.xml.template | 36 +-
.../maven/lucene/queryparser/pom.xml.template | 36 +-
.../maven/lucene/replicator/pom.xml.template | 38 +-
dev-tools/maven/lucene/sandbox/pom.xml.template | 36 +-
.../lucene/spatial-extras/pom.xml.template | 36 +-
dev-tools/maven/lucene/spatial/pom.xml.template | 38 +-
.../maven/lucene/spatial3d/pom.xml.template | 36 +-
dev-tools/maven/lucene/suggest/pom.xml.template | 36 +-
.../lucene/test-framework/pom.xml.template | 36 +-
dev-tools/maven/pom.xml.template | 36 +-
.../contrib/analysis-extras/pom.xml.template | 36 +-
.../solr/contrib/analytics/pom.xml.template | 36 +-
.../solr/contrib/clustering/pom.xml.template | 36 +-
.../dataimporthandler-extras/pom.xml.template | 36 +-
.../contrib/dataimporthandler/pom.xml.template | 36 +-
.../solr/contrib/extraction/pom.xml.template | 36 +-
.../maven/solr/contrib/langid/pom.xml.template | 36 +-
.../maven/solr/contrib/ltr/pom.xml.template | 36 +-
.../solr/contrib/map-reduce/pom.xml.template | 36 +-
.../contrib/morphlines-cell/pom.xml.template | 36 +-
.../contrib/morphlines-core/pom.xml.template | 36 +-
dev-tools/maven/solr/contrib/pom.xml.template | 36 +-
.../maven/solr/contrib/uima/pom.xml.template | 36 +-
.../solr/contrib/velocity/pom.xml.template | 36 +-
dev-tools/maven/solr/core/pom.xml.template | 36 +-
.../maven/solr/core/src/java/pom.xml.template | 36 +-
.../maven/solr/core/src/test/pom.xml.template | 36 +-
dev-tools/maven/solr/pom.xml.template | 36 +-
dev-tools/maven/solr/solrj/pom.xml.template | 36 +-
.../maven/solr/solrj/src/java/pom.xml.template | 36 +-
.../maven/solr/solrj/src/test/pom.xml.template | 36 +-
.../maven/solr/test-framework/pom.xml.template | 36 +-
lucene/CHANGES.txt | 30 +
.../analysis/synonym/FlattenGraphFilter.java | 424 ++++
.../synonym/FlattenGraphFilterFactory.java | 44 +
.../lucene/analysis/synonym/SynonymFilter.java | 4 +
.../analysis/synonym/SynonymFilterFactory.java | 4 +
.../analysis/synonym/SynonymGraphFilter.java | 586 ++++++
.../synonym/SynonymGraphFilterFactory.java | 204 ++
.../lucene/analysis/synonym/SynonymMap.java | 7 +-
.../lucene/analysis/util/CharTokenizer.java | 6 +-
...ache.lucene.analysis.util.TokenFilterFactory | 2 +
.../lucene/analysis/core/TestRandomChains.java | 177 +-
.../miscellaneous/TestWordDelimiterFilter.java | 56 +-
.../synonym/TestFlattenGraphFilter.java | 284 +++
.../synonym/TestSynonymGraphFilter.java | 1956 ++++++++++++++++++
.../apache/lucene/codecs/DocValuesConsumer.java | 10 +-
.../org/apache/lucene/codecs/NormsConsumer.java | 2 +-
.../lucene/codecs/StoredFieldsWriter.java | 2 +-
.../apache/lucene/codecs/TermVectorsWriter.java | 2 +-
.../CompressingStoredFieldsWriter.java | 68 +-
.../lucene50/Lucene50StoredFieldsFormat.java | 2 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 11 +-
.../org/apache/lucene/document/DoublePoint.java | 30 +-
.../org/apache/lucene/document/FloatPoint.java | 30 +-
.../lucene/index/BinaryDocValuesWriter.java | 39 +-
.../lucene/index/DefaultIndexingChain.java | 116 +-
.../org/apache/lucene/index/DocConsumer.java | 2 +-
.../org/apache/lucene/index/DocIDMerger.java | 211 +-
.../apache/lucene/index/DocValuesWriter.java | 4 +-
.../lucene/index/DocumentsWriterPerThread.java | 31 +-
.../lucene/index/FreqProxTermsWriter.java | 8 +-
.../org/apache/lucene/index/IndexWriter.java | 8 +-
.../lucene/index/MappingMultiPostingsEnum.java | 2 +-
.../org/apache/lucene/index/MergeState.java | 8 +-
.../apache/lucene/index/NormValuesWriter.java | 17 +-
.../lucene/index/NumericDocValuesWriter.java | 51 +-
.../apache/lucene/index/PointValuesWriter.java | 96 +-
.../lucene/index/SortedDocValuesWriter.java | 76 +-
.../index/SortedNumericDocValuesWriter.java | 64 +-
.../lucene/index/SortedSetDocValuesWriter.java | 98 +-
.../java/org/apache/lucene/index/Sorter.java | 57 +-
.../apache/lucene/index/SortingLeafReader.java | 21 +-
.../index/SortingStoredFieldsConsumer.java | 206 ++
.../index/SortingTermVectorsConsumer.java | 181 ++
.../lucene/index/StoredFieldsConsumer.java | 85 +
.../lucene/index/TermVectorsConsumer.java | 7 +-
.../java/org/apache/lucene/index/TermsHash.java | 4 +-
.../TrackingTmpOutputDirectoryWrapper.java | 53 +
.../org/apache/lucene/store/MMapDirectory.java | 124 +-
.../apache/lucene/util/automaton/Automaton.java | 5 +-
.../lucene/util/automaton/Operations.java | 6 +-
.../apache/lucene/util/automaton/StatePair.java | 4 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 53 +-
.../lucene/index/Test4GBStoredFields.java | 2 +
.../apache/lucene/index/TestDocIDMerger.java | 4 +-
.../apache/lucene/index/TestIndexSorting.java | 2 -
.../apache/lucene/index/TestIndexWriter.java | 3 +-
.../apache/lucene/search/TestLRUQueryCache.java | 4 +
.../apache/lucene/search/TestPointQueries.java | 28 +
.../org/apache/lucene/store/TestDirectory.java | 13 +-
.../apache/lucene/store/TestMmapDirectory.java | 3 +-
.../org/apache/lucene/store/TestMultiMMap.java | 3 +-
.../org/apache/lucene/util/bkd/TestBKD.java | 48 +-
.../org/apache/lucene/util/fst/Test2BFST.java | 2 +
.../lucene/search/grouping/TestGrouping.java | 9 -
.../lucene/document/TestHalfFloatPoint.java | 2 +
.../suggest/analyzing/FreeTextSuggester.java | 45 -
.../analysis/BaseTokenStreamTestCase.java | 37 +-
.../apache/lucene/analysis/MockTokenizer.java | 3 +-
.../asserting/AssertingLiveDocsFormat.java | 9 +-
.../index/BaseStoredFieldsFormatTestCase.java | 2 +
.../org/apache/lucene/index/RandomCodec.java | 2 +-
.../org/apache/lucene/util/LuceneTestCase.java | 20 +-
lucene/tools/junit4/tests.policy | 1 -
solr/CHANGES.txt | 17 +
solr/bin/solr.cmd | 15 +-
.../solr/handler/dataimport/JdbcDataSource.java | 4 +-
.../handler/dataimport/TestJdbcDataSource.java | 43 +-
solr/contrib/ltr/README.md | 2 +-
.../LTRFeatureLoggerTransformerFactory.java | 29 +-
.../solr/collection1/conf/solrconfig-ltr.xml | 1 +
.../apache/solr/ltr/TestLTRQParserExplain.java | 2 +-
.../apache/solr/ltr/TestLTRQParserPlugin.java | 5 +-
.../org/apache/solr/ltr/TestLTRWithFacet.java | 2 +-
.../org/apache/solr/ltr/TestLTRWithSort.java | 2 +-
.../org/apache/solr/ltr/TestRerankBase.java | 54 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 2 +-
.../ltr/feature/TestEdisMaxSolrFeature.java | 2 +-
.../solr/ltr/feature/TestExternalFeatures.java | 37 +-
.../ltr/feature/TestExternalValueFeatures.java | 21 +-
.../solr/ltr/feature/TestFeatureLogging.java | 30 +-
.../ltr/feature/TestFeatureLtrScoringModel.java | 2 +-
.../solr/ltr/feature/TestFeatureStore.java | 2 +-
.../ltr/feature/TestFieldLengthFeature.java | 2 +-
.../solr/ltr/feature/TestFieldValueFeature.java | 2 +-
.../solr/ltr/feature/TestFilterSolrFeature.java | 6 +-
.../ltr/feature/TestNoMatchSolrFeature.java | 94 +-
.../ltr/feature/TestOriginalScoreFeature.java | 2 +-
.../solr/ltr/feature/TestRankingFeature.java | 2 +-
.../ltr/feature/TestUserTermScoreWithQ.java | 2 +-
.../ltr/feature/TestUserTermScorerQuery.java | 2 +-
.../ltr/feature/TestUserTermScorereQDF.java | 2 +-
.../solr/ltr/feature/TestValueFeature.java | 2 +-
.../apache/solr/ltr/model/TestLinearModel.java | 2 +-
.../model/TestMultipleAdditiveTreesModel.java | 2 +-
.../solr/ltr/store/rest/TestModelManager.java | 2 +-
.../store/rest/TestModelManagerPersistence.java | 2 +-
.../solr/handler/admin/LukeRequestHandler.java | 18 +-
.../admin/SegmentsInfoRequestHandler.java | 1 +
.../handler/component/HttpShardHandler.java | 48 +-
.../component/HttpShardHandlerFactory.java | 79 +
.../solr/handler/component/QueryComponent.java | 18 +-
.../component/QueryElevationComponent.java | 4 +-
.../solr/handler/component/ResponseBuilder.java | 1 -
.../solr/handler/component/SearchHandler.java | 2 +-
.../solr/handler/component/ShardHandler.java | 5 +-
.../solr/metrics/OperatingSystemMetricSet.java | 92 +
.../apache/solr/metrics/SolrMetricManager.java | 29 +-
.../apache/solr/parser/SolrQueryParserBase.java | 2 +-
.../org/apache/solr/schema/SchemaManager.java | 99 +-
.../search/grouping/GroupingSpecification.java | 18 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 8 +-
.../schema-minimal-with-another-uniqkey.xml | 23 +
.../TestReversedWildcardFilterFactory.java | 44 +-
.../solr/core/MockShardHandlerFactory.java | 2 +-
.../admin/SegmentsInfoRequestHandlerTest.java | 17 +-
.../solr/handler/admin/StatsReloadRaceTest.java | 82 +-
.../org/apache/solr/metrics/JvmMetricsTest.java | 68 +
.../TestSubQueryTransformerDistrib.java | 55 +-
.../TestSolrCloudWithHadoopAuthPlugin.java | 4 +-
.../client/solrj/impl/CloudSolrClientTest.java | 2 +-
.../solr/common/params/CommonParamsTest.java | 2 +
.../java/org/apache/solr/cloud/ChaosMonkey.java | 2 -
.../component/TrackingShardHandlerFactory.java | 2 +-
193 files changed, 7166 insertions(+), 1957 deletions(-)
----------------------------------------------------------------------