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/09 16:10:24 UTC
[34/34] lucene-solr:jira/solr-9856: Merge branch 'master' into
jira/solr-9856
Merge branch 'master' into jira/solr-9856
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8616344a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8616344a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8616344a
Branch: refs/heads/jira/solr-9856
Commit: 8616344ab47312c1c09c4a82ca888e896aa2c4ec
Parents: ca2e2be b9827bc
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Jan 9 13:48:18 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Jan 9 13:48:18 2017 +0100
----------------------------------------------------------------------
dev-tools/idea/lucene/suggest/suggest.iml | 1 -
lucene/CHANGES.txt | 24 +
.../lucene/analysis/TokenStreamToAutomaton.java | 11 +-
.../apache/lucene/index/AutomatonTermsEnum.java | 3 +
.../lucene/search/DoubleValuesSource.java | 27 +
.../apache/lucene/search/LongValuesSource.java | 27 +
.../lucene/analysis/TestGraphTokenizers.java | 600 +++++++++++++++++++
.../org/apache/lucene/index/TestTermsEnum.java | 8 +
.../demo/facet/DistanceFacetsExample.java | 18 +-
.../ExpressionAggregationFacetsExample.java | 2 +-
lucene/expressions/build.xml | 11 -
.../org/apache/lucene/expressions/Bindings.java | 14 +-
.../apache/lucene/expressions/Expression.java | 21 +-
.../expressions/ExpressionComparator.java | 100 ----
.../expressions/ExpressionFunctionValues.java | 35 +-
.../lucene/expressions/ExpressionRescorer.java | 33 +-
.../lucene/expressions/ExpressionSortField.java | 77 ---
.../expressions/ExpressionValueSource.java | 70 +--
.../lucene/expressions/ScoreFunctionValues.java | 46 --
.../lucene/expressions/ScoreValueSource.java | 61 --
.../lucene/expressions/SimpleBindings.java | 30 +-
.../expressions/js/JavascriptCompiler.java | 15 +-
.../apache/lucene/expressions/package-info.java | 5 +-
.../lucene/expressions/TestDemoExpressions.java | 44 +-
.../expressions/TestExpressionSortField.java | 2 +-
.../expressions/TestExpressionValueSource.java | 111 +---
.../expressions/js/TestCustomFunctions.java | 20 +-
.../expressions/js/TestJavascriptFunction.java | 2 +-
.../js/TestJavascriptOperations.java | 2 +-
.../org/apache/lucene/facet/DrillSideways.java | 37 +-
.../org/apache/lucene/facet/package-info.java | 2 +-
.../apache/lucene/facet/range/DoubleRange.java | 28 +-
.../facet/range/DoubleRangeFacetCounts.java | 63 +-
.../apache/lucene/facet/range/LongRange.java | 28 +-
.../facet/range/LongRangeFacetCounts.java | 26 +-
.../org/apache/lucene/facet/range/Range.java | 31 -
.../lucene/facet/taxonomy/FakeScorer.java | 53 --
.../taxonomy/TaxonomyFacetSumValueSource.java | 114 ++--
.../facet/range/TestRangeFacetCounts.java | 61 +-
.../TestTaxonomyFacetSumValueSource.java | 54 +-
.../AbstractAllGroupHeadsCollector.java | 176 ------
.../grouping/AbstractAllGroupsCollector.java | 67 ---
.../AbstractDistinctValuesCollector.java | 59 --
.../AbstractFirstPassGroupingCollector.java | 354 -----------
.../grouping/AbstractGroupFacetCollector.java | 319 ----------
.../AbstractSecondPassGroupingCollector.java | 162 -----
.../search/grouping/AllGroupHeadsCollector.java | 176 ++++++
.../search/grouping/AllGroupsCollector.java | 67 +++
.../search/grouping/CollectedSearchGroup.java | 2 +-
.../grouping/DistinctValuesCollector.java | 59 ++
.../grouping/FirstPassGroupingCollector.java | 363 +++++++++++
.../lucene/search/grouping/GroupDocs.java | 8 +-
.../search/grouping/GroupFacetCollector.java | 324 ++++++++++
.../apache/lucene/search/grouping/Grouper.java | 56 ++
.../lucene/search/grouping/GroupingSearch.java | 130 +---
.../lucene/search/grouping/SearchGroup.java | 23 +-
.../grouping/SecondPassGroupingCollector.java | 169 ++++++
.../lucene/search/grouping/TopGroups.java | 12 +-
.../FunctionAllGroupHeadsCollector.java | 32 +-
.../function/FunctionAllGroupsCollector.java | 4 +-
.../FunctionDistinctValuesCollector.java | 35 +-
.../FunctionFirstPassGroupingCollector.java | 6 +-
.../grouping/function/FunctionGrouper.java | 69 +++
.../FunctionSecondPassGroupingCollector.java | 6 +-
.../term/TermAllGroupHeadsCollector.java | 26 +-
.../grouping/term/TermAllGroupsCollector.java | 8 +-
.../term/TermDistinctValuesCollector.java | 26 +-
.../term/TermFirstPassGroupingCollector.java | 6 +-
.../grouping/term/TermGroupFacetCollector.java | 10 +-
.../search/grouping/term/TermGrouper.java | 81 +++
.../term/TermSecondPassGroupingCollector.java | 6 +-
.../grouping/AllGroupHeadsCollectorTest.java | 14 +-
.../search/grouping/AllGroupsCollectorTest.java | 6 +-
.../grouping/DistinctValuesCollectorTest.java | 46 +-
.../grouping/GroupFacetCollectorTest.java | 10 +-
.../lucene/search/grouping/TestGrouping.java | 70 +--
.../uhighlight/LengthGoalBreakIterator.java | 185 ++++++
.../lucene/search/uhighlight/Passage.java | 1 +
.../uhighlight/LengthGoalBreakIteratorTest.java | 104 ++++
.../lucene/queries/function/ValueSource.java | 111 ++++
.../complexPhrase/ComplexPhraseQueryParser.java | 4 +-
.../complexPhrase/TestComplexPhraseQuery.java | 6 +
lucene/suggest/build.xml | 4 +-
.../suggest/DocumentValueSourceDictionary.java | 58 +-
.../DocumentValueSourceDictionaryTest.java | 287 ++++++++-
.../lucene/analysis/TestGraphTokenizers.java | 588 ------------------
solr/CHANGES.txt | 23 +-
solr/contrib/ltr/example/README.md | 118 +++-
solr/contrib/ltr/example/user_queries.txt | 12 +-
.../apache/solr/cloud/rule/ReplicaAssigner.java | 31 +-
.../java/org/apache/solr/cloud/rule/Rule.java | 4 +-
.../org/apache/solr/core/CoreContainer.java | 5 +-
.../org/apache/solr/core/DirectoryFactory.java | 3 +-
.../solr/core/MetricsDirectoryFactory.java | 58 +-
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../org/apache/solr/core/SolrInfoMBean.java | 4 +-
.../solr/core/StandardDirectoryFactory.java | 3 +-
.../org/apache/solr/handler/GraphHandler.java | 1 +
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../component/HttpShardHandlerFactory.java | 8 +-
.../solr/highlight/UnifiedSolrHighlighter.java | 12 +-
.../org/apache/solr/request/SimpleFacets.java | 4 +-
.../java/org/apache/solr/search/Grouping.java | 14 +-
.../org/apache/solr/search/facet/HLLAgg.java | 13 +-
.../apache/solr/search/facet/UniqueSlotAcc.java | 2 +-
.../solr/search/grouping/CommandHandler.java | 4 +-
.../command/SearchGroupsFieldCommand.java | 8 +-
.../command/TopGroupsFieldCommand.java | 4 +-
.../DocumentExpressionDictionaryFactory.java | 6 +-
.../java/org/apache/solr/update/UpdateLog.java | 4 +-
.../apache/solr/update/UpdateShardHandler.java | 11 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 3 +-
.../stats/InstrumentedHttpRequestExecutor.java | 6 +-
...dd-schema-fields-update-processor-chains.xml | 8 +-
.../collection1/conf/solrconfig-schemaless.xml | 45 +-
.../apache/solr/cloud/rule/RuleEngineTest.java | 2 +-
.../solr/handler/admin/MetricsHandlerTest.java | 5 +-
.../highlight/TestUnifiedSolrHighlighter.java | 24 +-
.../schema/TestSchemalessBufferedUpdates.java | 160 +++++
.../solr/search/facet/TestJsonFacets.java | 27 +
.../solr/update/SolrIndexMetricsTest.java | 4 +-
solr/example/files/conf/solrconfig.xml | 5 +-
.../basic_configs/conf/solrconfig.xml | 6 +-
.../conf/solrconfig.xml | 5 +-
.../client/solrj/io/ops/EqualsOperation.java | 2 +-
.../io/ops/GreaterThanEqualToOperation.java | 2 +-
.../solrj/io/ops/GreaterThanOperation.java | 2 +-
.../solr/client/solrj/io/ops/LeafOperation.java | 1 -
.../solrj/io/ops/LessThanEqualToOperation.java | 2 +-
.../client/solrj/io/ops/LessThanOperation.java | 2 +-
.../solrj/io/stream/expr/StreamFactory.java | 2 +
.../solr/common/params/HighlightParams.java | 2 +-
.../solrj/io/graph/GraphExpressionTest.java | 3 +-
.../solrj/io/stream/StreamExpressionTest.java | 5 +-
134 files changed, 3835 insertions(+), 3097 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8616344a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
index 35797f3,421a4ef..04c8395
--- a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java
@@@ -32,7 -32,7 +32,7 @@@ public interface SolrInfoMBean
/**
* Category of {@link SolrCore} component.
*/
- enum Category { CORE, QUERYHANDLER, UPDATEHANDLER, CACHE, HIGHLIGHTING, QUERYPARSER, SEARCHER, REPLICATION, TLOG, INDEX, DIRECTORY, OTHER }
- enum Category { CORE, QUERYHANDLER, UPDATEHANDLER, CACHE, HIGHLIGHTING, QUERYPARSER, SEARCHER, INDEX, DIRECTORY, HTTP, OTHER }
++ enum Category { CORE, QUERYHANDLER, UPDATEHANDLER, CACHE, HIGHLIGHTING, QUERYPARSER, SEARCHER, REPLICATION, TLOG, INDEX, DIRECTORY, HTTP, OTHER }
/**
* Top-level group of beans for a subsystem.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8616344a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 2598949,b79290d..c40eafd
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@@ -1472,16 -1427,9 +1472,16 @@@ public class UpdateLog implements Plugi
loglog.error("REPLAY_ERR: Exception replaying log", rsp.getException());
throw rsp.getException();
}
+ if (state == State.REPLAYING) {
+ replayOpsMeter.mark();
+ } else if (state == State.APPLYING_BUFFERED) {
+ applyingBufferedOpsMeter.mark();
+ } else {
+ // XXX should not happen?
+ }
} catch (IOException ex) {
recoveryInfo.errors++;
- loglog.warn("REYPLAY_ERR: IOException reading log", ex);
+ loglog.warn("REPLAY_ERR: IOException reading log", ex);
// could be caused by an incomplete flush if recovering from log
} catch (ClassCastException cl) {
recoveryInfo.errors++;