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 2017/02/15 00:21:59 UTC
[1/2] lucene-solr:branch_6x: SOLR-8029: introspect was not showing
for certain collection apis
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 7f77f7120 -> 659fb86c1
SOLR-8029: introspect was not showing for certain collection apis
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5c4ee106
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5c4ee106
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5c4ee106
Branch: refs/heads/branch_6x
Commit: 5c4ee10683fab338f3f4619a850d509c716ebe33
Parents: 4b3ab90
Author: Noble Paul <no...@gmail.com>
Authored: Tue Feb 14 16:21:45 2017 -0800
Committer: Noble Paul <no...@gmail.com>
Committed: Tue Feb 14 16:21:45 2017 -0800
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/api/V2HttpCall.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5c4ee106/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
index 4a053dc..c996b25 100644
--- a/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
+++ b/solr/core/src/java/org/apache/solr/api/V2HttpCall.java
@@ -136,7 +136,7 @@ public class V2HttpCall extends HttpSolrCall {
if (isCompositeApi && apiInfo instanceof CompositeApi) {
((CompositeApi) this.api).add(apiInfo);
} else {
- api = apiInfo;
+ api = apiInfo == null ? api : apiInfo;
}
MDCLoggingContext.setCore(core);
parseRequest();
[2/2] lucene-solr:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/659fb86c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/659fb86c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/659fb86c
Branch: refs/heads/branch_6x
Commit: 659fb86c1dfba16b4f95202abe3c859cd8333107
Parents: 5c4ee10 7f77f71
Author: Noble Paul <no...@gmail.com>
Authored: Tue Feb 14 16:21:55 2017 -0800
Committer: Noble Paul <no...@gmail.com>
Committed: Tue Feb 14 16:21:55 2017 -0800
----------------------------------------------------------------------
lucene/CHANGES.txt | 10 +
.../pattern/SimplePatternSplitTokenizer.java | 258 +++
.../SimplePatternSplitTokenizerFactory.java | 76 +
.../pattern/SimplePatternTokenizer.java | 242 +++
.../pattern/SimplePatternTokenizerFactory.java | 76 +
...apache.lucene.analysis.util.TokenizerFactory | 2 +
.../lucene/analysis/core/TestRandomChains.java | 10 +-
.../TestSimplePatternSplitTokenizer.java | 273 +++
.../pattern/TestSimplePatternTokenizer.java | 218 +++
lucene/common-build.xml | 3 +-
.../apache/lucene/analysis/package-info.java | 12 +-
.../lucene/util/automaton/ByteRunAutomaton.java | 4 +-
.../util/automaton/CharacterRunAutomaton.java | 2 +-
.../lucene/util/automaton/Operations.java | 44 +-
.../lucene/util/automaton/RunAutomaton.java | 126 +-
lucene/demo/ivy.xml | 2 +-
.../lucene/search/TermAutomatonScorer.java | 2 +-
lucene/test-framework/ivy.xml | 2 +-
lucene/tools/ivy.xml | 2 +-
.../dependencies/GetMavenDependenciesTask.java | 58 +-
solr/CHANGES.txt | 15 +
solr/bin/solr | 29 +-
solr/bin/solr.cmd | 33 +-
solr/bin/solr.in.cmd | 4 +-
solr/bin/solr.in.sh | 6 +-
.../facet/FieldFacetAccumulator.java | 2 +-
.../analytics/util/RangeEndpointCalculator.java | 3 +-
solr/contrib/extraction/ivy.xml | 2 +-
.../java/org/apache/solr/cloud/Overseer.java | 2 +-
.../solr/handler/admin/LukeRequestHandler.java | 7 +-
.../solr/handler/component/FacetComponent.java | 12 +-
.../solr/handler/component/QueryComponent.java | 25 +-
.../handler/component/RangeFacetProcessor.java | 3 +-
.../handler/component/RangeFacetRequest.java | 33 +-
.../handler/component/RealTimeGetComponent.java | 7 +-
.../component/SortedNumericStatsValues.java | 107 ++
.../solr/handler/component/StatsComponent.java | 6 +
.../solr/handler/component/StatsField.java | 29 +-
.../handler/component/StatsValuesFactory.java | 9 +-
.../solr/index/SlowCompositeReaderWrapper.java | 3 -
.../org/apache/solr/request/IntervalFacets.java | 116 +-
.../org/apache/solr/request/NumericFacets.java | 181 +-
.../org/apache/solr/request/SimpleFacets.java | 51 +-
.../org/apache/solr/response/DocsStreamer.java | 8 +
.../apache/solr/schema/DoublePointField.java | 195 ++
.../java/org/apache/solr/schema/EnumField.java | 14 +-
.../java/org/apache/solr/schema/FieldType.java | 25 +-
.../org/apache/solr/schema/FloatPointField.java | 196 ++
.../org/apache/solr/schema/IntPointField.java | 192 ++
.../org/apache/solr/schema/LongPointField.java | 191 ++
.../java/org/apache/solr/schema/NumberType.java | 25 +
.../apache/solr/schema/NumericFieldType.java | 172 ++
.../java/org/apache/solr/schema/PointField.java | 242 +++
.../org/apache/solr/schema/SchemaField.java | 10 +
.../schema/SpatialPointVectorFieldType.java | 13 +-
.../org/apache/solr/schema/TrieDateField.java | 2 +-
.../org/apache/solr/schema/TrieDoubleField.java | 2 +-
.../java/org/apache/solr/schema/TrieField.java | 181 +-
.../org/apache/solr/schema/TrieFloatField.java | 2 +-
.../org/apache/solr/schema/TrieIntField.java | 2 +-
.../org/apache/solr/schema/TrieLongField.java | 2 +-
.../apache/solr/search/SolrIndexSearcher.java | 166 +-
.../apache/solr/search/TermQParserPlugin.java | 10 +-
.../apache/solr/search/TermsQParserPlugin.java | 10 +
.../apache/solr/search/facet/FacetField.java | 4 +-
.../FacetFieldProcessorByEnumTermsStream.java | 2 +-
.../facet/FacetFieldProcessorByHashDV.java | 2 +-
.../apache/solr/search/facet/FacetRange.java | 35 +-
.../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 | 36 +
.../DocumentExpressionDictionaryFactory.java | 12 +-
.../solr/store/blockcache/BlockCache.java | 10 +-
.../solr/uninverting/UninvertingReader.java | 37 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 39 -
.../conf/schema-distrib-interval-faceting.xml | 22 +-
.../conf/schema-docValuesFaceting.xml | 23 +-
.../solr/collection1/conf/schema-point.xml | 98 +
.../solr/collection1/conf/schema-sorts.xml | 44 +-
.../test-files/solr/collection1/conf/schema.xml | 79 +-
.../solr/collection1/conf/schema11.xml | 45 +-
.../solr/collection1/conf/schema12.xml | 27 +-
.../solr/collection1/conf/schema_latest.xml | 63 +-
.../conf/solrconfig-update-processor-chains.xml | 2 +
.../apache/solr/TestDistributedGrouping.java | 10 +-
.../org/apache/solr/TestDistributedSearch.java | 8 +-
.../org/apache/solr/TestGroupingSearch.java | 1 +
.../core/src/test/org/apache/solr/TestJoin.java | 6 +-
.../org/apache/solr/TestRandomDVFaceting.java | 34 +-
.../org/apache/solr/TestRandomFaceting.java | 12 +-
.../apache/solr/cloud/OverseerRolesTest.java | 4 +-
.../cloud/SegmentTerminateEarlyTestState.java | 4 +-
.../apache/solr/cloud/TestCloudPivotFacet.java | 2 +
.../apache/solr/cloud/TestSegmentSorting.java | 4 +-
.../handler/XsltUpdateRequestHandlerTest.java | 2 +-
.../handler/admin/LukeRequestHandlerTest.java | 8 +-
.../handler/component/StatsComponentTest.java | 7 +-
.../handler/component/TermsComponentTest.java | 2 +
.../handler/component/TestExpandComponent.java | 8 +-
.../apache/solr/request/TestFacetMethods.java | 23 +-
.../solr/request/TestIntervalFaceting.java | 12 +-
.../org/apache/solr/schema/TestPointFields.java | 1762 ++++++++++++++++++
.../solr/search/TestCollapseQParserPlugin.java | 4 +-
.../solr/search/TestMaxScoreQueryParser.java | 2 +-
.../search/TestRandomCollapseQParserPlugin.java | 2 +
.../apache/solr/search/TestSolrQueryParser.java | 10 +-
.../solr/search/facet/TestJsonFacets.java | 2 +
.../update/processor/AtomicUpdatesTest.java | 64 +-
.../solr/client/solrj/impl/HttpClientUtil.java | 24 +-
.../solrj/impl/Krb5HttpClientConfigurer.java | 3 +
.../solr/client/solrj/impl/PreemptiveAuth.java | 59 +
.../impl/PreemptiveBasicAuthConfigurer.java | 106 ++
solr/test-framework/ivy.xml | 2 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 48 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
123 files changed, 5943 insertions(+), 671 deletions(-)
----------------------------------------------------------------------