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/01/19 15:32:47 UTC
[38/38] lucene-solr:jira/solr-9857: Merge branch 'master' into
jira/solr-9857
Merge branch 'master' into jira/solr-9857
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/aef1f73a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/aef1f73a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/aef1f73a
Branch: refs/heads/jira/solr-9857
Commit: aef1f73a3fae05ef09f3e421acc3e6d5dc378bbf
Parents: 197bf00 a14d793
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Jan 19 16:31:57 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Jan 19 16:31:57 2017 +0100
----------------------------------------------------------------------
.../dot.settings/org.eclipse.jdt.core.prefs | 8 +-
lucene/CHANGES.txt | 32 +-
.../analysis/charfilter/BaseCharFilter.java | 26 +-
.../analysis/core/FlattenGraphFilter.java | 418 +++++
.../core/FlattenGraphFilterFactory.java | 44 +
.../miscellaneous/WordDelimiterFilter.java | 9 +-
.../WordDelimiterFilterFactory.java | 6 +
.../miscellaneous/WordDelimiterGraphFilter.java | 706 +++++++++
.../WordDelimiterGraphFilterFactory.java | 199 +++
.../miscellaneous/WordDelimiterIterator.java | 59 +-
.../analysis/synonym/FlattenGraphFilter.java | 417 -----
.../synonym/FlattenGraphFilterFactory.java | 44 -
.../lucene/analysis/synonym/SynonymFilter.java | 1 +
.../analysis/synonym/SynonymFilterFactory.java | 1 +
.../analysis/synonym/SynonymGraphFilter.java | 11 +-
...ache.lucene.analysis.util.TokenFilterFactory | 3 +-
.../analysis/core/TestFlattenGraphFilter.java | 284 ++++
.../lucene/analysis/core/TestRandomChains.java | 3 +
.../miscellaneous/TestWordDelimiterFilter.java | 69 +
.../TestWordDelimiterGraphFilter.java | 897 +++++++++++
.../synonym/TestFlattenGraphFilter.java | 284 ----
.../synonym/TestSynonymGraphFilter.java | 51 +-
.../codecs/simpletext/SimpleTextBKDReader.java | 50 +
lucene/common-build.xml | 1 +
.../lucene/analysis/TokenStreamToAutomaton.java | 39 +-
.../tokenattributes/OffsetAttributeImpl.java | 2 +-
.../PackedTokenAttributeImpl.java | 2 +-
.../PositionIncrementAttributeImpl.java | 3 +-
.../PositionLengthAttributeImpl.java | 3 +-
.../org/apache/lucene/codecs/PointsWriter.java | 5 +
.../org/apache/lucene/index/CheckIndex.java | 37 +
.../lucene/index/DefaultIndexingChain.java | 5 +-
.../org/apache/lucene/index/IndexWriter.java | 10 +-
.../org/apache/lucene/index/PointValues.java | 7 +
.../apache/lucene/index/PointValuesWriter.java | 10 +
.../apache/lucene/index/SortingLeafReader.java | 7 +-
.../lucene/search/Boolean2ScorerSupplier.java | 217 +++
.../org/apache/lucene/search/BooleanWeight.java | 136 +-
.../apache/lucene/search/ConjunctionDISI.java | 2 +-
.../apache/lucene/search/ConjunctionScorer.java | 3 +-
.../lucene/search/ConstantScoreQuery.java | 46 +-
.../lucene/search/DoubleValuesSource.java | 2 +-
.../lucene/search/FieldComparatorSource.java | 8 +-
.../lucene/search/FieldValueHitQueue.java | 11 +-
.../apache/lucene/search/LongValuesSource.java | 2 +-
.../lucene/search/MinShouldMatchSumScorer.java | 22 +-
.../apache/lucene/search/PointRangeQuery.java | 214 ++-
.../apache/lucene/search/ScorerSupplier.java | 47 +
.../org/apache/lucene/search/SortField.java | 2 +-
.../lucene/search/SortedNumericSortField.java | 2 +-
.../lucene/search/SortedSetSortField.java | 2 +-
.../apache/lucene/search/TermInSetQuery.java | 93 +-
.../java/org/apache/lucene/search/TopDocs.java | 14 +-
.../apache/lucene/search/TopFieldCollector.java | 4 +-
.../java/org/apache/lucene/search/Weight.java | 25 +
.../org/apache/lucene/util/bkd/BKDReader.java | 96 ++
.../org/apache/lucene/util/bkd/BKDWriter.java | 14 +-
.../lucene/analysis/TestGraphTokenizers.java | 53 +-
.../lucene60/TestLucene60PointsFormat.java | 200 ++-
.../lucene/search/TermInSetQueryTest.java | 123 +-
.../search/TestBoolean2ScorerSupplier.java | 332 ++++
.../search/TestBooleanQueryVisitSubscorers.java | 4 +-
.../lucene/search/TestElevationComparator.java | 22 +-
.../apache/lucene/search/TestFilterWeight.java | 3 +-
.../apache/lucene/search/TestPointQueries.java | 35 +
.../apache/lucene/util/TestDocIdSetBuilder.java | 5 +
.../org/apache/lucene/util/bkd/TestBKD.java | 90 ++
.../util/bkd/TestMutablePointsReaderUtils.java | 5 +
.../apache/lucene/facet/MultiFacetQuery.java | 13 +-
.../search/grouping/BlockGroupingCollector.java | 2 +-
.../grouping/FirstPassGroupingCollector.java | 3 +-
.../lucene/search/grouping/SearchGroup.java | 8 +-
.../lucene/search/grouping/TopGroups.java | 5 +-
.../search/join/ToParentBlockJoinCollector.java | 2 +-
.../search/join/ToParentBlockJoinSortField.java | 2 +-
.../apache/lucene/index/memory/MemoryIndex.java | 5 +
.../lucene/queries/function/ValueSource.java | 2 +-
.../lucene/queryparser/xml/CoreParser.java | 2 -
.../lucene/document/LatLonPointSortField.java | 6 +-
.../lucene/search/DocValuesRangeQuery.java | 11 +-
.../lucene/search/IndexOrDocValuesQuery.java | 116 ++
.../search/TestIndexOrDocValuesQuery.java | 89 ++
lucene/site/changes/changes2html.pl | 3 +-
.../spatial/prefix/NumberRangeFacetsTest.java | 8 +-
.../spatial3d/Geo3DPointOutsideSortField.java | 5 +-
.../lucene/spatial3d/Geo3DPointSortField.java | 5 +-
.../suggest/analyzing/AnalyzingSuggester.java | 3 +-
.../analysis/BaseTokenStreamTestCase.java | 114 +-
.../lucene/analysis/TokenStreamToDot.java | 5 +-
.../asserting/AssertingLiveDocsFormat.java | 9 +-
.../codecs/cranky/CrankyPointsFormat.java | 5 +
.../lucene/index/AssertingLeafReader.java | 7 +
.../apache/lucene/search/AssertingWeight.java | 42 +-
solr/CHANGES.txt | 52 +-
solr/bin/solr | 11 +-
solr/bin/solr.cmd | 13 +-
solr/bin/solr.in.cmd | 5 +
solr/bin/solr.in.sh | 5 +
.../org/apache/solr/core/CoreContainer.java | 109 +-
.../org/apache/solr/core/DirectoryFactory.java | 27 +
.../src/java/org/apache/solr/core/SolrCore.java | 120 +-
.../org/apache/solr/handler/IndexFetcher.java | 60 +-
.../org/apache/solr/handler/RestoreCore.java | 2 +-
.../solr/handler/admin/CoreAdminOperation.java | 1 +
.../solr/handler/admin/LukeRequestHandler.java | 7 +-
.../solr/handler/component/FacetComponent.java | 12 +-
.../solr/handler/component/QueryComponent.java | 25 +-
.../component/QueryElevationComponent.java | 60 +-
.../handler/component/RangeFacetProcessor.java | 3 +-
.../handler/component/RangeFacetRequest.java | 31 +-
.../component/ShardFieldSortedHitQueue.java | 8 +-
.../solr/handler/component/StatsComponent.java | 6 +
.../handler/component/StatsValuesFactory.java | 2 +-
.../solr/highlight/UnifiedSolrHighlighter.java | 10 +-
.../solr/index/SlowCompositeReaderWrapper.java | 3 -
.../org/apache/solr/request/IntervalFacets.java | 4 +
.../org/apache/solr/request/SimpleFacets.java | 37 +-
.../apache/solr/request/json/RequestUtil.java | 16 +-
.../org/apache/solr/response/DocsStreamer.java | 8 +
.../apache/solr/schema/DoublePointField.java | 187 +++
.../java/org/apache/solr/schema/FieldType.java | 9 +-
.../org/apache/solr/schema/FloatPointField.java | 187 +++
.../org/apache/solr/schema/IntPointField.java | 186 +++
.../org/apache/solr/schema/LongPointField.java | 186 +++
.../java/org/apache/solr/schema/PointField.java | 233 +++
.../org/apache/solr/schema/SchemaField.java | 10 +
.../solr/search/CollapsingQParserPlugin.java | 2 +-
.../apache/solr/search/SolrIndexSearcher.java | 44 +-
.../apache/solr/search/TermQParserPlugin.java | 10 +-
.../apache/solr/search/TermsQParserPlugin.java | 10 +
.../apache/solr/search/facet/FacetRange.java | 28 +-
.../SearchGroupShardResponseProcessor.java | 160 +-
.../TopGroupsShardResponseProcessor.java | 114 +-
.../solr/security/GenericHadoopAuthPlugin.java | 266 ----
.../apache/solr/security/HadoopAuthPlugin.java | 2 +-
.../DocumentExpressionDictionaryFactory.java | 12 +-
.../conf/schema-distrib-interval-faceting.xml | 14 +-
.../conf/schema-docValuesFaceting.xml | 12 +
.../solr/collection1/conf/schema-point.xml | 88 ++
.../solr/collection1/conf/schema-sorts.xml | 44 +-
.../test-files/solr/collection1/conf/schema.xml | 26 +-
.../solr/collection1/conf/schema11.xml | 19 +-
.../solr/collection1/conf/schema12.xml | 15 +-
.../solr/collection1/conf/schema_latest.xml | 21 +-
.../solrconfig.snippet.randomindexconfig.xml | 47 -
.../configsets/doc-expiry/conf/solrconfig.xml | 15 +-
.../apache/solr/TestDistributedGrouping.java | 10 +-
.../org/apache/solr/TestDistributedSearch.java | 46 +-
.../core/src/test/org/apache/solr/TestJoin.java | 6 +-
.../org/apache/solr/TestRandomDVFaceting.java | 8 +
.../org/apache/solr/TestRandomFaceting.java | 12 +-
.../solr/cloud/MissingSegmentRecoveryTest.java | 123 ++
.../apache/solr/cloud/TestCloudPivotFacet.java | 2 +
.../handler/XsltUpdateRequestHandlerTest.java | 2 +-
.../handler/admin/LukeRequestHandlerTest.java | 8 +-
.../admin/SegmentsInfoRequestHandlerTest.java | 20 +-
.../component/SpellCheckComponentTest.java | 36 +
.../handler/component/TestExpandComponent.java | 8 +-
.../highlight/TestUnifiedSolrHighlighter.java | 7 +-
.../apache/solr/request/TestFacetMethods.java | 12 +
.../apache/solr/schema/SortableBinaryField.java | 3 +-
.../org/apache/solr/schema/TestPointFields.java | 1472 ++++++++++++++++++
.../ApacheLuceneSolrNearQueryBuilder.java | 1 -
.../apache/solr/search/GoodbyeQueryBuilder.java | 1 -
.../apache/solr/search/HandyQueryBuilder.java | 1 -
.../apache/solr/search/HelloQueryBuilder.java | 1 -
.../solr/search/TestCollapseQParserPlugin.java | 4 +-
.../solr/search/TestMaxScoreQueryParser.java | 2 +-
.../search/TestRandomCollapseQParserPlugin.java | 2 +
.../apache/solr/search/TestSolrQueryParser.java | 23 +
.../solr/search/facet/TestJsonFacets.java | 2 +
solr/server/scripts/cloud-scripts/zkcli.bat | 2 +-
solr/server/scripts/cloud-scripts/zkcli.sh | 2 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 44 +-
.../solr/cloud/AbstractDistribZkTestBase.java | 5 +-
175 files changed, 8460 insertions(+), 2048 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/aef1f73a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/core/CoreContainer.java
index c80816b,023e7b1..07a33ea
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@@ -167,8 -176,8 +177,10 @@@ public class CoreContainer
protected MetricsHandler metricsHandler;
+ protected MetricsCollectorHandler metricsCollectorHandler;
+
+ private enum CoreInitFailedAction { fromleader, none }
+
/**
* This method instantiates a new instance of {@linkplain BackupRepository}.
*