You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2021/03/10 09:49:32 UTC
[lucene] 02/09: Merge branch 'master' into jira/solr-12730
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch jira/solr-12730
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit b47df35d526073142a32cf9f7fc57c0ea8e4b1b0
Merge: 3d91b8e 5fc4d51
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Oct 29 12:41:15 2018 +0100
Merge branch 'master' into jira/solr-12730
lucene/CHANGES.txt | 10 +
lucene/analysis/common/README.txt | 2 +
lucene/analysis/common/build.xml | 20 +-
.../org/tartarus/snowball/ext/ArabicStemmer.java | 1912 ++++++++++++++++++++
.../analysis/snowball/TestSnowballVocab.java | 1 +
.../analysis/snowball/TestSnowballVocabData.zip | Bin 3128133 -> 3568843 bytes
.../apache/lucene/analysis/ko/KoreanTokenizer.java | 4 +
.../ko/dict/TokenInfoDictionary$buffer.dat | Bin 7245625 -> 7245613 bytes
.../analysis/ko/dict/TokenInfoDictionary$fst.dat | Bin 5640925 -> 5640903 bytes
.../ko/dict/TokenInfoDictionary$targetMap.dat | Bin 811783 -> 811783 bytes
.../lucene/analysis/ko/TestKoreanTokenizer.java | 8 +
.../analysis/ko/dict/TestTokenInfoDictionary.java | 4 +
.../analysis/ko/util/BinaryDictionaryWriter.java | 29 +-
.../ko/util/TokenInfoDictionaryBuilder.java | 17 +-
lucene/common-build.xml | 2 +-
.../apache/lucene/geo/SimpleWKTShapeParser.java | 406 +++++
.../lucene/geo/TestSimpleWKTShapeParsing.java | 206 +++
solr/CHANGES.txt | 29 +-
.../src/java/org/apache/solr/api/V2HttpCall.java | 5 +-
.../org/apache/solr/cloud/ElectionContext.java | 3 +
.../solr/highlight/UnifiedSolrHighlighter.java | 33 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 4 +-
.../test-files/solr/collection1/conf/schema15.xml | 10 +
.../solrconfig-distrib-update-processor-chains.xml | 2 +-
.../conf/solrconfig-doctransformers.xml | 2 +-
.../solr/collection1/conf/solrconfig-hash.xml | 2 +-
.../conf/solrconfig-master-throttled.xml | 2 +-
.../solr/collection1/conf/solrconfig-paramset.xml | 2 +-
.../solr/collection1/conf/solrconfig-sql.xml | 2 +-
.../solr/collection1/conf/solrconfig-tagger.xml | 2 +-
.../handler/TestSolrConfigHandlerConcurrent.java | 4 +-
.../solr/highlight/TestUnifiedSolrHighlighter.java | 14 +-
.../org/apache/solr/search/QueryEqualityTest.java | 12 +
.../org/apache/solr/search/facet/DebugAgg.java | 2 +-
.../facet}/TestCloudJSONFacetJoinDomain.java | 6 +-
.../facet}/TestCloudJSONFacetSKG.java | 7 +-
solr/solr-ref-guide/src/collections-api.adoc | 36 +-
.../solr-ref-guide/src/computational-geometry.adoc | 188 ++
solr/solr-ref-guide/src/curve-fitting.adoc | 101 ++
solr/solr-ref-guide/src/dsp.adoc | 124 +-
solr/solr-ref-guide/src/highlighting.adoc | 31 +-
.../src/images/math-expressions/sinewave.png | Bin 0 -> 273253 bytes
.../src/images/math-expressions/sinewave256.png | Bin 0 -> 369866 bytes
solr/solr-ref-guide/src/math-expressions.adoc | 15 +-
solr/solr-ref-guide/src/matrix-math.adoc | 53 +
solr/solr-ref-guide/src/statistics.adoc | 87 +
.../src/stream-decorator-reference.adoc | 50 +-
.../src/stream-evaluator-reference.adoc | 5 +-
solr/solr-ref-guide/src/vector-math.adoc | 38 +
.../solrj/impl/StreamingBinaryResponseParser.java | 14 +-
.../apache/solr/common/params/HighlightParams.java | 1 +
.../solrj/solr/collection1/conf/solrconfig-sql.xml | 2 +-
.../solrj/solr/configsets/ml/conf/solrconfig.xml | 2 +-
.../solr/configsets/streaming/conf/solrconfig.xml | 2 +-
.../embedded/SolrExampleStreamingBinaryTest.java | 56 +
.../solr/client/solrj/request/TestV2Request.java | 46 +-
.../apache/solr/cloud/MultiSolrCloudTestCase.java | 1 +
57 files changed, 3482 insertions(+), 134 deletions(-)