lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbern...@apache.org
Subject [2/2] lucene-solr:branch_6x: Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Date Mon, 10 Oct 2016 19:25:31 GMT
Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr 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/45f2dfe2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/45f2dfe2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/45f2dfe2

Branch: refs/heads/branch_6x
Commit: 45f2dfe2ce36e79843ee203721d69a7fd9ffda75
Parents: 5836f40 e585c84
Author: Joel Bernstein <jbernste@apache.org>
Authored: Mon Oct 10 15:24:43 2016 -0400
Committer: Joel Bernstein <jbernste@apache.org>
Committed: Mon Oct 10 15:24:43 2016 -0400

----------------------------------------------------------------------
 build.xml                                       |    2 +
 lucene/CHANGES.txt                              |   24 +
 .../miscellaneous/ASCIIFoldingFilter.java       |   24 +-
 .../miscellaneous/TestASCIIFoldingFilter.java   |   13 +
 .../analysis/ja/JapaneseNumberFilter.java       |   11 +
 .../lucene/analysis/ja/TestFactories.java       |  203 ++++
 .../lucene/codecs/lucene60/Lucene60Codec.java   |    2 +-
 .../lucene50/TestLucene50SegmentInfoFormat.java |   40 +
 .../lucene/codecs/lucene60/Lucene60RWCodec.java |   30 +
 lucene/benchmark/.gitignore                     |    4 +-
 lucene/benchmark/README.enwiki                  |   11 +-
 lucene/benchmark/conf/highlight-profile.alg     |   68 --
 .../conf/highlight-vs-vector-highlight.alg      |   80 --
 lucene/benchmark/conf/highlighters-postings.alg |   65 ++
 lucene/benchmark/conf/highlighters-tv.alg       |   64 ++
 lucene/benchmark/conf/highlights.alg            |   69 ++
 lucene/benchmark/conf/query-phrases.txt         |   10 +
 lucene/benchmark/conf/query-terms.txt           |   10 +
 lucene/benchmark/conf/query-wildcards.txt       |    7 +
 .../benchmark/conf/standard-highlights-notv.alg |   69 --
 .../benchmark/conf/standard-highlights-tv.alg   |   69 --
 .../benchmark/conf/vector-highlight-profile.alg |   68 --
 .../lucene/benchmark/byTask/PerfRunData.java    |    2 +
 .../lucene/benchmark/byTask/feeds/DocMaker.java |    7 +
 .../byTask/tasks/BenchmarkHighlighter.java      |   30 -
 .../lucene/benchmark/byTask/tasks/ReadTask.java |  120 +-
 .../tasks/SearchTravRetHighlightTask.java       |  283 +++--
 .../tasks/SearchTravRetVectorHighlightTask.java |  147 ---
 .../benchmark/byTask/TestPerfTasksLogic.java    |  106 --
 .../tasks/CountingHighlighterTestTask.java      |   68 --
 .../perfield/PerFieldDocValuesFormat.java       |   28 +
 .../codecs/perfield/PerFieldMergeState.java     |  274 +++++
 .../codecs/perfield/PerFieldPostingsFormat.java |   85 +-
 .../lucene/index/DefaultIndexingChain.java      |    4 +-
 .../lucene50/TestLucene50FieldInfoFormat.java   |   33 -
 .../lucene50/TestLucene60FieldInfoFormat.java   |   33 +
 .../perfield/TestPerFieldDocValuesFormat.java   |  122 +++
 .../perfield/TestPerFieldPostingsFormat2.java   |  110 ++
 .../lucene/search/TestBooleanRewrites.java      |   19 +-
 .../uhighlight/AnalysisOffsetStrategy.java      |  190 ++++
 .../uhighlight/DefaultPassageFormatter.java     |  138 +++
 .../search/uhighlight/FieldHighlighter.java     |  276 +++++
 .../search/uhighlight/FieldOffsetStrategy.java  |  122 +++
 .../uhighlight/MultiTermHighlighting.java       |  379 +++++++
 .../uhighlight/MultiValueTokenStream.java       |  148 +++
 .../search/uhighlight/NoOpOffsetStrategy.java   |   50 +
 .../lucene/search/uhighlight/OffsetsEnum.java   |   97 ++
 .../lucene/search/uhighlight/Passage.java       |  161 +++
 .../search/uhighlight/PassageFormatter.java     |   40 +
 .../lucene/search/uhighlight/PassageScorer.java |  113 ++
 .../lucene/search/uhighlight/PhraseHelper.java  |  581 ++++++++++
 .../uhighlight/PostingsOffsetStrategy.java      |   61 ++
 .../PostingsWithTermVectorsOffsetStrategy.java  |   71 ++
 .../uhighlight/SplittingBreakIterator.java      |  244 +++++
 .../TermVectorFilteredLeafReader.java           |  130 +++
 .../uhighlight/TermVectorOffsetStrategy.java    |   68 ++
 .../uhighlight/TokenStreamFromTermVector.java   |  395 +++++++
 .../search/uhighlight/UnifiedHighlighter.java   | 1021 ++++++++++++++++++
 .../lucene/search/uhighlight/package-info.java  |   22 +
 .../search/vectorhighlight/FieldQuery.java      |    7 +
 .../lucene/search/uhighlight/CambridgeMA.utf8   |    1 +
 .../uhighlight/TestSplittingBreakIterator.java  |  192 ++++
 .../uhighlight/TestUnifiedHighlighter.java      |  962 +++++++++++++++++
 .../uhighlight/TestUnifiedHighlighterMTQ.java   |  936 ++++++++++++++++
 .../TestUnifiedHighlighterRanking.java          |  339 ++++++
 .../TestUnifiedHighlighterReanalysis.java       |   74 ++
 .../TestUnifiedHighlighterStrictPhrases.java    |  404 +++++++
 .../TestUnifiedHighlighterTermVec.java          |  182 ++++
 .../lucene/search/uhighlight/UHTestHelper.java  |   69 ++
 .../TestUnifiedHighlighterExtensibility.java    |  182 ++++
 .../FastVectorHighlighterTest.java              |   38 +
 .../classic/MultiFieldQueryParser.java          |    7 +-
 .../classic/TestMultiFieldQueryParser.java      |   21 +
 .../lucene/spatial3d/Geo3DDocValuesField.java   |   60 +
 .../spatial3d/PointInShapeIntersectVisitor.java |   30 +-
 .../apache/lucene/spatial3d/TestGeo3DPoint.java |    4 +-
 .../lucene/index/BasePointsFormatTestCase.java  |    5 +
 solr/CHANGES.txt                                |   42 +
 solr/bin/install_solr_service.sh                |   52 +-
 .../OverseerAutoReplicaFailoverThread.java      |    1 +
 .../org/apache/solr/cloud/ZkController.java     |   52 +-
 .../org/apache/solr/handler/GraphHandler.java   |    7 +-
 .../org/apache/solr/handler/IndexFetcher.java   |    6 +-
 .../org/apache/solr/handler/SQLHandler.java     |   48 +-
 .../org/apache/solr/handler/StreamHandler.java  |   10 +-
 .../solr/handler/admin/LukeRequestHandler.java  |    2 +-
 .../solr/handler/component/ExpandComponent.java |    4 +-
 .../solr/handler/component/FieldFacetStats.java |    2 +-
 .../handler/component/SpellCheckComponent.java  |    2 +-
 .../solr/handler/component/TermsComponent.java  |    2 +-
 .../solr/highlight/DefaultSolrHighlighter.java  |    4 +-
 .../apache/solr/request/DocValuesFacets.java    |    4 +-
 .../org/apache/solr/request/DocValuesStats.java |    4 +-
 .../org/apache/solr/request/NumericFacets.java  |    4 +-
 .../org/apache/solr/request/SimpleFacets.java   |    2 +-
 .../solr/request/macro/MacroExpander.java       |    1 -
 .../solr/response/SortingResponseWriter.java    |    4 +-
 .../transform/SubQueryAugmenterFactory.java     |    1 -
 .../response/transform/TransformerFactory.java  |    2 +-
 .../solr/schema/ManagedIndexSchemaFactory.java  |    1 +
 .../apache/solr/search/AbstractReRankQuery.java |   83 ++
 .../solr/search/CollapsingQParserPlugin.java    |    4 +-
 .../apache/solr/search/JoinQParserPlugin.java   |    8 +-
 .../apache/solr/search/ReRankQParserPlugin.java |   56 +-
 .../apache/solr/search/SolrIndexSearcher.java   |   24 +-
 .../facet/FacetFieldProcessorByArrayUIF.java    |    2 +-
 .../FacetFieldProcessorByEnumTermsStream.java   |    4 +-
 .../facet/FacetFieldProcessorByHashDV.java      |    2 +-
 .../org/apache/solr/search/facet/FieldUtil.java |    4 +-
 .../solr/search/facet/UnInvertedField.java      |    4 +-
 .../solr/search/function/OrdFieldSource.java    |    2 +-
 .../search/function/ReverseOrdFieldSource.java  |    2 +-
 .../join/BlockJoinFieldFacetAccumulator.java    |    4 +-
 .../solr/security/PKIAuthenticationPlugin.java  |    5 +-
 .../org/apache/solr/servlet/HttpSolrCall.java   |    4 +-
 .../apache/solr/update/AddUpdateCommand.java    |    1 -
 .../ClassificationUpdateProcessorFactory.java   |    2 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  |    3 +-
 .../cloud-managed-upgrade/conf/schema.xml       |   27 +
 .../cloud-managed-upgrade/conf/solrconfig.xml   |   50 +
 .../solr/client/solrj/ConnectionReuseTest.java  |  216 ----
 .../client/solrj/impl/ConnectionReuseTest.java  |  224 ++++
 .../apache/solr/cloud/AliasIntegrationTest.java |  245 ++---
 .../AsyncCallRequestStatusResponseTest.java     |   44 +-
 .../solr/cloud/AsyncMigrateRouteKeyTest.java    |  121 ---
 .../apache/solr/cloud/CollectionReloadTest.java |   81 +-
 .../solr/cloud/CollectionStateFormat2Test.java  |   73 +-
 .../solr/cloud/DeleteInactiveReplicaTest.java   |    2 +-
 .../apache/solr/cloud/MigrateRouteKeyTest.java  |  160 ++-
 .../TestLeaderRecoverFromLogOnStartup.java      |   77 ++
 .../TestSolrCloudWithDelegationTokens.java      |   26 +-
 .../org/apache/solr/cloud/rule/RulesTest.java   |  241 ++---
 .../org/apache/solr/handler/TestSQLHandler.java |  235 +++-
 .../org/apache/solr/request/TestFaceting.java   |   22 +-
 .../apache/solr/schema/DocValuesMultiTest.java  |    2 +-
 .../org/apache/solr/schema/DocValuesTest.java   |   12 +-
 .../schema/TestManagedSchemaThreadSafety.java   |  164 +++
 .../solr/search/join/TestScoreJoinQPScore.java  |    2 +-
 .../security/TestAuthorizationFramework.java    |    3 +-
 solr/solrj/ivy.xml                              |    4 -
 .../solr/client/solrj/impl/CloudSolrClient.java |   50 +-
 .../solrj/impl/ConcurrentUpdateSolrClient.java  |    3 +-
 .../impl/DelegationTokenHttpSolrClient.java     |   73 ++
 .../solr/client/solrj/impl/HttpClientUtil.java  |   26 +-
 .../solr/client/solrj/impl/HttpSolrClient.java  |   66 +-
 .../solrj/impl/Krb5HttpClientConfigurer.java    |    3 +-
 .../client/solrj/impl/LBHttpSolrClient.java     |   92 +-
 .../solrj/io/stream/expr/StreamFactory.java     |   44 +-
 .../solrj/request/CollectionAdminRequest.java   |   52 +-
 .../solr/client/solrj/request/CoreStatus.java   |    6 +
 .../solrj/response/DelegationTokenResponse.java |   13 +-
 .../client/solrj/response/LukeResponse.java     |   15 +-
 ...ParamsAllAndReadonlyDigestZkACLProvider.java |    5 +-
 .../solr/common/cloud/rule/ImplicitSnitch.java  |   11 +-
 .../apache/solr/common/cloud/rule/Snitch.java   |    8 +-
 .../org/apache/solr/common/util/RetryUtil.java  |   11 +-
 .../solr/client/solrj/SolrExampleTests.java     |   32 +-
 .../client/solrj/SolrSchemalessExampleTest.java |   21 +-
 .../client/solrj/embedded/JettyWebappTest.java  |    3 +-
 .../solrj/embedded/SolrExampleJettyTest.java    |    9 +-
 .../solrj/impl/BasicHttpSolrClientTest.java     |    2 +-
 .../solrj/impl/HttpSolrClientConPoolTest.java   |  188 ++++
 .../impl/HttpSolrClientSSLAuthConPoolTest.java  |   39 +
 .../java/org/apache/solr/SolrTestCaseJ4.java    |    4 +
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   22 +
 .../apache/solr/cloud/SolrCloudTestCase.java    |   16 +-
 .../org/apache/solr/util/RestTestHarness.java   |   16 +-
 solr/webapp/web/css/angular/dashboard.css       |    8 +-
 .../web/js/angular/controllers/core-overview.js |   83 --
 solr/webapp/web/partials/core_overview.html     |   17 -
 170 files changed, 11374 insertions(+), 2300 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message