lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbern...@apache.org
Subject [27/50] lucene-solr:master: Merge branch 'apache-https-master' into jira/solr-8593
Date Wed, 15 Feb 2017 20:47:39 GMT
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/82350229
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/82350229
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/82350229

Branch: refs/heads/master
Commit: 82350229c9c0b8b69a959aa5320f82cbffb9a4f9
Parents: 918fd97 f330678
Author: Kevin Risden <krisden@apache.org>
Authored: Tue Jan 3 12:47:42 2017 -0600
Committer: Kevin Risden <krisden@apache.org>
Committed: Tue Jan 3 12:47:42 2017 -0600

----------------------------------------------------------------------
 build.xml                                       |   40 +-
 dev-tools/idea/lucene/suggest/suggest.iml       |    1 -
 .../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                              |   52 +
 .../lucene/analysis/custom/CustomAnalyzer.java  |    2 +-
 .../analysis/synonym/FlattenGraphFilter.java    |  417 ++++
 .../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 +-
 .../analysis/custom/TestCustomAnalyzer.java     |   21 +
 .../apache/lucene/analysis/custom/mapping1.txt  |    1 +
 .../apache/lucene/analysis/custom/mapping2.txt  |    1 +
 .../miscellaneous/TestWordDelimiterFilter.java  |   56 +-
 .../synonym/TestFlattenGraphFilter.java         |  284 +++
 .../synonym/TestSynonymGraphFilter.java         | 1956 ++++++++++++++++++
 .../PackedTokenAttributeImpl.java               |    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 +-
 .../org/apache/lucene/document/DoublePoint.java |   30 +-
 .../org/apache/lucene/document/FloatPoint.java  |   30 +-
 .../org/apache/lucene/index/DocIDMerger.java    |  211 +-
 .../lucene/index/DocumentsWriterPerThread.java  |   16 +-
 .../lucene/index/MappingMultiPostingsEnum.java  |    2 +-
 .../TrackingTmpOutputDirectoryWrapper.java      |    2 +-
 .../org/apache/lucene/search/DoubleValues.java  |   38 +
 .../lucene/search/DoubleValuesSource.java       |  313 +++
 .../org/apache/lucene/search/GraphQuery.java    |  136 ++
 .../lucene/search/LeafFieldComparator.java      |    2 +-
 .../org/apache/lucene/search/LongValues.java    |   38 +
 .../apache/lucene/search/LongValuesSource.java  |  217 ++
 .../lucene/search/MultiCollectorManager.java    |  105 +
 .../lucene/search/SimpleFieldComparator.java    |    2 +-
 .../org/apache/lucene/store/MMapDirectory.java  |  124 +-
 .../org/apache/lucene/util/QueryBuilder.java    |  113 +-
 .../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 +-
 .../graph/GraphTokenStreamFiniteStrings.java    |  230 ++
 .../apache/lucene/util/graph/package-info.java  |   21 +
 .../lucene/index/Test4GBStoredFields.java       |    2 +
 .../apache/lucene/index/TestDocIDMerger.java    |    4 +-
 .../apache/lucene/index/TestIndexWriter.java    |    3 +-
 .../lucene/search/TestDoubleValuesSource.java   |  167 ++
 .../apache/lucene/search/TestGraphQuery.java    |   79 +
 .../apache/lucene/search/TestLRUQueryCache.java |    7 +
 .../lucene/search/TestLongValuesSource.java     |  149 ++
 .../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 +-
 .../apache/lucene/util/TestQueryBuilder.java    |   15 +-
 .../org/apache/lucene/util/bkd/TestBKD.java     |   48 +-
 .../org/apache/lucene/util/fst/Test2BFST.java   |    2 +
 .../TestGraphTokenStreamFiniteStrings.java      |  217 ++
 .../org/apache/lucene/facet/DrillSideways.java  |  338 ++-
 .../lucene/facet/FacetsCollectorManager.java    |   55 +
 .../apache/lucene/facet/TestDrillSideways.java  |  315 +--
 .../lucene/facet/TestParallelDrillSideways.java |   90 +
 .../lucene/search/grouping/TestGrouping.java    |    9 -
 lucene/ivy-versions.properties                  |    3 +
 .../queryparser/classic/QueryParserBase.java    |   42 +-
 .../classic/TestMultiFieldQueryParser.java      |   11 +-
 .../queryparser/classic/TestQueryParser.java    |  131 +-
 .../lucene/document/TestHalfFloatPoint.java     |    2 +
 .../lucene/spatial3d/geom/GeoBBoxFactory.java   |   34 +-
 .../lucene/spatial3d/geom/GeoCircleFactory.java |    2 +-
 .../spatial3d/geom/GeoPolygonFactory.java       |    6 +-
 .../apache/lucene/spatial3d/geom/Vector.java    |    4 +
 lucene/suggest/build.xml                        |    6 +-
 .../analyzing/AnalyzingInfixSuggester.java      |  137 +-
 .../suggest/analyzing/FreeTextSuggester.java    |   45 -
 .../analysis/BaseTokenStreamTestCase.java       |   37 +-
 .../apache/lucene/analysis/MockTokenizer.java   |    3 +-
 .../index/BaseStoredFieldsFormatTestCase.java   |    2 +
 .../org/apache/lucene/index/RandomCodec.java    |    2 +-
 .../org/apache/lucene/util/LuceneTestCase.java  |  110 +-
 .../org/apache/lucene/util/RamUsageTester.java  |  102 +-
 lucene/tools/junit4/tests.policy                |    1 -
 solr/CHANGES.txt                                |   59 +-
 solr/bin/solr                                   |   26 +-
 solr/bin/solr.cmd                               |   36 +-
 .../solr/handler/dataimport/JdbcDataSource.java |    4 +-
 .../handler/dataimport/SolrEntityProcessor.java |  192 +-
 .../dataimport/MockSolrEntityProcessor.java     |   18 +-
 .../handler/dataimport/TestJdbcDataSource.java  |   43 +-
 .../TestSolrEntityProcessorEndToEnd.java        |   27 +-
 .../dataimport/TestSolrEntityProcessorUnit.java |   70 +
 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 +-
 .../java/org/apache/solr/cloud/Overseer.java    |    2 +-
 .../org/apache/solr/core/CoreContainer.java     |   23 +-
 .../org/apache/solr/core/DirectoryFactory.java  |   26 +
 .../apache/solr/core/HdfsDirectoryFactory.java  |   29 +
 .../solr/core/MetricsDirectoryFactory.java      |  511 +++++
 .../src/java/org/apache/solr/core/SolrCore.java |   24 +-
 .../apache/solr/core/SolrDeletionPolicy.java    |    6 +
 .../org/apache/solr/core/SolrInfoMBean.java     |    2 +-
 .../solr/core/StandardDirectoryFactory.java     |   45 +-
 .../org/apache/solr/handler/IndexFetcher.java   |   25 +-
 .../org/apache/solr/handler/StreamHandler.java  |    3 +-
 .../solr/handler/admin/CoreAdminHandler.java    |   13 +-
 .../solr/handler/admin/LukeRequestHandler.java  |   18 +-
 .../admin/SegmentsInfoRequestHandler.java       |    1 +
 .../handler/component/HttpShardHandler.java     |   48 +-
 .../component/HttpShardHandlerFactory.java      |  154 +-
 .../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/highlight/UnifiedSolrHighlighter.java  |  459 ++--
 .../solr/metrics/OperatingSystemMetricSet.java  |   92 +
 .../metrics/reporters/SolrGangliaReporter.java  |  144 ++
 .../metrics/reporters/SolrGraphiteReporter.java |  129 ++
 .../metrics/reporters/SolrSlf4jReporter.java    |  127 ++
 .../apache/solr/parser/SolrQueryParserBase.java |   16 +-
 .../solr/response/JSONResponseWriter.java       |   86 +-
 .../org/apache/solr/schema/SchemaManager.java   |   99 +-
 .../solr/search/CollapsingQParserPlugin.java    |   14 +-
 .../search/grouping/GroupingSpecification.java  |   18 +-
 .../apache/solr/servlet/SolrDispatchFilter.java |    8 +-
 .../solr/spelling/DirectSolrSpellChecker.java   |   18 +-
 .../org/apache/solr/update/SolrIndexConfig.java |   16 +-
 .../org/apache/solr/update/SolrIndexWriter.java |  144 ++
 .../apache/solr/update/UpdateShardHandler.java  |   72 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  |   65 +-
 .../src/java/org/apache/solr/util/TimeOut.java  |   13 +-
 .../stats/InstrumentedHttpRequestExecutor.java  |  129 ++
 ...entedPoolingHttpClientConnectionManager.java |  113 +
 .../org/apache/solr/util/stats/MetricUtils.java |   88 +-
 .../schema-minimal-with-another-uniqkey.xml     |   23 +
 .../conf/solrconfig-indexmetrics.xml            |   57 +
 .../test-files/solr/solr-gangliareporter.xml    |   32 +
 .../test-files/solr/solr-graphitereporter.xml   |   31 +
 .../src/test-files/solr/solr-slf4jreporter.xml  |   35 +
 .../TestReversedWildcardFilterFactory.java      |   56 +-
 .../apache/solr/cloud/CdcrBootstrapTest.java    |   25 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |  470 ++---
 .../DeleteLastCustomShardedReplicaTest.java     |  104 +-
 .../org/apache/solr/cloud/DeleteShardTest.java  |  211 +-
 .../solr/cloud/DocValuesNotIndexedTest.java     |   10 -
 .../cloud/LeaderFailoverAfterPartitionTest.java |    2 +-
 .../cloud/LeaderFailureAfterFreshStartTest.java |   68 +-
 .../cloud/OverseerModifyCollectionTest.java     |   92 +-
 .../apache/solr/cloud/OverseerRolesTest.java    |  165 +-
 .../apache/solr/cloud/OverseerStatusTest.java   |   55 +-
 .../solr/cloud/PeerSyncReplicationTest.java     |   55 +-
 .../apache/solr/cloud/RemoteQueryErrorTest.java |   53 +-
 .../solr/cloud/TestDownShardTolerantSearch.java |   40 +-
 .../TestExclusionRuleCollectionAccess.java      |   38 +-
 .../apache/solr/cloud/TestStressLiveNodes.java  |    2 +-
 .../solr/core/MockShardHandlerFactory.java      |    2 +-
 .../test/org/apache/solr/core/TestConfig.java   |    2 +
 .../solr/handler/TestReplicationHandler.java    |   20 +-
 .../admin/CoreMergeIndexesAdminHandlerTest.java |   10 +-
 .../solr/handler/admin/MetricsHandlerTest.java  |    6 +-
 .../admin/SegmentsInfoRequestHandlerTest.java   |   17 +-
 .../solr/handler/admin/StatsReloadRaceTest.java |   82 +-
 .../highlight/TestUnifiedSolrHighlighter.java   |   10 +
 .../org/apache/solr/metrics/JvmMetricsTest.java |   68 +
 .../reporters/SolrGangliaReporterTest.java      |   82 +
 .../reporters/SolrGraphiteReporterTest.java     |  116 ++
 .../reporters/SolrSlf4jReporterTest.java        |   77 +
 .../apache/solr/response/JSONWriterTest.java    |   20 +-
 .../TestSubQueryTransformerDistrib.java         |   55 +-
 .../PKIAuthenticationIntegrationTest.java       |   40 +-
 .../TestSolrCloudWithHadoopAuthPlugin.java      |    4 +-
 .../org/apache/solr/update/AutoCommitTest.java  |    2 +-
 .../apache/solr/update/SoftAutoCommitTest.java  |    2 +-
 .../apache/solr/update/SolrIndexConfigTest.java |    1 +
 .../solr/update/SolrIndexMetricsTest.java       |   94 +
 .../apache/solr/util/stats/MetricUtilsTest.java |   24 +-
 solr/licenses/gmetric4j-1.0.7.jar.sha1          |    1 +
 solr/licenses/gmetric4j-LICENSE-BSD.txt         |   31 +
 solr/licenses/gmetric4j-NOTICE.txt              |    0
 solr/licenses/metrics-ganglia-3.1.2.jar.sha1    |    1 +
 solr/licenses/metrics-ganglia-LICENSE-ASL.txt   |  203 ++
 solr/licenses/metrics-ganglia-NOTICE.txt        |   12 +
 solr/licenses/metrics-graphite-3.1.2.jar.sha1   |    1 +
 solr/licenses/metrics-graphite-LICENSE-ASL.txt  |  203 ++
 solr/licenses/metrics-graphite-NOTICE.txt       |   12 +
 solr/server/ivy.xml                             |    3 +
 .../solr/client/solrj/impl/HttpClientUtil.java  |   35 +-
 .../client/solrj/io/stream/CloudSolrStream.java |    4 +
 .../solr/client/solrj/io/stream/NullStream.java |  155 ++
 .../client/solrj/io/stream/PriorityStream.java  |  161 ++
 .../solrj/request/CollectionAdminRequest.java   |    2 +
 .../solr/common/params/HighlightParams.java     |    2 +-
 .../client/solrj/impl/CloudSolrClientTest.java  |    2 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  224 ++
 .../solr/common/params/CommonParamsTest.java    |    2 +
 .../solr/cloud/AbstractDistribZkTestBase.java   |   31 +-
 .../java/org/apache/solr/cloud/ChaosMonkey.java |    2 -
 .../component/TrackingShardHandlerFactory.java  |    2 +-
 289 files changed, 13357 insertions(+), 3649 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82350229/lucene/ivy-versions.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82350229/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82350229/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
----------------------------------------------------------------------


Mime
View raw message