Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3233A200C0F for ; Wed, 18 Jan 2017 16:46:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 30C44160B34; Wed, 18 Jan 2017 15:46:10 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7783E160B53 for ; Wed, 18 Jan 2017 16:46:09 +0100 (CET) Received: (qmail 48966 invoked by uid 500); 18 Jan 2017 15:46:07 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 48154 invoked by uid 99); 18 Jan 2017 15:46:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jan 2017 15:46:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5904F2DCD; Wed, 18 Jan 2017 15:46:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: krisden@apache.org To: commits@lucene.apache.org Date: Wed, 18 Jan 2017 15:46:21 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/16] lucene-solr:jira/solr-8593: Merge branch 'apache-https-master' into jira/solr-8593 archived-at: Wed, 18 Jan 2017 15:46:10 -0000 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/db6a3393 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/db6a3393 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/db6a3393 Branch: refs/heads/jira/solr-8593 Commit: db6a3393a9e629ff511faaffef2636d7ec0ab6cb Parents: 292e518 71aa463 Author: Kevin Risden Authored: Wed Jan 18 10:45:57 2017 -0500 Committer: Kevin Risden Committed: Wed Jan 18 10:45:57 2017 -0500 ---------------------------------------------------------------------- lucene/CHANGES.txt | 29 +- .../analysis/core/FlattenGraphFilter.java | 418 +++++++++ .../core/FlattenGraphFilterFactory.java | 44 + .../miscellaneous/WordDelimiterFilter.java | 9 +- .../WordDelimiterFilterFactory.java | 6 + .../miscellaneous/WordDelimiterGraphFilter.java | 706 +++++++++++++++ .../WordDelimiterGraphFilterFactory.java | 199 ++++ .../miscellaneous/WordDelimiterIterator.java | 59 +- .../analysis/synonym/FlattenGraphFilter.java | 417 --------- .../synonym/FlattenGraphFilterFactory.java | 44 - .../lucene/analysis/synonym/SynonymFilter.java | 1 + .../analysis/synonym/SynonymFilterFactory.java | 1 + .../analysis/synonym/SynonymGraphFilter.java | 11 +- ...ache.lucene.analysis.util.TokenFilterFactory | 3 +- .../analysis/core/TestFlattenGraphFilter.java | 284 ++++++ .../miscellaneous/TestWordDelimiterFilter.java | 69 ++ .../TestWordDelimiterGraphFilter.java | 897 +++++++++++++++++++ .../synonym/TestFlattenGraphFilter.java | 284 ------ .../synonym/TestSynonymGraphFilter.java | 51 +- .../codecs/simpletext/SimpleTextBKDReader.java | 50 ++ .../lucene/analysis/TokenStreamToAutomaton.java | 39 +- .../tokenattributes/OffsetAttributeImpl.java | 2 +- .../PackedTokenAttributeImpl.java | 2 +- .../PositionIncrementAttributeImpl.java | 3 +- .../PositionLengthAttributeImpl.java | 3 +- .../org/apache/lucene/codecs/PointsWriter.java | 5 + .../org/apache/lucene/index/CheckIndex.java | 37 + .../lucene/index/DefaultIndexingChain.java | 5 +- .../org/apache/lucene/index/IndexWriter.java | 10 +- .../org/apache/lucene/index/PointValues.java | 7 + .../apache/lucene/index/PointValuesWriter.java | 10 + .../apache/lucene/index/SortingLeafReader.java | 7 +- .../lucene/search/Boolean2ScorerSupplier.java | 217 +++++ .../org/apache/lucene/search/BooleanWeight.java | 136 +-- .../apache/lucene/search/ConjunctionDISI.java | 2 +- .../apache/lucene/search/ConjunctionScorer.java | 3 +- .../lucene/search/ConstantScoreQuery.java | 46 +- .../lucene/search/MinShouldMatchSumScorer.java | 22 +- .../apache/lucene/search/PointRangeQuery.java | 214 +++-- .../apache/lucene/search/ScorerSupplier.java | 47 + .../apache/lucene/search/TermInSetQuery.java | 93 +- .../java/org/apache/lucene/search/Weight.java | 25 + .../org/apache/lucene/util/bkd/BKDReader.java | 96 ++ .../org/apache/lucene/util/bkd/BKDWriter.java | 14 +- .../lucene/analysis/TestGraphTokenizers.java | 53 +- .../lucene60/TestLucene60PointsFormat.java | 192 +++- .../lucene/search/TermInSetQueryTest.java | 123 +-- .../search/TestBoolean2ScorerSupplier.java | 332 +++++++ .../search/TestBooleanQueryVisitSubscorers.java | 4 +- .../apache/lucene/search/TestFilterWeight.java | 3 +- .../apache/lucene/search/TestPointQueries.java | 35 + .../apache/lucene/util/TestDocIdSetBuilder.java | 5 + .../org/apache/lucene/util/bkd/TestBKD.java | 90 ++ .../util/bkd/TestMutablePointsReaderUtils.java | 5 + .../apache/lucene/facet/MultiFacetQuery.java | 13 +- .../apache/lucene/index/memory/MemoryIndex.java | 5 + .../lucene/search/DocValuesRangeQuery.java | 11 +- .../lucene/search/IndexOrDocValuesQuery.java | 116 +++ .../search/TestIndexOrDocValuesQuery.java | 89 ++ .../spatial/prefix/NumberRangeFacetsTest.java | 8 +- .../suggest/analyzing/AnalyzingSuggester.java | 3 +- .../analysis/BaseTokenStreamTestCase.java | 114 ++- .../lucene/analysis/TokenStreamToDot.java | 5 +- .../asserting/AssertingLiveDocsFormat.java | 9 +- .../codecs/cranky/CrankyPointsFormat.java | 5 + .../lucene/index/AssertingLeafReader.java | 7 + .../apache/lucene/search/AssertingWeight.java | 42 +- solr/CHANGES.txt | 18 +- .../solr/highlight/UnifiedSolrHighlighter.java | 10 +- .../solrconfig.snippet.randomindexconfig.xml | 47 - .../configsets/doc-expiry/conf/solrconfig.xml | 15 +- .../admin/SegmentsInfoRequestHandlerTest.java | 20 +- .../component/SpellCheckComponentTest.java | 36 + .../highlight/TestUnifiedSolrHighlighter.java | 7 +- .../apache/solr/search/TestSolrQueryParser.java | 15 + 75 files changed, 4794 insertions(+), 1270 deletions(-) ----------------------------------------------------------------------