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/16 13:47:06 UTC
[16/50] lucene-solr:jira/solr-9858: Merge branch
'apache-https-master' into jira/solr-8593
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/05a6170d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/05a6170d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/05a6170d
Branch: refs/heads/jira/solr-9858
Commit: 05a6170d12fec1effed05613d0bee5fac74f0a4c
Parents: de3ba41 bf424d1
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Nov 28 11:26:16 2016 -0600
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Nov 28 11:26:16 2016 -0600
----------------------------------------------------------------------
dev-tools/README.txt | 11 +-
dev-tools/doap/README.txt | 3 +
dev-tools/doap/lucene.rdf | 28 +-
dev-tools/doap/solr.rdf | 36 +-
lucene/CHANGES.txt | 5 +
.../KNearestNeighborClassifier.java | 8 +-
.../KNearestNeighborDocumentClassifier.java | 6 +-
lucene/common-build.xml | 9 +-
.../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 | 2 +-
.../CompressingTermVectorsWriter.java | 2 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 2 +-
.../lucene/index/MappingMultiPostingsEnum.java | 2 +-
.../org/apache/lucene/index/MergeState.java | 76 +--
.../org/apache/lucene/index/MultiSorter.java | 14 +-
.../apache/lucene/index/TestIndexSorting.java | 192 ++++++-
lucene/ivy-versions.properties | 9 +-
...jetty-continuation-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-continuation-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-http-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-http-9.3.8.v20160314.jar.sha1 | 1 -
.../licenses/jetty-io-9.3.14.v20161028.jar.sha1 | 1 +
.../licenses/jetty-io-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-server-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-server-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-servlet-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-servlet-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-util-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-util-9.3.8.v20160314.jar.sha1 | 1 -
lucene/site/changes/changes2html.pl | 44 +-
.../lucene/index/MockRandomMergePolicy.java | 4 +-
solr/CHANGES.txt | 195 ++++++-
solr/bin/solr | 80 ++-
solr/bin/solr.cmd | 72 ++-
solr/bin/solr.in.cmd | 6 +-
solr/bin/solr.in.sh | 4 +
.../plugin/AnalyticsStatisticsCollector.java | 20 +-
solr/contrib/morphlines-core/ivy.xml | 4 +-
.../UIMAUpdateRequestProcessorTest.java | 62 +--
solr/core/ivy.xml | 1 +
.../org/apache/solr/cloud/DistributedQueue.java | 14 +-
.../java/org/apache/solr/cloud/Overseer.java | 13 +-
.../apache/solr/cloud/OverseerStatusCmd.java | 16 +-
.../solr/cloud/OverseerTaskProcessor.java | 6 +-
.../apache/solr/cloud/OverseerTaskQueue.java | 8 +-
.../solr/cloud/overseer/ZkStateWriter.java | 4 +-
.../org/apache/solr/handler/ExportWriter.java | 13 +-
.../apache/solr/handler/RequestHandlerBase.java | 21 +-
.../handler/component/HighlightComponent.java | 108 +++-
.../solr/handler/component/QueryComponent.java | 3 +-
.../solr/highlight/DefaultSolrHighlighter.java | 15 +-
.../solr/highlight/PostingsSolrHighlighter.java | 9 +-
.../solr/highlight/UnifiedSolrHighlighter.java | 365 +++++++++++++
.../org/apache/solr/parser/QueryParser.java | 11 +-
.../java/org/apache/solr/parser/QueryParser.jj | 7 +-
.../apache/solr/parser/SolrQueryParserBase.java | 194 ++++++-
.../org/apache/solr/request/NumericFacets.java | 4 +-
.../java/org/apache/solr/schema/FieldType.java | 28 +-
.../solr/search/ExtendedDismaxQParser.java | 6 +-
.../solr/search/FunctionRangeQParserPlugin.java | 4 +-
.../apache/solr/search/JoinQParserPlugin.java | 1 +
.../java/org/apache/solr/search/QParser.java | 29 +
.../solr/search/facet/FacetProcessor.java | 3 +
.../apache/solr/search/facet/FacetRequest.java | 1 +
.../ClassificationUpdateProcessor.java | 59 ++-
.../ClassificationUpdateProcessorFactory.java | 199 +++----
.../ClassificationUpdateProcessorParams.java | 112 ++++
.../src/java/org/apache/solr/util/SolrCLI.java | 3 +-
.../org/apache/solr/util/SolrPluginUtils.java | 6 +-
.../java/org/apache/solr/util/stats/Clock.java | 84 ---
.../java/org/apache/solr/util/stats/EWMA.java | 126 -----
.../util/stats/ExponentiallyDecayingSample.java | 218 --------
.../org/apache/solr/util/stats/Histogram.java | 238 ---------
.../java/org/apache/solr/util/stats/Meter.java | 143 -----
.../java/org/apache/solr/util/stats/Sample.java | 52 --
.../org/apache/solr/util/stats/Snapshot.java | 168 ------
.../java/org/apache/solr/util/stats/Timer.java | 203 -------
.../apache/solr/util/stats/TimerContext.java | 55 --
.../org/apache/solr/util/stats/TimerUtils.java | 58 ++
.../apache/solr/util/stats/UniformSample.java | 108 ----
.../conf/schema-unifiedhighlight.xml | 46 ++
.../conf/solrconfig-classification.xml | 15 +
.../solr/cloud/DocValuesNotIndexedTest.java | 527 +++++++++++++++++++
.../org/apache/solr/cloud/OverseerTest.java | 30 +-
.../apache/solr/core/RequestHandlersTest.java | 4 +-
.../handler/admin/CoreAdminHandlerTest.java | 2 +
.../highlight/FastVectorHighlighterTest.java | 9 +-
.../apache/solr/highlight/HighlighterTest.java | 26 +-
.../highlight/TestPostingsSolrHighlighter.java | 2 +-
.../highlight/TestUnifiedSolrHighlighter.java | 229 ++++++++
.../apache/solr/response/SmileWriterTest.java | 17 +-
.../response/TestJavabinTupleStreamParser.java | 195 +++++++
.../solr/search/TestExtendedDismaxParser.java | 4 +-
.../apache/solr/search/TestSolrQueryParser.java | 198 ++++++-
...lassificationUpdateProcessorFactoryTest.java | 208 ++------
...ificationUpdateProcessorIntegrationTest.java | 192 +++++++
.../ClassificationUpdateProcessorTest.java | 506 ++++++++++++++++++
.../SignatureUpdateProcessorFactoryTest.java | 28 +-
.../TestPartialUpdateDeduplication.java | 2 -
.../apache/solr/util/stats/TimerUtilsTest.java | 58 ++
...jetty-continuation-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-continuation-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-deploy-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-deploy-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-http-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-http-9.3.8.v20160314.jar.sha1 | 1 -
.../licenses/jetty-io-9.3.14.v20161028.jar.sha1 | 1 +
solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-jmx-9.3.14.v20161028.jar.sha1 | 1 +
.../licenses/jetty-jmx-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-rewrite-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-rewrite-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-security-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-security-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-server-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-server-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-servlet-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-servlet-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-servlets-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-servlets-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-util-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-util-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-webapp-9.3.14.v20161028.jar.sha1 | 1 +
.../jetty-webapp-9.3.8.v20160314.jar.sha1 | 1 -
.../jetty-xml-9.3.14.v20161028.jar.sha1 | 1 +
.../licenses/jetty-xml-9.3.8.v20160314.jar.sha1 | 1 -
solr/licenses/metrics-core-3.0.1.jar.sha1 | 1 -
solr/licenses/metrics-core-3.1.2.jar.sha1 | 1 +
.../metrics-healthchecks-3.0.1.jar.sha1 | 1 -
.../metrics-healthchecks-3.1.2.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
solr/server/etc/jetty-ssl.xml | 4 +-
solr/solrj/ivy.xml | 4 +
.../solr/client/solrj/impl/CloudSolrClient.java | 345 ++++++------
.../impl/ZkClientClusterStateProvider.java | 188 +++++++
.../io/stream/JavabinTupleStreamParser.java | 189 +++++++
.../solr/client/solrj/io/stream/SolrStream.java | 9 +-
.../org/apache/solr/common/SolrDocument.java | 4 +
.../apache/solr/common/cloud/ClusterState.java | 7 +
.../apache/solr/common/cloud/ZkStateReader.java | 10 +-
.../solr/common/params/HighlightParams.java | 118 +++--
.../apache/solr/common/util/JavaBinCodec.java | 12 +-
.../solrj/impl/CloudSolrClientCacheTest.java | 205 ++++++++
.../impl/TestCloudSolrClientConnections.java | 4 +-
.../client/solrj/io/stream/StreamingTest.java | 2 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 22 +
.../apache/solr/cloud/SolrCloudTestCase.java | 3 +-
150 files changed, 4789 insertions(+), 2307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05a6170d/lucene/ivy-versions.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05a6170d/solr/core/ivy.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05a6170d/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
----------------------------------------------------------------------